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

3 Sep 2011

diff --git a/af/bridges.po b/af/bridges.po
index 4088ec2..50a758e 100644
--- a/af/bridges.po
+++ b/af/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/af/config.po b/af/config.po
index 537a346..7113972 100644
--- a/af/config.po
+++ b/af/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/af/index.po b/af/index.po
index 45d25be..37af7d3 100644
--- a/af/index.po
+++ b/af/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/af/links.po b/af/links.po
index 5f49d8b..f15d1d9 100644
--- a/af/links.po
+++ b/af/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/af/log.po b/af/log.po
index b5d3761..890f278 100644
--- a/af/log.po
+++ b/af/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/af/netview.po b/af/netview.po
index e99126d..2edbfe1 100644
--- a/af/netview.po
+++ b/af/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/af/running.po b/af/running.po
index e28fa1b..0b62822 100644
--- a/af/running.po
+++ b/af/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/af/server.po b/af/server.po
index bbd257f..26029a0 100644
--- a/af/server.po
+++ b/af/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/af/services.po b/af/services.po
index 1090190..c7a0a61 100644
--- a/af/services.po
+++ b/af/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/af/troubleshooting.po b/af/troubleshooting.po
index 5214888..e3e69ca 100644
--- a/af/troubleshooting.po
+++ b/af/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ak/bridges.po b/ak/bridges.po
index 14ba9ad..1cff855 100644
--- a/ak/bridges.po
+++ b/ak/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ak/config.po b/ak/config.po
index 537a346..e039ca1 100644
--- a/ak/config.po
+++ b/ak/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ak/index.po b/ak/index.po
index 45d25be..ccb2d71 100644
--- a/ak/index.po
+++ b/ak/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ak/links.po b/ak/links.po
index ba585d2..02fb6b6 100644
--- a/ak/links.po
+++ b/ak/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ak/log.po b/ak/log.po
index b5d3761..241cbaf 100644
--- a/ak/log.po
+++ b/ak/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ak/netview.po b/ak/netview.po
index 5242225..5b911a8 100644
--- a/ak/netview.po
+++ b/ak/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ak/running.po b/ak/running.po
index e28fa1b..a6752c4 100644
--- a/ak/running.po
+++ b/ak/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ak/server.po b/ak/server.po
index bbd257f..0031ae0 100644
--- a/ak/server.po
+++ b/ak/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ak/services.po b/ak/services.po
index 1090190..f431938 100644
--- a/ak/services.po
+++ b/ak/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ak/troubleshooting.po b/ak/troubleshooting.po
index 5214888..dcebf75 100644
--- a/ak/troubleshooting.po
+++ b/ak/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/am/bridges.po b/am/bridges.po
index acfd642..cdcb9c5 100644
--- a/am/bridges.po
+++ b/am/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/am/config.po b/am/config.po
index 537a346..f093cb7 100644
--- a/am/config.po
+++ b/am/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/am/index.po b/am/index.po
index 45d25be..bcfdf11 100644
--- a/am/index.po
+++ b/am/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/am/links.po b/am/links.po
index b9d92c0..9763780 100644
--- a/am/links.po
+++ b/am/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/am/log.po b/am/log.po
index b5d3761..0dea1a5 100644
--- a/am/log.po
+++ b/am/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/am/netview.po b/am/netview.po
index 897a666..a783de0 100644
--- a/am/netview.po
+++ b/am/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/am/running.po b/am/running.po
index e28fa1b..f31d268 100644
--- a/am/running.po
+++ b/am/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/am/server.po b/am/server.po
index bbd257f..7b6c2af 100644
--- a/am/server.po
+++ b/am/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/am/services.po b/am/services.po
index 1090190..3d465c1 100644
--- a/am/services.po
+++ b/am/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/am/troubleshooting.po b/am/troubleshooting.po
index 5214888..43c2298 100644
--- a/am/troubleshooting.po
+++ b/am/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/arn/bridges.po b/arn/bridges.po
index 5d1db16..f5836d6 100644
--- a/arn/bridges.po
+++ b/arn/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/arn/config.po b/arn/config.po
index 537a346..1b04d3b 100644
--- a/arn/config.po
+++ b/arn/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/arn/index.po b/arn/index.po
index 45d25be..343e936 100644
--- a/arn/index.po
+++ b/arn/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/arn/links.po b/arn/links.po
index 0c679c3..0ce887d 100644
--- a/arn/links.po
+++ b/arn/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/arn/log.po b/arn/log.po
index b5d3761..444704b 100644
--- a/arn/log.po
+++ b/arn/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/arn/netview.po b/arn/netview.po
index cab82a6..41d5dc3 100644
--- a/arn/netview.po
+++ b/arn/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/arn/running.po b/arn/running.po
index e28fa1b..926a8b2 100644
--- a/arn/running.po
+++ b/arn/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/arn/server.po b/arn/server.po
index bbd257f..0eec6ae 100644
--- a/arn/server.po
+++ b/arn/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/arn/services.po b/arn/services.po
index 1090190..88f112b 100644
--- a/arn/services.po
+++ b/arn/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/arn/troubleshooting.po b/arn/troubleshooting.po
index 5214888..3c09ad8 100644
--- a/arn/troubleshooting.po
+++ b/arn/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ast/bridges.po b/ast/bridges.po
index 48a6e7e..daadc7f 100644
--- a/ast/bridges.po
+++ b/ast/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ast/config.po b/ast/config.po
index 537a346..0bdd2a4 100644
--- a/ast/config.po
+++ b/ast/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ast/index.po b/ast/index.po
index 45d25be..02e0e58 100644
--- a/ast/index.po
+++ b/ast/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ast/links.po b/ast/links.po
index 4d223e9..9fc74bf 100644
--- a/ast/links.po
+++ b/ast/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ast/log.po b/ast/log.po
index b5d3761..c101cb6 100644
--- a/ast/log.po
+++ b/ast/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ast/netview.po b/ast/netview.po
index 7b55d7f..a0b3ae9 100644
--- a/ast/netview.po
+++ b/ast/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ast/running.po b/ast/running.po
index e28fa1b..b6084e0 100644
--- a/ast/running.po
+++ b/ast/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ast/server.po b/ast/server.po
index bbd257f..14ede64 100644
--- a/ast/server.po
+++ b/ast/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ast/services.po b/ast/services.po
index 1090190..b1df907 100644
--- a/ast/services.po
+++ b/ast/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ast/troubleshooting.po b/ast/troubleshooting.po
index 5214888..ff08a8a 100644
--- a/ast/troubleshooting.po
+++ b/ast/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/az/bridges.po b/az/bridges.po
index ffee260..21fd248 100644
--- a/az/bridges.po
+++ b/az/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/az/config.po b/az/config.po
index 537a346..7cac06a 100644
--- a/az/config.po
+++ b/az/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/az/index.po b/az/index.po
index 45d25be..b39cf44 100644
--- a/az/index.po
+++ b/az/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/az/links.po b/az/links.po
index c06e26e..91f3dbe 100644
--- a/az/links.po
+++ b/az/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/az/log.po b/az/log.po
index b5d3761..284a8a6 100644
--- a/az/log.po
+++ b/az/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/az/netview.po b/az/netview.po
index 972180a..e315037 100644
--- a/az/netview.po
+++ b/az/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/az/running.po b/az/running.po
index e28fa1b..ed29e16 100644
--- a/az/running.po
+++ b/az/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/az/server.po b/az/server.po
index bbd257f..a094676 100644
--- a/az/server.po
+++ b/az/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/az/services.po b/az/services.po
index 1090190..fc67474 100644
--- a/az/services.po
+++ b/az/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/az/troubleshooting.po b/az/troubleshooting.po
index 5214888..8e48fc3 100644
--- a/az/troubleshooting.po
+++ b/az/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/be/bridges.po b/be/bridges.po
index fd25dda..d642b40 100644
--- a/be/bridges.po
+++ b/be/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/be/config.po b/be/config.po
index 537a346..cf37e9c 100644
--- a/be/config.po
+++ b/be/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/be/index.po b/be/index.po
index 45d25be..402ad80 100644
--- a/be/index.po
+++ b/be/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/be/links.po b/be/links.po
index 8577241..7323d8a 100644
--- a/be/links.po
+++ b/be/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/be/log.po b/be/log.po
index b5d3761..ce531d6 100644
--- a/be/log.po
+++ b/be/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/be/netview.po b/be/netview.po
index d61f118..fa0ad16 100644
--- a/be/netview.po
+++ b/be/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/be/running.po b/be/running.po
index e28fa1b..138e3cb 100644
--- a/be/running.po
+++ b/be/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/be/server.po b/be/server.po
index bbd257f..70a50b8 100644
--- a/be/server.po
+++ b/be/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/be/services.po b/be/services.po
index 1090190..098b49c 100644
--- a/be/services.po
+++ b/be/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/be/troubleshooting.po b/be/troubleshooting.po
index 5214888..e6cdfd0 100644
--- a/be/troubleshooting.po
+++ b/be/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/bg/bridges.po b/bg/bridges.po
index 748ff1a..702c02b 100644
--- a/bg/bridges.po
+++ b/bg/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/bg/config.po b/bg/config.po
index 537a346..c57965d 100644
--- a/bg/config.po
+++ b/bg/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/bg/index.po b/bg/index.po
index 45d25be..7eb548e 100644
--- a/bg/index.po
+++ b/bg/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/bg/links.po b/bg/links.po
index 8d388b7..507192e 100644
--- a/bg/links.po
+++ b/bg/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/bg/log.po b/bg/log.po
index b5d3761..1d80f4f 100644
--- a/bg/log.po
+++ b/bg/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/bg/netview.po b/bg/netview.po
index f8081bf..a7996fb 100644
--- a/bg/netview.po
+++ b/bg/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/bg/running.po b/bg/running.po
index e28fa1b..7136427 100644
--- a/bg/running.po
+++ b/bg/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/bg/server.po b/bg/server.po
index bbd257f..b1bb5a7 100644
--- a/bg/server.po
+++ b/bg/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/bg/services.po b/bg/services.po
index 1090190..7b99fbf 100644
--- a/bg/services.po
+++ b/bg/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/bg/troubleshooting.po b/bg/troubleshooting.po
index 5214888..1bdff1c 100644
--- a/bg/troubleshooting.po
+++ b/bg/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/bn/bridges.po b/bn/bridges.po
index 331b25b..6c1be73 100644
--- a/bn/bridges.po
+++ b/bn/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/bn/config.po b/bn/config.po
index 537a346..865c3e2 100644
--- a/bn/config.po
+++ b/bn/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/bn/index.po b/bn/index.po
index 45d25be..3d08681 100644
--- a/bn/index.po
+++ b/bn/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/bn/links.po b/bn/links.po
index a47c354..45882b9 100644
--- a/bn/links.po
+++ b/bn/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/bn/log.po b/bn/log.po
index b5d3761..2eb2c3e 100644
--- a/bn/log.po
+++ b/bn/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/bn/netview.po b/bn/netview.po
index e0ca4d3..2bcc3ab 100644
--- a/bn/netview.po
+++ b/bn/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/bn/running.po b/bn/running.po
index e28fa1b..216c0c5 100644
--- a/bn/running.po
+++ b/bn/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/bn/server.po b/bn/server.po
index bbd257f..6a5639d 100644
--- a/bn/server.po
+++ b/bn/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/bn/services.po b/bn/services.po
index 1090190..5682ccc 100644
--- a/bn/services.po
+++ b/bn/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/bn/troubleshooting.po b/bn/troubleshooting.po
index 5214888..7222541 100644
--- a/bn/troubleshooting.po
+++ b/bn/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/bn_IN/bridges.po b/bn_IN/bridges.po
index 2267cb3..4f457a1 100644
--- a/bn_IN/bridges.po
+++ b/bn_IN/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/bn_IN/config.po b/bn_IN/config.po
index 537a346..a5028f5 100644
--- a/bn_IN/config.po
+++ b/bn_IN/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/bn_IN/index.po b/bn_IN/index.po
index 45d25be..b0c2ed7 100644
--- a/bn_IN/index.po
+++ b/bn_IN/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/bn_IN/links.po b/bn_IN/links.po
index 162f6aa..0dc9ccf 100644
--- a/bn_IN/links.po
+++ b/bn_IN/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/bn_IN/log.po b/bn_IN/log.po
index b5d3761..bea8d45 100644
--- a/bn_IN/log.po
+++ b/bn_IN/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/bn_IN/netview.po b/bn_IN/netview.po
index 1f1aa2d..7e84047 100644
--- a/bn_IN/netview.po
+++ b/bn_IN/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/bn_IN/running.po b/bn_IN/running.po
index e28fa1b..8321fc9 100644
--- a/bn_IN/running.po
+++ b/bn_IN/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/bn_IN/server.po b/bn_IN/server.po
index bbd257f..da1bb46 100644
--- a/bn_IN/server.po
+++ b/bn_IN/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/bn_IN/services.po b/bn_IN/services.po
index 1090190..065865e 100644
--- a/bn_IN/services.po
+++ b/bn_IN/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/bn_IN/troubleshooting.po b/bn_IN/troubleshooting.po
index 5214888..ac15adb 100644
--- a/bn_IN/troubleshooting.po
+++ b/bn_IN/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/bo/bridges.po b/bo/bridges.po
index 7e87e97..3b945e8 100644
--- a/bo/bridges.po
+++ b/bo/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/bo/config.po b/bo/config.po
index 537a346..f661b4a 100644
--- a/bo/config.po
+++ b/bo/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/bo/index.po b/bo/index.po
index 45d25be..f3eb10f 100644
--- a/bo/index.po
+++ b/bo/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/bo/links.po b/bo/links.po
index 979d89d..fefc217 100644
--- a/bo/links.po
+++ b/bo/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/bo/log.po b/bo/log.po
index b5d3761..e468ae6 100644
--- a/bo/log.po
+++ b/bo/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/bo/netview.po b/bo/netview.po
index 133164f..41cdf86 100644
--- a/bo/netview.po
+++ b/bo/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bo\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/bo/running.po b/bo/running.po
index e28fa1b..a24fb8f 100644
--- a/bo/running.po
+++ b/bo/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/bo/server.po b/bo/server.po
index bbd257f..746ed9b 100644
--- a/bo/server.po
+++ b/bo/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/bo/services.po b/bo/services.po
index 1090190..7b1d9d8 100644
--- a/bo/services.po
+++ b/bo/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/bo/troubleshooting.po b/bo/troubleshooting.po
index 5214888..830c866 100644
--- a/bo/troubleshooting.po
+++ b/bo/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/br/bridges.po b/br/bridges.po
index 7e87e97..ce5d17e 100644
--- a/br/bridges.po
+++ b/br/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/br/config.po b/br/config.po
index 537a346..606fa4e 100644
--- a/br/config.po
+++ b/br/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/br/index.po b/br/index.po
index 45d25be..512b0d6 100644
--- a/br/index.po
+++ b/br/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/br/links.po b/br/links.po
index 979d89d..022e827 100644
--- a/br/links.po
+++ b/br/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/br/log.po b/br/log.po
index b5d3761..8311d1f 100644
--- a/br/log.po
+++ b/br/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/br/netview.po b/br/netview.po
index 133164f..af89154 100644
--- a/br/netview.po
+++ b/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: 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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/br/running.po b/br/running.po
index e28fa1b..44c23ea 100644
--- a/br/running.po
+++ b/br/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/br/server.po b/br/server.po
index bbd257f..83eb915 100644
--- a/br/server.po
+++ b/br/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/br/services.po b/br/services.po
index 1090190..7dad80f 100644
--- a/br/services.po
+++ b/br/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/br/troubleshooting.po b/br/troubleshooting.po
index 5214888..d3b4ef3 100644
--- a/br/troubleshooting.po
+++ b/br/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/bs/bridges.po b/bs/bridges.po
index 7e87e97..78bc371 100644
--- a/bs/bridges.po
+++ b/bs/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bs\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/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/bs/config.po b/bs/config.po
index 537a346..caf1ded 100644
--- a/bs/config.po
+++ b/bs/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bs\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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/bs/index.po b/bs/index.po
index 45d25be..338dd93 100644
--- a/bs/index.po
+++ b/bs/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bs\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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/bs/links.po b/bs/links.po
index 979d89d..a5d02b6 100644
--- a/bs/links.po
+++ b/bs/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bs\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/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/bs/log.po b/bs/log.po
index b5d3761..ff95a61 100644
--- a/bs/log.po
+++ b/bs/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bs\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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/bs/netview.po b/bs/netview.po
index 133164f..e1d6ee2 100644
--- a/bs/netview.po
+++ b/bs/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bs\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/bs/running.po b/bs/running.po
index e28fa1b..81caa65 100644
--- a/bs/running.po
+++ b/bs/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bs\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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/bs/server.po b/bs/server.po
index bbd257f..07cb842 100644
--- a/bs/server.po
+++ b/bs/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bs\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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/bs/services.po b/bs/services.po
index 1090190..62ce99c 100644
--- a/bs/services.po
+++ b/bs/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bs\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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/bs/troubleshooting.po b/bs/troubleshooting.po
index 5214888..bad6bae 100644
--- a/bs/troubleshooting.po
+++ b/bs/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: bs\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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ca/bridges.po b/ca/bridges.po
index d76785b..7f893d6 100644
--- a/ca/bridges.po
+++ b/ca/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ca/config.po b/ca/config.po
index 537a346..d0198ed 100644
--- a/ca/config.po
+++ b/ca/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ca/log.po b/ca/log.po
index b5d3761..5d38f21 100644
--- a/ca/log.po
+++ b/ca/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ca/netview.po b/ca/netview.po
index 9eafa61..f74c163 100644
--- a/ca/netview.po
+++ b/ca/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ca/running.po b/ca/running.po
index e28fa1b..a7a9070 100644
--- a/ca/running.po
+++ b/ca/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ca/server.po b/ca/server.po
index bbd257f..cdfda69 100644
--- a/ca/server.po
+++ b/ca/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ca/services.po b/ca/services.po
index 1090190..a46ea57 100644
--- a/ca/services.po
+++ b/ca/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ca/troubleshooting.po b/ca/troubleshooting.po
index 5214888..4ec28fb 100644
--- a/ca/troubleshooting.po
+++ b/ca/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/cs/bridges.po b/cs/bridges.po
index 83de383..ceb8d03 100644
--- a/cs/bridges.po
+++ b/cs/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/cs/config.po b/cs/config.po
index 537a346..580f887 100644
--- a/cs/config.po
+++ b/cs/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/cs/index.po b/cs/index.po
index 45d25be..3798e05 100644
--- a/cs/index.po
+++ b/cs/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/cs/links.po b/cs/links.po
index 6f5191d..9f9807f 100644
--- a/cs/links.po
+++ b/cs/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/cs/log.po b/cs/log.po
index b5d3761..ddba7ff 100644
--- a/cs/log.po
+++ b/cs/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/cs/netview.po b/cs/netview.po
index bebe57e..4debc44 100644
--- a/cs/netview.po
+++ b/cs/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/cs/running.po b/cs/running.po
index e28fa1b..cbaa386 100644
--- a/cs/running.po
+++ b/cs/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/cs/server.po b/cs/server.po
index bbd257f..90f33e3 100644
--- a/cs/server.po
+++ b/cs/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/cs/services.po b/cs/services.po
index 1090190..0af4aa1 100644
--- a/cs/services.po
+++ b/cs/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/cs/troubleshooting.po b/cs/troubleshooting.po
index 5214888..df53f86 100644
--- a/cs/troubleshooting.po
+++ b/cs/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/csb/bridges.po b/csb/bridges.po
index 123f062..ac580f3 100644
--- a/csb/bridges.po
+++ b/csb/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/csb/config.po b/csb/config.po
index 537a346..1d98970 100644
--- a/csb/config.po
+++ b/csb/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/csb/index.po b/csb/index.po
index 45d25be..caa7443 100644
--- a/csb/index.po
+++ b/csb/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/csb/links.po b/csb/links.po
index 0649133..2df908d 100644
--- a/csb/links.po
+++ b/csb/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/csb/log.po b/csb/log.po
index b5d3761..a824f1a 100644
--- a/csb/log.po
+++ b/csb/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/csb/netview.po b/csb/netview.po
index b2f2749..df375e7 100644
--- a/csb/netview.po
+++ b/csb/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/csb/running.po b/csb/running.po
index e28fa1b..652d6af 100644
--- a/csb/running.po
+++ b/csb/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/csb/server.po b/csb/server.po
index bbd257f..11021ad 100644
--- a/csb/server.po
+++ b/csb/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/csb/services.po b/csb/services.po
index 1090190..53715b5 100644
--- a/csb/services.po
+++ b/csb/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/csb/troubleshooting.po b/csb/troubleshooting.po
index 5214888..607de69 100644
--- a/csb/troubleshooting.po
+++ b/csb/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/cy/bridges.po b/cy/bridges.po
index bb968ed..c5c800e 100644
--- a/cy/bridges.po
+++ b/cy/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/cy/config.po b/cy/config.po
index 537a346..1cb9e38 100644
--- a/cy/config.po
+++ b/cy/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/cy/index.po b/cy/index.po
index 45d25be..50740cf 100644
--- a/cy/index.po
+++ b/cy/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/cy/log.po b/cy/log.po
index b5d3761..8e70701 100644
--- a/cy/log.po
+++ b/cy/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/cy/running.po b/cy/running.po
index e28fa1b..fc6354f 100644
--- a/cy/running.po
+++ b/cy/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/cy/server.po b/cy/server.po
index bbd257f..fe6a207 100644
--- a/cy/server.po
+++ b/cy/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/cy/services.po b/cy/services.po
index 1090190..18e28c7 100644
--- a/cy/services.po
+++ b/cy/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/cy/troubleshooting.po b/cy/troubleshooting.po
index 5214888..19842fe 100644
--- a/cy/troubleshooting.po
+++ b/cy/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/da/bridges.po b/da/bridges.po
index 7e87e97..e84c65b 100644
--- a/da/bridges.po
+++ b/da/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/da/netview.po b/da/netview.po
index 133164f..14d268e 100644
--- a/da/netview.po
+++ b/da/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/da/server.po b/da/server.po
index bbd257f..0eefafe 100644
--- a/da/server.po
+++ b/da/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/da/services.po b/da/services.po
index 1090190..def615d 100644
--- a/da/services.po
+++ b/da/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/da/troubleshooting.po b/da/troubleshooting.po
index 5214888..692b80b 100644
--- a/da/troubleshooting.po
+++ b/da/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/dz/bridges.po b/dz/bridges.po
index a6b0222..652a731 100644
--- a/dz/bridges.po
+++ b/dz/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/dz/config.po b/dz/config.po
index 537a346..ecf99dd 100644
--- a/dz/config.po
+++ b/dz/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/dz/index.po b/dz/index.po
index 45d25be..8384464 100644
--- a/dz/index.po
+++ b/dz/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/dz/links.po b/dz/links.po
index b925b40..f4fe5c7 100644
--- a/dz/links.po
+++ b/dz/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/dz/log.po b/dz/log.po
index b5d3761..c39a09f 100644
--- a/dz/log.po
+++ b/dz/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/dz/netview.po b/dz/netview.po
index 1972f2c..c5e6c47 100644
--- a/dz/netview.po
+++ b/dz/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/dz/running.po b/dz/running.po
index e28fa1b..fb9936c 100644
--- a/dz/running.po
+++ b/dz/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/dz/server.po b/dz/server.po
index bbd257f..4b6826a 100644
--- a/dz/server.po
+++ b/dz/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/dz/services.po b/dz/services.po
index 1090190..f6e4858 100644
--- a/dz/services.po
+++ b/dz/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/dz/troubleshooting.po b/dz/troubleshooting.po
index 5214888..53ecf58 100644
--- a/dz/troubleshooting.po
+++ b/dz/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/el/bridges.po b/el/bridges.po
index 0dfb3d3..02350d6 100644
--- a/el/bridges.po
+++ b/el/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/el/config.po b/el/config.po
index 537a346..c5ade0e 100644
--- a/el/config.po
+++ b/el/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/el/index.po b/el/index.po
index 45d25be..f042572 100644
--- a/el/index.po
+++ b/el/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/el/links.po b/el/links.po
index 1930b1d..03e5d8f 100644
--- a/el/links.po
+++ b/el/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/el/log.po b/el/log.po
index b5d3761..9ee3b2c 100644
--- a/el/log.po
+++ b/el/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/el/netview.po b/el/netview.po
index d2ed171..b947b29 100644
--- a/el/netview.po
+++ b/el/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/el/running.po b/el/running.po
index e28fa1b..ff9bec9 100644
--- a/el/running.po
+++ b/el/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/el/server.po b/el/server.po
index bbd257f..50b06ff 100644
--- a/el/server.po
+++ b/el/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/el/services.po b/el/services.po
index 1090190..9f2257e 100644
--- a/el/services.po
+++ b/el/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/el/troubleshooting.po b/el/troubleshooting.po
index 5214888..445e4b8 100644
--- a/el/troubleshooting.po
+++ b/el/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/eo/bridges.po b/eo/bridges.po
index b040609..c814b63 100644
--- a/eo/bridges.po
+++ b/eo/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/eo/config.po b/eo/config.po
index 537a346..2a08a16 100644
--- a/eo/config.po
+++ b/eo/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/eo/index.po b/eo/index.po
index 45d25be..59d9814 100644
--- a/eo/index.po
+++ b/eo/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/eo/links.po b/eo/links.po
index 0398bed..0f2d5f4 100644
--- a/eo/links.po
+++ b/eo/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/eo/log.po b/eo/log.po
index b5d3761..c29277d 100644
--- a/eo/log.po
+++ b/eo/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/eo/netview.po b/eo/netview.po
index 671abe3..72ae2a4 100644
--- a/eo/netview.po
+++ b/eo/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/eo/running.po b/eo/running.po
index e28fa1b..fafc9e4 100644
--- a/eo/running.po
+++ b/eo/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/eo/server.po b/eo/server.po
index bbd257f..3addb13 100644
--- a/eo/server.po
+++ b/eo/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/eo/services.po b/eo/services.po
index 1090190..b64e2b2 100644
--- a/eo/services.po
+++ b/eo/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/eo/troubleshooting.po b/eo/troubleshooting.po
index 5214888..39ccadd 100644
--- a/eo/troubleshooting.po
+++ b/eo/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/et/bridges.po b/et/bridges.po
index 642fb47..1c377f4 100644
--- a/et/bridges.po
+++ b/et/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/et/config.po b/et/config.po
index 537a346..4e85542 100644
--- a/et/config.po
+++ b/et/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/et/index.po b/et/index.po
index 45d25be..480a5d7 100644
--- a/et/index.po
+++ b/et/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/et/links.po b/et/links.po
index 4681b25..36fa3a0 100644
--- a/et/links.po
+++ b/et/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/et/log.po b/et/log.po
index b5d3761..edc0e1a 100644
--- a/et/log.po
+++ b/et/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/et/netview.po b/et/netview.po
index a92e219..d78188b 100644
--- a/et/netview.po
+++ b/et/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/et/running.po b/et/running.po
index e28fa1b..cc79304 100644
--- a/et/running.po
+++ b/et/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/et/server.po b/et/server.po
index bbd257f..0bae29d 100644
--- a/et/server.po
+++ b/et/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/et/services.po b/et/services.po
index 1090190..c98b967 100644
--- a/et/services.po
+++ b/et/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/et/troubleshooting.po b/et/troubleshooting.po
index 5214888..6909fcc 100644
--- a/et/troubleshooting.po
+++ b/et/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/eu/bridges.po b/eu/bridges.po
index 36d37e1..34a22a2 100644
--- a/eu/bridges.po
+++ b/eu/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/eu/config.po b/eu/config.po
index 537a346..6e23318 100644
--- a/eu/config.po
+++ b/eu/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/eu/index.po b/eu/index.po
index 45d25be..42bd432 100644
--- a/eu/index.po
+++ b/eu/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/eu/links.po b/eu/links.po
index dfc8155..70a0eec 100644
--- a/eu/links.po
+++ b/eu/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/eu/log.po b/eu/log.po
index b5d3761..bdf08f5 100644
--- a/eu/log.po
+++ b/eu/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/eu/netview.po b/eu/netview.po
index e0cd895..25fbbbb 100644
--- a/eu/netview.po
+++ b/eu/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/eu/running.po b/eu/running.po
index e28fa1b..94929b9 100644
--- a/eu/running.po
+++ b/eu/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/eu/server.po b/eu/server.po
index bbd257f..ce82def 100644
--- a/eu/server.po
+++ b/eu/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/eu/services.po b/eu/services.po
index 1090190..b1852d8 100644
--- a/eu/services.po
+++ b/eu/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/eu/troubleshooting.po b/eu/troubleshooting.po
index 5214888..c89518e 100644
--- a/eu/troubleshooting.po
+++ b/eu/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/fi/bridges.po b/fi/bridges.po
index a3181cb..6d29137 100644
--- a/fi/bridges.po
+++ b/fi/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/fi/config.po b/fi/config.po
index e9450b3..e283eec 100644
--- a/fi/config.po
+++ b/fi/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/fi/index.po b/fi/index.po
index b4a7941..8b16118 100644
--- a/fi/index.po
+++ b/fi/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/fi/links.po b/fi/links.po
index d2efb53..3095d55 100644
--- a/fi/links.po
+++ b/fi/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/fi/log.po b/fi/log.po
index 7e226bc..b0d6adf 100644
--- a/fi/log.po
+++ b/fi/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/fi/netview.po b/fi/netview.po
index 3ab66ec..e006f11 100644
--- a/fi/netview.po
+++ b/fi/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fi\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/fi/running.po b/fi/running.po
index b503af0..c25d39a 100644
--- a/fi/running.po
+++ b/fi/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/fi/server.po b/fi/server.po
index 3cb445f..3fb2fe8 100644
--- a/fi/server.po
+++ b/fi/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/fi/services.po b/fi/services.po
index 73d206c..76ee3c5 100644
--- a/fi/services.po
+++ b/fi/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/fi/troubleshooting.po b/fi/troubleshooting.po
index b495396..b394be1 100644
--- a/fi/troubleshooting.po
+++ b/fi/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/fil/bridges.po b/fil/bridges.po
index 3684795..04925f6 100644
--- a/fil/bridges.po
+++ b/fil/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/fil/config.po b/fil/config.po
index 537a346..b7083e1 100644
--- a/fil/config.po
+++ b/fil/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/fil/index.po b/fil/index.po
index 45d25be..16df738 100644
--- a/fil/index.po
+++ b/fil/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/fil/links.po b/fil/links.po
index 644f0f6..39113e9 100644
--- a/fil/links.po
+++ b/fil/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/fil/log.po b/fil/log.po
index b5d3761..94ea12c 100644
--- a/fil/log.po
+++ b/fil/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/fil/netview.po b/fil/netview.po
index 4b963d6..bcea607 100644
--- a/fil/netview.po
+++ b/fil/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/fil/running.po b/fil/running.po
index e28fa1b..8a38552 100644
--- a/fil/running.po
+++ b/fil/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/fil/server.po b/fil/server.po
index bbd257f..0b21dfe 100644
--- a/fil/server.po
+++ b/fil/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/fil/services.po b/fil/services.po
index 1090190..95a7848 100644
--- a/fil/services.po
+++ b/fil/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/fil/troubleshooting.po b/fil/troubleshooting.po
index 5214888..91bc81f 100644
--- a/fil/troubleshooting.po
+++ b/fil/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/fo/bridges.po b/fo/bridges.po
index 7e87e97..f9412f7 100644
--- a/fo/bridges.po
+++ b/fo/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/fo/config.po b/fo/config.po
index 537a346..0977c97 100644
--- a/fo/config.po
+++ b/fo/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/fo/index.po b/fo/index.po
index 45d25be..2c7bc76 100644
--- a/fo/index.po
+++ b/fo/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/fo/links.po b/fo/links.po
index 979d89d..7b7f1b3 100644
--- a/fo/links.po
+++ b/fo/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/fo/log.po b/fo/log.po
index b5d3761..dd6457f 100644
--- a/fo/log.po
+++ b/fo/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/fo/netview.po b/fo/netview.po
index 133164f..039b750 100644
--- a/fo/netview.po
+++ b/fo/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fo\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/fo/running.po b/fo/running.po
index e28fa1b..74765a7 100644
--- a/fo/running.po
+++ b/fo/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/fo/server.po b/fo/server.po
index bbd257f..5fe5c0c 100644
--- a/fo/server.po
+++ b/fo/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/fo/services.po b/fo/services.po
index 1090190..0b1e466 100644
--- a/fo/services.po
+++ b/fo/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/fo/troubleshooting.po b/fo/troubleshooting.po
index 5214888..5d7a9f1 100644
--- a/fo/troubleshooting.po
+++ b/fo/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/fur/bridges.po b/fur/bridges.po
index 7af9c83..aaf210e 100644
--- a/fur/bridges.po
+++ b/fur/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/fur/config.po b/fur/config.po
index 537a346..caec393 100644
--- a/fur/config.po
+++ b/fur/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/fur/index.po b/fur/index.po
index 45d25be..adee8ef 100644
--- a/fur/index.po
+++ b/fur/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/fur/links.po b/fur/links.po
index 9d61c1a..1e23e6e 100644
--- a/fur/links.po
+++ b/fur/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/fur/log.po b/fur/log.po
index b5d3761..fed00dc 100644
--- a/fur/log.po
+++ b/fur/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/fur/netview.po b/fur/netview.po
index 97d91c6..68a4d8d 100644
--- a/fur/netview.po
+++ b/fur/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/fur/running.po b/fur/running.po
index e28fa1b..010698f 100644
--- a/fur/running.po
+++ b/fur/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/fur/server.po b/fur/server.po
index bbd257f..85a15d0 100644
--- a/fur/server.po
+++ b/fur/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/fur/services.po b/fur/services.po
index 1090190..d5beda4 100644
--- a/fur/services.po
+++ b/fur/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/fur/troubleshooting.po b/fur/troubleshooting.po
index 5214888..ac74d81 100644
--- a/fur/troubleshooting.po
+++ b/fur/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/fy/bridges.po b/fy/bridges.po
index 7e87e97..e5ee1e3 100644
--- a/fy/bridges.po
+++ b/fy/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/fy/config.po b/fy/config.po
index 537a346..e12f2e3 100644
--- a/fy/config.po
+++ b/fy/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/fy/index.po b/fy/index.po
index 45d25be..5d9c13b 100644
--- a/fy/index.po
+++ b/fy/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/fy/links.po b/fy/links.po
index 979d89d..eede29f 100644
--- a/fy/links.po
+++ b/fy/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/fy/log.po b/fy/log.po
index b5d3761..1539586 100644
--- a/fy/log.po
+++ b/fy/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/fy/netview.po b/fy/netview.po
index 133164f..66b30a4 100644
--- a/fy/netview.po
+++ b/fy/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fy\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/fy/running.po b/fy/running.po
index e28fa1b..8908549 100644
--- a/fy/running.po
+++ b/fy/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/fy/server.po b/fy/server.po
index bbd257f..825203c 100644
--- a/fy/server.po
+++ b/fy/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/fy/services.po b/fy/services.po
index 1090190..d3741bf 100644
--- a/fy/services.po
+++ b/fy/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/fy/troubleshooting.po b/fy/troubleshooting.po
index 5214888..00501b0 100644
--- a/fy/troubleshooting.po
+++ b/fy/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ga/bridges.po b/ga/bridges.po
index 1c8df59..dc60b55 100644
--- a/ga/bridges.po
+++ b/ga/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ga/config.po b/ga/config.po
index 537a346..624ee34 100644
--- a/ga/config.po
+++ b/ga/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ga/index.po b/ga/index.po
index 45d25be..3307d94 100644
--- a/ga/index.po
+++ b/ga/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ga/links.po b/ga/links.po
index 631297f..a009458 100644
--- a/ga/links.po
+++ b/ga/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ga/log.po b/ga/log.po
index b5d3761..14b13c2 100644
--- a/ga/log.po
+++ b/ga/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ga/netview.po b/ga/netview.po
index 32c871f..5fa9255 100644
--- a/ga/netview.po
+++ b/ga/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ga/running.po b/ga/running.po
index e28fa1b..7ea6140 100644
--- a/ga/running.po
+++ b/ga/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ga/server.po b/ga/server.po
index bbd257f..cad2559 100644
--- a/ga/server.po
+++ b/ga/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ga/services.po b/ga/services.po
index 1090190..cf49252 100644
--- a/ga/services.po
+++ b/ga/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ga/troubleshooting.po b/ga/troubleshooting.po
index 5214888..b632abc 100644
--- a/ga/troubleshooting.po
+++ b/ga/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/gl/bridges.po b/gl/bridges.po
index 5a952cc..c3daf54 100644
--- a/gl/bridges.po
+++ b/gl/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/gl/config.po b/gl/config.po
index 537a346..11f53f0 100644
--- a/gl/config.po
+++ b/gl/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/gl/index.po b/gl/index.po
index 45d25be..803e472 100644
--- a/gl/index.po
+++ b/gl/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/gl/links.po b/gl/links.po
index 27d48e1..db8cb59 100644
--- a/gl/links.po
+++ b/gl/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/gl/log.po b/gl/log.po
index b5d3761..33c4c1b 100644
--- a/gl/log.po
+++ b/gl/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/gl/netview.po b/gl/netview.po
index d5da78b..5e3bae7 100644
--- a/gl/netview.po
+++ b/gl/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/gl/running.po b/gl/running.po
index e28fa1b..a0e294f 100644
--- a/gl/running.po
+++ b/gl/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/gl/server.po b/gl/server.po
index bbd257f..f9a9db9 100644
--- a/gl/server.po
+++ b/gl/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/gl/services.po b/gl/services.po
index 1090190..0346638 100644
--- a/gl/services.po
+++ b/gl/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/gl/troubleshooting.po b/gl/troubleshooting.po
index 5214888..e5e3b24 100644
--- a/gl/troubleshooting.po
+++ b/gl/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/gu/bridges.po b/gu/bridges.po
index 10a965b..9e8cdc4 100644
--- a/gu/bridges.po
+++ b/gu/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/gu/config.po b/gu/config.po
index 537a346..1af45c7 100644
--- a/gu/config.po
+++ b/gu/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/gu/index.po b/gu/index.po
index 45d25be..a9d9758 100644
--- a/gu/index.po
+++ b/gu/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/gu/links.po b/gu/links.po
index 41f4e7f..94c8f1d 100644
--- a/gu/links.po
+++ b/gu/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/gu/log.po b/gu/log.po
index b5d3761..238642b 100644
--- a/gu/log.po
+++ b/gu/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/gu/netview.po b/gu/netview.po
index f547f18..69dd108 100644
--- a/gu/netview.po
+++ b/gu/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-09-03 12:48+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/gu/running.po b/gu/running.po
index e28fa1b..d5b0bce 100644
--- a/gu/running.po
+++ b/gu/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/gu/server.po b/gu/server.po
index bbd257f..d203c4b 100644
--- a/gu/server.po
+++ b/gu/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/gu/services.po b/gu/services.po
index 1090190..6181368 100644
--- a/gu/services.po
+++ b/gu/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/gu/troubleshooting.po b/gu/troubleshooting.po
index 5214888..32bf283 100644
--- a/gu/troubleshooting.po
+++ b/gu/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/gun/bridges.po b/gun/bridges.po
index aaf10ff..a24b78c 100644
--- a/gun/bridges.po
+++ b/gun/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/gun/config.po b/gun/config.po
index 537a346..a22e6c9 100644
--- a/gun/config.po
+++ b/gun/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/gun/index.po b/gun/index.po
index 45d25be..8f6a1df 100644
--- a/gun/index.po
+++ b/gun/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/gun/links.po b/gun/links.po
index 138150d..3716480 100644
--- a/gun/links.po
+++ b/gun/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/gun/log.po b/gun/log.po
index b5d3761..489266f 100644
--- a/gun/log.po
+++ b/gun/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/gun/netview.po b/gun/netview.po
index 8322948..3787b04 100644
--- a/gun/netview.po
+++ b/gun/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/gun/running.po b/gun/running.po
index e28fa1b..ad2a170 100644
--- a/gun/running.po
+++ b/gun/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/gun/server.po b/gun/server.po
index bbd257f..db2a252 100644
--- a/gun/server.po
+++ b/gun/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/gun/services.po b/gun/services.po
index 1090190..fdce154 100644
--- a/gun/services.po
+++ b/gun/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/gun/troubleshooting.po b/gun/troubleshooting.po
index 5214888..456d5fd 100644
--- a/gun/troubleshooting.po
+++ b/gun/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ha/bridges.po b/ha/bridges.po
index 877229f..6f244d1 100644
--- a/ha/bridges.po
+++ b/ha/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ha/config.po b/ha/config.po
index 537a346..dfd0e16 100644
--- a/ha/config.po
+++ b/ha/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ha/index.po b/ha/index.po
index 45d25be..200cbc0 100644
--- a/ha/index.po
+++ b/ha/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ha/links.po b/ha/links.po
index 20ab0ae..24e0029 100644
--- a/ha/links.po
+++ b/ha/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ha/log.po b/ha/log.po
index b5d3761..03cfe44 100644
--- a/ha/log.po
+++ b/ha/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ha/netview.po b/ha/netview.po
index eb9d4b9..5c07b5b 100644
--- a/ha/netview.po
+++ b/ha/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ha/running.po b/ha/running.po
index e28fa1b..8986342 100644
--- a/ha/running.po
+++ b/ha/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ha/server.po b/ha/server.po
index bbd257f..3b1108f 100644
--- a/ha/server.po
+++ b/ha/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ha/services.po b/ha/services.po
index 1090190..259044d 100644
--- a/ha/services.po
+++ b/ha/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ha/troubleshooting.po b/ha/troubleshooting.po
index 5214888..7d04307 100644
--- a/ha/troubleshooting.po
+++ b/ha/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/he/bridges.po b/he/bridges.po
index 45d674c..e30677e 100644
--- a/he/bridges.po
+++ b/he/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/he/config.po b/he/config.po
index 537a346..788cca3 100644
--- a/he/config.po
+++ b/he/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/he/index.po b/he/index.po
index 45d25be..a987021 100644
--- a/he/index.po
+++ b/he/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/he/links.po b/he/links.po
index cb7ed2a..cf3f25e 100644
--- a/he/links.po
+++ b/he/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/he/log.po b/he/log.po
index b5d3761..6a1c5b6 100644
--- a/he/log.po
+++ b/he/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/he/netview.po b/he/netview.po
index e0e965d..0744b93 100644
--- a/he/netview.po
+++ b/he/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/he/running.po b/he/running.po
index e28fa1b..aa2ef6f 100644
--- a/he/running.po
+++ b/he/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/he/server.po b/he/server.po
index bbd257f..4f13780 100644
--- a/he/server.po
+++ b/he/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/he/services.po b/he/services.po
index 1090190..637b783 100644
--- a/he/services.po
+++ b/he/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/he/troubleshooting.po b/he/troubleshooting.po
index 5214888..ce1e1c6 100644
--- a/he/troubleshooting.po
+++ b/he/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/hi/bridges.po b/hi/bridges.po
index 08125fe..fae40c2 100644
--- a/hi/bridges.po
+++ b/hi/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/hi/config.po b/hi/config.po
index 537a346..22dbf7b 100644
--- a/hi/config.po
+++ b/hi/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/hi/index.po b/hi/index.po
index 45d25be..ddca2d7 100644
--- a/hi/index.po
+++ b/hi/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/hi/links.po b/hi/links.po
index 94db9a9..3a280ef 100644
--- a/hi/links.po
+++ b/hi/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/hi/log.po b/hi/log.po
index b5d3761..300cead 100644
--- a/hi/log.po
+++ b/hi/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/hi/netview.po b/hi/netview.po
index 67ce337..d458ee0 100644
--- a/hi/netview.po
+++ b/hi/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/hi/running.po b/hi/running.po
index e28fa1b..1894aa8 100644
--- a/hi/running.po
+++ b/hi/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/hi/server.po b/hi/server.po
index bbd257f..fcba940 100644
--- a/hi/server.po
+++ b/hi/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/hi/services.po b/hi/services.po
index 1090190..db8315f 100644
--- a/hi/services.po
+++ b/hi/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/hi/troubleshooting.po b/hi/troubleshooting.po
index 5214888..ac9c3d6 100644
--- a/hi/troubleshooting.po
+++ b/hi/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/hr/bridges.po b/hr/bridges.po
index 6a069a7..2fd4ec8 100644
--- a/hr/bridges.po
+++ b/hr/bridges.po
@@ -4,14 +4,14 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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/bridges.html:16
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/hr/config.po b/hr/config.po
index 537a346..6af494c 100644
--- a/hr/config.po
+++ b/hr/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/hr/index.po b/hr/index.po
index 45d25be..849a018 100644
--- a/hr/index.po
+++ b/hr/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/hr/links.po b/hr/links.po
index fd8b0ad..a859beb 100644
--- a/hr/links.po
+++ b/hr/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/hr/log.po b/hr/log.po
index b5d3761..a89d1a4 100644
--- a/hr/log.po
+++ b/hr/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/hr/netview.po b/hr/netview.po
index ab1ab1b..980db11 100644
--- a/hr/netview.po
+++ b/hr/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/hr/running.po b/hr/running.po
index e28fa1b..6cf5dcb 100644
--- a/hr/running.po
+++ b/hr/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/hr/server.po b/hr/server.po
index bbd257f..ec58b67 100644
--- a/hr/server.po
+++ b/hr/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/hr/services.po b/hr/services.po
index 1090190..faf667a 100644
--- a/hr/services.po
+++ b/hr/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/hr/troubleshooting.po b/hr/troubleshooting.po
index 5214888..aff24ba 100644
--- a/hr/troubleshooting.po
+++ b/hr/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ht/bridges.po b/ht/bridges.po
index edaaf36..55aac7e 100644
--- a/ht/bridges.po
+++ b/ht/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ht/config.po b/ht/config.po
index 537a346..8e4603e 100644
--- a/ht/config.po
+++ b/ht/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ht/index.po b/ht/index.po
index 45d25be..69be76c 100644
--- a/ht/index.po
+++ b/ht/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ht/links.po b/ht/links.po
index b378912..071c011 100644
--- a/ht/links.po
+++ b/ht/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ht/log.po b/ht/log.po
index b5d3761..1bdf529 100644
--- a/ht/log.po
+++ b/ht/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ht/netview.po b/ht/netview.po
index 333a3f7..3791682 100644
--- a/ht/netview.po
+++ b/ht/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ht/running.po b/ht/running.po
index e28fa1b..621cd63 100644
--- a/ht/running.po
+++ b/ht/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ht/server.po b/ht/server.po
index bbd257f..7ac96c9 100644
--- a/ht/server.po
+++ b/ht/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ht/services.po b/ht/services.po
index 1090190..97d02a7 100644
--- a/ht/services.po
+++ b/ht/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ht/troubleshooting.po b/ht/troubleshooting.po
index 5214888..c0d80b8 100644
--- a/ht/troubleshooting.po
+++ b/ht/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/hu/bridges.po b/hu/bridges.po
index 9f58754..8599407 100644
--- a/hu/bridges.po
+++ b/hu/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/hu/config.po b/hu/config.po
index 537a346..d3115be 100644
--- a/hu/config.po
+++ b/hu/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/hu/index.po b/hu/index.po
index 45d25be..31c2bef 100644
--- a/hu/index.po
+++ b/hu/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/hu/links.po b/hu/links.po
index 006a530..180d1f6 100644
--- a/hu/links.po
+++ b/hu/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/hu/log.po b/hu/log.po
index b5d3761..9da9871 100644
--- a/hu/log.po
+++ b/hu/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/hu/netview.po b/hu/netview.po
index 1318bc2..9bb9b11 100644
--- a/hu/netview.po
+++ b/hu/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/hu/running.po b/hu/running.po
index e28fa1b..c1f6de8 100644
--- a/hu/running.po
+++ b/hu/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/hu/server.po b/hu/server.po
index bbd257f..a3779dc 100644
--- a/hu/server.po
+++ b/hu/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/hu/services.po b/hu/services.po
index 1090190..3670463 100644
--- a/hu/services.po
+++ b/hu/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/hu/troubleshooting.po b/hu/troubleshooting.po
index 5214888..12404bb 100644
--- a/hu/troubleshooting.po
+++ b/hu/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/hu_HU/index.po b/hu_HU/index.po
new file mode 100644
index 0000000..77e1406
--- /dev/null
+++ b/hu_HU/index.po
@@ -0,0 +1,48 @@
+# 
+#   viktor.varga@gmail.com, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2010-06-26 16:59+0200\n"
+"PO-Revision-Date: 2011-07-16 12:16+0000\n"
+"Last-Translator: vargaviktor viktor.varga@gmail.com\n"
+"Language-Team: LANGUAGE LL@li.org\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#. type: Content of: <html><body><h1>
+#: en/index.html:16
+msgid "Vidalia Help"
+msgstr "Vidalia Súgó"
+
+#. type: Content of: <html><body><p>
+#: en/index.html:20
+msgid ""
+"Select a help topic from the tree on the left or click on the Search button "
+"above the list of topics to search through all available help topics."
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html:25
+msgid ""
+"You can use the <i>Find</i> button on the toolbar above to search within a "
+"particular help topic."
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html:30
+msgid "The <i>Home</i> button above will bring you back to this home page."
+msgstr ""
+
+#. type: Content of: <html><body><p>
+#: en/index.html:34
+msgid ""
+"See the <a href="links.html">Helpful Links</a> topic for some places you "
+"can visit to find additional help and information about Vidalia and Tor."
+msgstr ""
+
+
diff --git a/hy/bridges.po b/hy/bridges.po
index 7e87e97..91255be 100644
--- a/hy/bridges.po
+++ b/hy/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/hy/config.po b/hy/config.po
index 537a346..319b25b 100644
--- a/hy/config.po
+++ b/hy/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/hy/index.po b/hy/index.po
index 45d25be..7aed104 100644
--- a/hy/index.po
+++ b/hy/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/hy/links.po b/hy/links.po
index 979d89d..a1b58ba 100644
--- a/hy/links.po
+++ b/hy/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/hy/log.po b/hy/log.po
index b5d3761..3526a83 100644
--- a/hy/log.po
+++ b/hy/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/hy/netview.po b/hy/netview.po
index 133164f..9e20fb6 100644
--- a/hy/netview.po
+++ b/hy/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: hy\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/hy/running.po b/hy/running.po
index e28fa1b..fa405a5 100644
--- a/hy/running.po
+++ b/hy/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/hy/server.po b/hy/server.po
index bbd257f..afb4ee8 100644
--- a/hy/server.po
+++ b/hy/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/hy/services.po b/hy/services.po
index 1090190..1146c0e 100644
--- a/hy/services.po
+++ b/hy/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/hy/troubleshooting.po b/hy/troubleshooting.po
index 5214888..20686aa 100644
--- a/hy/troubleshooting.po
+++ b/hy/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/id/bridges.po b/id/bridges.po
index 4e83895..43060c6 100644
--- a/id/bridges.po
+++ b/id/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/id/config.po b/id/config.po
index 537a346..565396f 100644
--- a/id/config.po
+++ b/id/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/id/index.po b/id/index.po
index 45d25be..37e4deb 100644
--- a/id/index.po
+++ b/id/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/id/links.po b/id/links.po
index 4f9f9db..f648708 100644
--- a/id/links.po
+++ b/id/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/id/log.po b/id/log.po
index b5d3761..d55b21e 100644
--- a/id/log.po
+++ b/id/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/id/netview.po b/id/netview.po
index c0fbb87..29710c3 100644
--- a/id/netview.po
+++ b/id/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/id/running.po b/id/running.po
index e28fa1b..838708c 100644
--- a/id/running.po
+++ b/id/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/id/server.po b/id/server.po
index bbd257f..7cf3ba5 100644
--- a/id/server.po
+++ b/id/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/id/services.po b/id/services.po
index 1090190..41c28ac 100644
--- a/id/services.po
+++ b/id/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/id/troubleshooting.po b/id/troubleshooting.po
index 5214888..738ca9a 100644
--- a/id/troubleshooting.po
+++ b/id/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/is/bridges.po b/is/bridges.po
index cb5bd33..d43d02d 100644
--- a/is/bridges.po
+++ b/is/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/is/config.po b/is/config.po
index 537a346..5120280 100644
--- a/is/config.po
+++ b/is/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/is/index.po b/is/index.po
index 45d25be..87bd16a 100644
--- a/is/index.po
+++ b/is/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/is/links.po b/is/links.po
index ad58084..b48647b 100644
--- a/is/links.po
+++ b/is/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/is/log.po b/is/log.po
index b5d3761..8783ce1 100644
--- a/is/log.po
+++ b/is/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/is/netview.po b/is/netview.po
index fddd1fa..7c9b420 100644
--- a/is/netview.po
+++ b/is/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/is/running.po b/is/running.po
index e28fa1b..33caccd 100644
--- a/is/running.po
+++ b/is/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/is/server.po b/is/server.po
index bbd257f..cf049ec 100644
--- a/is/server.po
+++ b/is/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/is/services.po b/is/services.po
index 1090190..4efcc13 100644
--- a/is/services.po
+++ b/is/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/is/troubleshooting.po b/is/troubleshooting.po
index 5214888..1d9411a 100644
--- a/is/troubleshooting.po
+++ b/is/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ja/bridges.po b/ja/bridges.po
index 7e87e97..c2860d9 100644
--- a/ja/bridges.po
+++ b/ja/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ja/config.po b/ja/config.po
index 537a346..1f541a7 100644
--- a/ja/config.po
+++ b/ja/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ja/index.po b/ja/index.po
index 45d25be..a8349b2 100644
--- a/ja/index.po
+++ b/ja/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ja/links.po b/ja/links.po
index 979d89d..2df55ff 100644
--- a/ja/links.po
+++ b/ja/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/ja/log.po b/ja/log.po
index b5d3761..bccf716 100644
--- a/ja/log.po
+++ b/ja/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ja/netview.po b/ja/netview.po
index 133164f..19f1424 100644
--- a/ja/netview.po
+++ b/ja/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ja\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/ja/running.po b/ja/running.po
index e28fa1b..4fdaebd 100644
--- a/ja/running.po
+++ b/ja/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ja/server.po b/ja/server.po
index bbd257f..8365930 100644
--- a/ja/server.po
+++ b/ja/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ja/services.po b/ja/services.po
index 1090190..bac3f6e 100644
--- a/ja/services.po
+++ b/ja/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ja/troubleshooting.po b/ja/troubleshooting.po
index 5214888..55ff55d 100644
--- a/ja/troubleshooting.po
+++ b/ja/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/jv/bridges.po b/jv/bridges.po
index 7e87e97..8f9dde1 100644
--- a/jv/bridges.po
+++ b/jv/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/jv/config.po b/jv/config.po
index 537a346..571ab17 100644
--- a/jv/config.po
+++ b/jv/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/jv/index.po b/jv/index.po
index 45d25be..4f9af0f 100644
--- a/jv/index.po
+++ b/jv/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/jv/links.po b/jv/links.po
index 979d89d..353be50 100644
--- a/jv/links.po
+++ b/jv/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/jv/log.po b/jv/log.po
index b5d3761..c9b8dfe 100644
--- a/jv/log.po
+++ b/jv/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/jv/netview.po b/jv/netview.po
index 133164f..28fefd0 100644
--- a/jv/netview.po
+++ b/jv/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: jv\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/jv/running.po b/jv/running.po
index e28fa1b..95625ed 100644
--- a/jv/running.po
+++ b/jv/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/jv/server.po b/jv/server.po
index bbd257f..42271df 100644
--- a/jv/server.po
+++ b/jv/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/jv/services.po b/jv/services.po
index 1090190..f5ca75b 100644
--- a/jv/services.po
+++ b/jv/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/jv/troubleshooting.po b/jv/troubleshooting.po
index 5214888..efed739 100644
--- a/jv/troubleshooting.po
+++ b/jv/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ka/bridges.po b/ka/bridges.po
index 7e87e97..44ddd5a 100644
--- a/ka/bridges.po
+++ b/ka/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ka\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ka/config.po b/ka/config.po
index 537a346..7aa82fc 100644
--- a/ka/config.po
+++ b/ka/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ka\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ka/index.po b/ka/index.po
index 45d25be..ef51f3d 100644
--- a/ka/index.po
+++ b/ka/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ka\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ka/links.po b/ka/links.po
index 979d89d..749244c 100644
--- a/ka/links.po
+++ b/ka/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ka\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/ka/log.po b/ka/log.po
index b5d3761..4793a50 100644
--- a/ka/log.po
+++ b/ka/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ka\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ka/netview.po b/ka/netview.po
index 133164f..3aa4603 100644
--- a/ka/netview.po
+++ b/ka/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ka\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/ka/running.po b/ka/running.po
index e28fa1b..8c5a240 100644
--- a/ka/running.po
+++ b/ka/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ka\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ka/server.po b/ka/server.po
index bbd257f..444a2c2 100644
--- a/ka/server.po
+++ b/ka/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ka\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ka/services.po b/ka/services.po
index 1090190..45d3356 100644
--- a/ka/services.po
+++ b/ka/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ka\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ka/troubleshooting.po b/ka/troubleshooting.po
index 5214888..b4fa9ee 100644
--- a/ka/troubleshooting.po
+++ b/ka/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ka\n"
+"Plural-Forms: nplurals=1; plural=0\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/km/bridges.po b/km/bridges.po
index 7e87e97..c7d3ea1 100644
--- a/km/bridges.po
+++ b/km/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: km\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/km/config.po b/km/config.po
index 537a346..f6d20f0 100644
--- a/km/config.po
+++ b/km/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: km\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/km/index.po b/km/index.po
index 45d25be..12be863 100644
--- a/km/index.po
+++ b/km/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: km\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/km/links.po b/km/links.po
index 979d89d..f2835ec 100644
--- a/km/links.po
+++ b/km/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: km\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/km/log.po b/km/log.po
index b5d3761..75a91c4 100644
--- a/km/log.po
+++ b/km/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: km\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/km/netview.po b/km/netview.po
index 133164f..8b9c408 100644
--- a/km/netview.po
+++ b/km/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: km\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/km/running.po b/km/running.po
index e28fa1b..e339208 100644
--- a/km/running.po
+++ b/km/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: km\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/km/server.po b/km/server.po
index bbd257f..c0080dc 100644
--- a/km/server.po
+++ b/km/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: km\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/km/services.po b/km/services.po
index 1090190..3a746b9 100644
--- a/km/services.po
+++ b/km/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: km\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/km/troubleshooting.po b/km/troubleshooting.po
index 5214888..8c5440a 100644
--- a/km/troubleshooting.po
+++ b/km/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: km\n"
+"Plural-Forms: nplurals=1; plural=0\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/kn/bridges.po b/kn/bridges.po
index e09d23e..37d772a 100644
--- a/kn/bridges.po
+++ b/kn/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/kn/config.po b/kn/config.po
index 537a346..c18a0c0 100644
--- a/kn/config.po
+++ b/kn/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/kn/index.po b/kn/index.po
index 45d25be..02f8de5 100644
--- a/kn/index.po
+++ b/kn/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/kn/links.po b/kn/links.po
index 1753f49..6183d88 100644
--- a/kn/links.po
+++ b/kn/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/kn/log.po b/kn/log.po
index b5d3761..53e4dc0 100644
--- a/kn/log.po
+++ b/kn/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/kn/netview.po b/kn/netview.po
index bea7a23..2e72d59 100644
--- a/kn/netview.po
+++ b/kn/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/kn/running.po b/kn/running.po
index e28fa1b..144aa45 100644
--- a/kn/running.po
+++ b/kn/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/kn/server.po b/kn/server.po
index bbd257f..49eb710 100644
--- a/kn/server.po
+++ b/kn/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/kn/services.po b/kn/services.po
index 1090190..7d47242 100644
--- a/kn/services.po
+++ b/kn/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/kn/troubleshooting.po b/kn/troubleshooting.po
index 5214888..b1e4c6e 100644
--- a/kn/troubleshooting.po
+++ b/kn/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ko/bridges.po b/ko/bridges.po
index 7e87e97..f602bb0 100644
--- a/ko/bridges.po
+++ b/ko/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ko/config.po b/ko/config.po
index 537a346..33fb63e 100644
--- a/ko/config.po
+++ b/ko/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ko/index.po b/ko/index.po
index 45d25be..07d19c3 100644
--- a/ko/index.po
+++ b/ko/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ko/links.po b/ko/links.po
index 979d89d..0462f91 100644
--- a/ko/links.po
+++ b/ko/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/ko/log.po b/ko/log.po
index b5d3761..8516fcc 100644
--- a/ko/log.po
+++ b/ko/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ko/netview.po b/ko/netview.po
index 133164f..ab9042e 100644
--- a/ko/netview.po
+++ b/ko/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ko\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/ko/running.po b/ko/running.po
index e28fa1b..023c264 100644
--- a/ko/running.po
+++ b/ko/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ko/server.po b/ko/server.po
index bbd257f..e47614d 100644
--- a/ko/server.po
+++ b/ko/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ko/services.po b/ko/services.po
index 1090190..912c1c9 100644
--- a/ko/services.po
+++ b/ko/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ko/troubleshooting.po b/ko/troubleshooting.po
index 5214888..1deb27d 100644
--- a/ko/troubleshooting.po
+++ b/ko/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ku/bridges.po b/ku/bridges.po
index 7e87e97..d4fede6 100644
--- a/ku/bridges.po
+++ b/ku/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ku\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ku/config.po b/ku/config.po
index 537a346..b8732ee 100644
--- a/ku/config.po
+++ b/ku/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ku\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ku/index.po b/ku/index.po
index 45d25be..63cc6c2 100644
--- a/ku/index.po
+++ b/ku/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ku\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ku/links.po b/ku/links.po
index 979d89d..00e8f40 100644
--- a/ku/links.po
+++ b/ku/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ku\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/ku/log.po b/ku/log.po
index b5d3761..a078048 100644
--- a/ku/log.po
+++ b/ku/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ku\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ku/netview.po b/ku/netview.po
index 133164f..c8b5eeb 100644
--- a/ku/netview.po
+++ b/ku/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ku\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/ku/running.po b/ku/running.po
index e28fa1b..950568d 100644
--- a/ku/running.po
+++ b/ku/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ku\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ku/server.po b/ku/server.po
index bbd257f..72342b3 100644
--- a/ku/server.po
+++ b/ku/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ku\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ku/services.po b/ku/services.po
index 1090190..3d2a842 100644
--- a/ku/services.po
+++ b/ku/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ku\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ku/troubleshooting.po b/ku/troubleshooting.po
index 5214888..a171d77 100644
--- a/ku/troubleshooting.po
+++ b/ku/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ku\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/kw/bridges.po b/kw/bridges.po
index 176d235..82c0294 100644
--- a/kw/bridges.po
+++ b/kw/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/kw/config.po b/kw/config.po
index 537a346..8a2204d 100644
--- a/kw/config.po
+++ b/kw/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/kw/index.po b/kw/index.po
index 45d25be..bf2fedd 100644
--- a/kw/index.po
+++ b/kw/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/kw/links.po b/kw/links.po
index be99e48..100c3bc 100644
--- a/kw/links.po
+++ b/kw/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/kw/log.po b/kw/log.po
index b5d3761..53ba336 100644
--- a/kw/log.po
+++ b/kw/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/kw/netview.po b/kw/netview.po
index a674118..80d3306 100644
--- a/kw/netview.po
+++ b/kw/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/kw/running.po b/kw/running.po
index e28fa1b..8eae4a4 100644
--- a/kw/running.po
+++ b/kw/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/kw/server.po b/kw/server.po
index bbd257f..e87a844 100644
--- a/kw/server.po
+++ b/kw/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/kw/services.po b/kw/services.po
index 1090190..7afad69 100644
--- a/kw/services.po
+++ b/kw/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/kw/troubleshooting.po b/kw/troubleshooting.po
index 5214888..7d338a0 100644
--- a/kw/troubleshooting.po
+++ b/kw/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ky/bridges.po b/ky/bridges.po
index 7e87e97..2ed9e48 100644
--- a/ky/bridges.po
+++ b/ky/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ky\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ky/config.po b/ky/config.po
index 537a346..365b927 100644
--- a/ky/config.po
+++ b/ky/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ky\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ky/index.po b/ky/index.po
index 45d25be..3915c68 100644
--- a/ky/index.po
+++ b/ky/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ky\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ky/links.po b/ky/links.po
index 979d89d..97e4247 100644
--- a/ky/links.po
+++ b/ky/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ky\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/ky/log.po b/ky/log.po
index b5d3761..7522b79 100644
--- a/ky/log.po
+++ b/ky/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ky\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ky/netview.po b/ky/netview.po
index 133164f..749a188 100644
--- a/ky/netview.po
+++ b/ky/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ky\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/ky/running.po b/ky/running.po
index e28fa1b..170a6a7 100644
--- a/ky/running.po
+++ b/ky/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ky\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ky/server.po b/ky/server.po
index bbd257f..ee3a612 100644
--- a/ky/server.po
+++ b/ky/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ky\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ky/services.po b/ky/services.po
index 1090190..c42f441 100644
--- a/ky/services.po
+++ b/ky/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ky\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ky/troubleshooting.po b/ky/troubleshooting.po
index 5214888..d6ceac1 100644
--- a/ky/troubleshooting.po
+++ b/ky/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: ky\n"
+"Plural-Forms: nplurals=1; plural=0\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/lb/bridges.po b/lb/bridges.po
index 068942f..e08beec 100644
--- a/lb/bridges.po
+++ b/lb/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/lb/config.po b/lb/config.po
index 537a346..d9b9a75 100644
--- a/lb/config.po
+++ b/lb/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/lb/index.po b/lb/index.po
index 45d25be..2f808db 100644
--- a/lb/index.po
+++ b/lb/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/lb/links.po b/lb/links.po
index 588f340..6aa3b1f 100644
--- a/lb/links.po
+++ b/lb/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/lb/log.po b/lb/log.po
index b5d3761..d96c448 100644
--- a/lb/log.po
+++ b/lb/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/lb/netview.po b/lb/netview.po
index aa1cf58..8e34b61 100644
--- a/lb/netview.po
+++ b/lb/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/lb/running.po b/lb/running.po
index e28fa1b..ff107d7 100644
--- a/lb/running.po
+++ b/lb/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/lb/server.po b/lb/server.po
index bbd257f..08ecbb5 100644
--- a/lb/server.po
+++ b/lb/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/lb/services.po b/lb/services.po
index 1090190..a6d5bc6 100644
--- a/lb/services.po
+++ b/lb/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/lb/troubleshooting.po b/lb/troubleshooting.po
index 5214888..00762c4 100644
--- a/lb/troubleshooting.po
+++ b/lb/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ln/bridges.po b/ln/bridges.po
index 10be5c3..826e6bc 100644
--- a/ln/bridges.po
+++ b/ln/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ln/config.po b/ln/config.po
index 537a346..7a5c8aa 100644
--- a/ln/config.po
+++ b/ln/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ln/index.po b/ln/index.po
index 45d25be..aa290cd 100644
--- a/ln/index.po
+++ b/ln/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ln/links.po b/ln/links.po
index efac0f5..161d5a8 100644
--- a/ln/links.po
+++ b/ln/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ln/log.po b/ln/log.po
index b5d3761..9bb4472 100644
--- a/ln/log.po
+++ b/ln/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ln/netview.po b/ln/netview.po
index d58cf2f..0dd51aa 100644
--- a/ln/netview.po
+++ b/ln/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ln/running.po b/ln/running.po
index e28fa1b..516e62b 100644
--- a/ln/running.po
+++ b/ln/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ln/server.po b/ln/server.po
index bbd257f..88e9cba 100644
--- a/ln/server.po
+++ b/ln/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ln/services.po b/ln/services.po
index 1090190..99e7249 100644
--- a/ln/services.po
+++ b/ln/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ln/troubleshooting.po b/ln/troubleshooting.po
index 5214888..059b986 100644
--- a/ln/troubleshooting.po
+++ b/ln/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/lo/bridges.po b/lo/bridges.po
index ea6e00d..66210cf 100644
--- a/lo/bridges.po
+++ b/lo/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/lo/config.po b/lo/config.po
index 537a346..c5fc0e8 100644
--- a/lo/config.po
+++ b/lo/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/lo/index.po b/lo/index.po
index 45d25be..0483197 100644
--- a/lo/index.po
+++ b/lo/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/lo/links.po b/lo/links.po
index 7ff5390..947910c 100644
--- a/lo/links.po
+++ b/lo/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/lo/log.po b/lo/log.po
index b5d3761..a9fffaa 100644
--- a/lo/log.po
+++ b/lo/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/lo/netview.po b/lo/netview.po
index f0258a4..296e153 100644
--- a/lo/netview.po
+++ b/lo/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/lo/running.po b/lo/running.po
index e28fa1b..128f65d 100644
--- a/lo/running.po
+++ b/lo/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/lo/server.po b/lo/server.po
index bbd257f..bc6acd3 100644
--- a/lo/server.po
+++ b/lo/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/lo/services.po b/lo/services.po
index 1090190..06f9886 100644
--- a/lo/services.po
+++ b/lo/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/lo/troubleshooting.po b/lo/troubleshooting.po
index 5214888..2738ca2 100644
--- a/lo/troubleshooting.po
+++ b/lo/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/lt/bridges.po b/lt/bridges.po
index 060ad5d..1c19271 100644
--- a/lt/bridges.po
+++ b/lt/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/lt/config.po b/lt/config.po
index 537a346..cd09175 100644
--- a/lt/config.po
+++ b/lt/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/lt/index.po b/lt/index.po
index 45d25be..2101484 100644
--- a/lt/index.po
+++ b/lt/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/lt/links.po b/lt/links.po
index f01ee79..d8f46d5 100644
--- a/lt/links.po
+++ b/lt/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/lt/log.po b/lt/log.po
index b5d3761..de90529 100644
--- a/lt/log.po
+++ b/lt/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/lt/netview.po b/lt/netview.po
index b7bb753..29ebb42 100644
--- a/lt/netview.po
+++ b/lt/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/lt/running.po b/lt/running.po
index e28fa1b..2564618 100644
--- a/lt/running.po
+++ b/lt/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/lt/server.po b/lt/server.po
index bbd257f..1ef4f26 100644
--- a/lt/server.po
+++ b/lt/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/lt/services.po b/lt/services.po
index 1090190..f51d5a6 100644
--- a/lt/services.po
+++ b/lt/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/lt/troubleshooting.po b/lt/troubleshooting.po
index 5214888..a4a457e 100644
--- a/lt/troubleshooting.po
+++ b/lt/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/lv/bridges.po b/lv/bridges.po
index 43b6ccb..b1a980c 100644
--- a/lv/bridges.po
+++ b/lv/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/lv/config.po b/lv/config.po
index 537a346..3411910 100644
--- a/lv/config.po
+++ b/lv/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/lv/index.po b/lv/index.po
index 45d25be..6cd1c25 100644
--- a/lv/index.po
+++ b/lv/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/lv/links.po b/lv/links.po
index 1edaced..ebb8eb9 100644
--- a/lv/links.po
+++ b/lv/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/lv/log.po b/lv/log.po
index b5d3761..9d9630b 100644
--- a/lv/log.po
+++ b/lv/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/lv/netview.po b/lv/netview.po
index 4ca4412..1b6ea60 100644
--- a/lv/netview.po
+++ b/lv/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/lv/running.po b/lv/running.po
index e28fa1b..2da7ad1 100644
--- a/lv/running.po
+++ b/lv/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/lv/server.po b/lv/server.po
index bbd257f..7848a0b 100644
--- a/lv/server.po
+++ b/lv/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/lv/services.po b/lv/services.po
index 1090190..f2ff7f3 100644
--- a/lv/services.po
+++ b/lv/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/lv/troubleshooting.po b/lv/troubleshooting.po
index 5214888..b868b34 100644
--- a/lv/troubleshooting.po
+++ b/lv/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/mg/bridges.po b/mg/bridges.po
index 943c4e1..6d39985 100644
--- a/mg/bridges.po
+++ b/mg/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/mg/config.po b/mg/config.po
index 537a346..dc8cfc4 100644
--- a/mg/config.po
+++ b/mg/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/mg/index.po b/mg/index.po
index 45d25be..bfd966e 100644
--- a/mg/index.po
+++ b/mg/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/mg/links.po b/mg/links.po
index bb86bb1..10e4c7a 100644
--- a/mg/links.po
+++ b/mg/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/mg/log.po b/mg/log.po
index b5d3761..e00db8b 100644
--- a/mg/log.po
+++ b/mg/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/mg/netview.po b/mg/netview.po
index 249ee4e..d0ba02c 100644
--- a/mg/netview.po
+++ b/mg/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/mg/running.po b/mg/running.po
index e28fa1b..3c62a62 100644
--- a/mg/running.po
+++ b/mg/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/mg/server.po b/mg/server.po
index bbd257f..d5d1bfe 100644
--- a/mg/server.po
+++ b/mg/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/mg/services.po b/mg/services.po
index 1090190..0431254 100644
--- a/mg/services.po
+++ b/mg/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/mg/troubleshooting.po b/mg/troubleshooting.po
index 5214888..b8f3a83 100644
--- a/mg/troubleshooting.po
+++ b/mg/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/mi/bridges.po b/mi/bridges.po
index 5b83e3e..aea2ed4 100644
--- a/mi/bridges.po
+++ b/mi/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/mi/config.po b/mi/config.po
index 537a346..949fb7e 100644
--- a/mi/config.po
+++ b/mi/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/mi/index.po b/mi/index.po
index 45d25be..c990840 100644
--- a/mi/index.po
+++ b/mi/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/mi/links.po b/mi/links.po
index 23ae435..3ede69f 100644
--- a/mi/links.po
+++ b/mi/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/mi/log.po b/mi/log.po
index b5d3761..e7afcbf 100644
--- a/mi/log.po
+++ b/mi/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/mi/netview.po b/mi/netview.po
index 7ea1291..2c73fea 100644
--- a/mi/netview.po
+++ b/mi/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/mi/running.po b/mi/running.po
index e28fa1b..d186bd5 100644
--- a/mi/running.po
+++ b/mi/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/mi/server.po b/mi/server.po
index bbd257f..242add8 100644
--- a/mi/server.po
+++ b/mi/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/mi/services.po b/mi/services.po
index 1090190..52c6c60 100644
--- a/mi/services.po
+++ b/mi/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/mi/troubleshooting.po b/mi/troubleshooting.po
index 5214888..84dd4c8 100644
--- a/mi/troubleshooting.po
+++ b/mi/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/mk/bridges.po b/mk/bridges.po
index d7c07a2..1997388 100644
--- a/mk/bridges.po
+++ b/mk/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/mk/config.po b/mk/config.po
index 537a346..878db02 100644
--- a/mk/config.po
+++ b/mk/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/mk/index.po b/mk/index.po
index 45d25be..f543cf9 100644
--- a/mk/index.po
+++ b/mk/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/mk/links.po b/mk/links.po
index 18f63a5..1282458 100644
--- a/mk/links.po
+++ b/mk/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/mk/log.po b/mk/log.po
index b5d3761..fdf8aee 100644
--- a/mk/log.po
+++ b/mk/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/mk/netview.po b/mk/netview.po
index 8b17f86..cacf6f5 100644
--- a/mk/netview.po
+++ b/mk/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/mk/running.po b/mk/running.po
index e28fa1b..1be14a6 100644
--- a/mk/running.po
+++ b/mk/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/mk/server.po b/mk/server.po
index bbd257f..37b99be 100644
--- a/mk/server.po
+++ b/mk/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/mk/services.po b/mk/services.po
index 1090190..2de1ef6 100644
--- a/mk/services.po
+++ b/mk/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/mk/troubleshooting.po b/mk/troubleshooting.po
index 5214888..7ffaa02 100644
--- a/mk/troubleshooting.po
+++ b/mk/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ml/bridges.po b/ml/bridges.po
index 7ff2cdd..c2a73b1 100644
--- a/ml/bridges.po
+++ b/ml/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ml/config.po b/ml/config.po
index 537a346..acac4c2 100644
--- a/ml/config.po
+++ b/ml/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ml/index.po b/ml/index.po
index 45d25be..deb61fa 100644
--- a/ml/index.po
+++ b/ml/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ml/links.po b/ml/links.po
index ae69182..2ffef48 100644
--- a/ml/links.po
+++ b/ml/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ml/log.po b/ml/log.po
index b5d3761..2eb73d9 100644
--- a/ml/log.po
+++ b/ml/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ml/netview.po b/ml/netview.po
index 3263383..f56161d 100644
--- a/ml/netview.po
+++ b/ml/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ml/running.po b/ml/running.po
index e28fa1b..178a8f8 100644
--- a/ml/running.po
+++ b/ml/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ml/server.po b/ml/server.po
index bbd257f..135e5cc 100644
--- a/ml/server.po
+++ b/ml/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ml/services.po b/ml/services.po
index 1090190..383931c 100644
--- a/ml/services.po
+++ b/ml/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ml/troubleshooting.po b/ml/troubleshooting.po
index 5214888..4937464 100644
--- a/ml/troubleshooting.po
+++ b/ml/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/mn/bridges.po b/mn/bridges.po
index 31b8da0..257141d 100644
--- a/mn/bridges.po
+++ b/mn/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/mn/config.po b/mn/config.po
index 537a346..23fbf5b 100644
--- a/mn/config.po
+++ b/mn/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/mn/index.po b/mn/index.po
index 45d25be..fe68df1 100644
--- a/mn/index.po
+++ b/mn/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/mn/links.po b/mn/links.po
index bb5fbd7..955b442 100644
--- a/mn/links.po
+++ b/mn/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/mn/log.po b/mn/log.po
index b5d3761..0a3d725 100644
--- a/mn/log.po
+++ b/mn/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/mn/netview.po b/mn/netview.po
index 42bec80..6e7a890 100644
--- a/mn/netview.po
+++ b/mn/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/mn/running.po b/mn/running.po
index e28fa1b..921ebec 100644
--- a/mn/running.po
+++ b/mn/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/mn/server.po b/mn/server.po
index bbd257f..4336188 100644
--- a/mn/server.po
+++ b/mn/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/mn/services.po b/mn/services.po
index 1090190..f32434f 100644
--- a/mn/services.po
+++ b/mn/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/mn/troubleshooting.po b/mn/troubleshooting.po
index 5214888..8d7dc07 100644
--- a/mn/troubleshooting.po
+++ b/mn/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/mr/bridges.po b/mr/bridges.po
index 81693df..779425b 100644
--- a/mr/bridges.po
+++ b/mr/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/mr/config.po b/mr/config.po
index 537a346..8c2ee33 100644
--- a/mr/config.po
+++ b/mr/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/mr/index.po b/mr/index.po
index 45d25be..c47f8a0 100644
--- a/mr/index.po
+++ b/mr/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/mr/links.po b/mr/links.po
index 839c61c..be6b5d9 100644
--- a/mr/links.po
+++ b/mr/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/mr/log.po b/mr/log.po
index b5d3761..2f9adc4 100644
--- a/mr/log.po
+++ b/mr/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/mr/netview.po b/mr/netview.po
index e7b3a22..8dfb758 100644
--- a/mr/netview.po
+++ b/mr/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/mr/running.po b/mr/running.po
index e28fa1b..37ea94d 100644
--- a/mr/running.po
+++ b/mr/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/mr/server.po b/mr/server.po
index bbd257f..344e768 100644
--- a/mr/server.po
+++ b/mr/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/mr/services.po b/mr/services.po
index 1090190..d7fa47d 100644
--- a/mr/services.po
+++ b/mr/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/mr/troubleshooting.po b/mr/troubleshooting.po
index 5214888..fbd6fc6 100644
--- a/mr/troubleshooting.po
+++ b/mr/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ms/bridges.po b/ms/bridges.po
index 2038151..f6696d6 100644
--- a/ms/bridges.po
+++ b/ms/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ms/config.po b/ms/config.po
index 537a346..6ab0d2c 100644
--- a/ms/config.po
+++ b/ms/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ms/index.po b/ms/index.po
index 45d25be..afcebcd 100644
--- a/ms/index.po
+++ b/ms/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ms/links.po b/ms/links.po
index ce3eb06..59f4e20 100644
--- a/ms/links.po
+++ b/ms/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ms/log.po b/ms/log.po
index b5d3761..2215793 100644
--- a/ms/log.po
+++ b/ms/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ms/netview.po b/ms/netview.po
index 1322346..7142ca3 100644
--- a/ms/netview.po
+++ b/ms/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ms/running.po b/ms/running.po
index e28fa1b..7f3d60b 100644
--- a/ms/running.po
+++ b/ms/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ms/server.po b/ms/server.po
index bbd257f..e0cc649 100644
--- a/ms/server.po
+++ b/ms/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ms/services.po b/ms/services.po
index 1090190..dbb5303 100644
--- a/ms/services.po
+++ b/ms/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ms/troubleshooting.po b/ms/troubleshooting.po
index 5214888..ac97134 100644
--- a/ms/troubleshooting.po
+++ b/ms/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/mt/bridges.po b/mt/bridges.po
index bbf6c0a..3632156 100644
--- a/mt/bridges.po
+++ b/mt/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/mt/config.po b/mt/config.po
index 537a346..c6636c4 100644
--- a/mt/config.po
+++ b/mt/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/mt/index.po b/mt/index.po
index 45d25be..47d70eb 100644
--- a/mt/index.po
+++ b/mt/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/mt/links.po b/mt/links.po
index 9c23000..042da5a 100644
--- a/mt/links.po
+++ b/mt/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/mt/log.po b/mt/log.po
index b5d3761..b6cad62 100644
--- a/mt/log.po
+++ b/mt/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/mt/netview.po b/mt/netview.po
index 700b34b..11d0970 100644
--- a/mt/netview.po
+++ b/mt/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/mt/running.po b/mt/running.po
index e28fa1b..ee7c2dd 100644
--- a/mt/running.po
+++ b/mt/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/mt/server.po b/mt/server.po
index bbd257f..fd91421 100644
--- a/mt/server.po
+++ b/mt/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/mt/services.po b/mt/services.po
index 1090190..fd1ecd3 100644
--- a/mt/services.po
+++ b/mt/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/mt/troubleshooting.po b/mt/troubleshooting.po
index 5214888..cfd84fd 100644
--- a/mt/troubleshooting.po
+++ b/mt/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/nah/bridges.po b/nah/bridges.po
index 7e87e97..54b9414 100644
--- a/nah/bridges.po
+++ b/nah/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: nah\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/nah/config.po b/nah/config.po
index 537a346..ccd0c52 100644
--- a/nah/config.po
+++ b/nah/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: nah\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/nah/index.po b/nah/index.po
index 45d25be..f47a5d9 100644
--- a/nah/index.po
+++ b/nah/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: nah\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/nah/links.po b/nah/links.po
index 979d89d..4777398 100644
--- a/nah/links.po
+++ b/nah/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: nah\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/nah/log.po b/nah/log.po
index b5d3761..e395f37 100644
--- a/nah/log.po
+++ b/nah/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: nah\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/nah/netview.po b/nah/netview.po
index 133164f..f0d2b6e 100644
--- a/nah/netview.po
+++ b/nah/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: nah\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/nah/running.po b/nah/running.po
index e28fa1b..97ad9a3 100644
--- a/nah/running.po
+++ b/nah/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: nah\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/nah/server.po b/nah/server.po
index bbd257f..b791411 100644
--- a/nah/server.po
+++ b/nah/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: nah\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/nah/services.po b/nah/services.po
index 1090190..1ec3e51 100644
--- a/nah/services.po
+++ b/nah/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: nah\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/nah/troubleshooting.po b/nah/troubleshooting.po
index 5214888..818977b 100644
--- a/nah/troubleshooting.po
+++ b/nah/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: nah\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/nap/bridges.po b/nap/bridges.po
index 2462c97..9f817ef 100644
--- a/nap/bridges.po
+++ b/nap/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/nap/config.po b/nap/config.po
index 537a346..ad71b54 100644
--- a/nap/config.po
+++ b/nap/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/nap/index.po b/nap/index.po
index 45d25be..ff4aaa6 100644
--- a/nap/index.po
+++ b/nap/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/nap/links.po b/nap/links.po
index 60ee878..9bba284 100644
--- a/nap/links.po
+++ b/nap/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/nap/log.po b/nap/log.po
index b5d3761..6782cc0 100644
--- a/nap/log.po
+++ b/nap/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/nap/netview.po b/nap/netview.po
index f0cb9b3..1fd8716 100644
--- a/nap/netview.po
+++ b/nap/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/nap/running.po b/nap/running.po
index e28fa1b..a1996d7 100644
--- a/nap/running.po
+++ b/nap/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/nap/server.po b/nap/server.po
index bbd257f..34dc41e 100644
--- a/nap/server.po
+++ b/nap/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/nap/services.po b/nap/services.po
index 1090190..58cdbe0 100644
--- a/nap/services.po
+++ b/nap/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/nap/troubleshooting.po b/nap/troubleshooting.po
index 5214888..fe52fbd 100644
--- a/nap/troubleshooting.po
+++ b/nap/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/nb/bridges.po b/nb/bridges.po
index a98c607..996716c 100644
--- a/nb/bridges.po
+++ b/nb/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/nb/config.po b/nb/config.po
index e9450b3..dbb21f0 100644
--- a/nb/config.po
+++ b/nb/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/nb/index.po b/nb/index.po
index b4a7941..3576e8a 100644
--- a/nb/index.po
+++ b/nb/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/nb/links.po b/nb/links.po
index 1a66e48..9756ffc 100644
--- a/nb/links.po
+++ b/nb/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/nb/log.po b/nb/log.po
index 7e226bc..d40635e 100644
--- a/nb/log.po
+++ b/nb/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/nb/netview.po b/nb/netview.po
index 0dfac52..2fd4250 100644
--- a/nb/netview.po
+++ b/nb/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/nb/running.po b/nb/running.po
index b503af0..6ce6a6a 100644
--- a/nb/running.po
+++ b/nb/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/nb/server.po b/nb/server.po
index 3cb445f..6d5276f 100644
--- a/nb/server.po
+++ b/nb/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/nb/services.po b/nb/services.po
index 73d206c..d2f039e 100644
--- a/nb/services.po
+++ b/nb/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/nb/troubleshooting.po b/nb/troubleshooting.po
index b495396..6de1608 100644
--- a/nb/troubleshooting.po
+++ b/nb/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ne/bridges.po b/ne/bridges.po
index a80deda..5952323 100644
--- a/ne/bridges.po
+++ b/ne/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ne/config.po b/ne/config.po
index 537a346..95f5ca7 100644
--- a/ne/config.po
+++ b/ne/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ne/index.po b/ne/index.po
index 45d25be..6106ced 100644
--- a/ne/index.po
+++ b/ne/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ne/links.po b/ne/links.po
index 56f031e..6bc6a08 100644
--- a/ne/links.po
+++ b/ne/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ne/log.po b/ne/log.po
index b5d3761..259e9aa 100644
--- a/ne/log.po
+++ b/ne/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ne/netview.po b/ne/netview.po
index 5326785..f680c64 100644
--- a/ne/netview.po
+++ b/ne/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ne/running.po b/ne/running.po
index e28fa1b..58f6b9b 100644
--- a/ne/running.po
+++ b/ne/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ne/server.po b/ne/server.po
index bbd257f..de952f9 100644
--- a/ne/server.po
+++ b/ne/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ne/services.po b/ne/services.po
index 1090190..d494eef 100644
--- a/ne/services.po
+++ b/ne/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ne/troubleshooting.po b/ne/troubleshooting.po
index 5214888..1d90e06 100644
--- a/ne/troubleshooting.po
+++ b/ne/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/nl/bridges.po b/nl/bridges.po
index aab89f2..7d93178 100644
--- a/nl/bridges.po
+++ b/nl/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/nl/netview.po b/nl/netview.po
index e67037c..54c8b92 100644
--- a/nl/netview.po
+++ b/nl/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/nl/server.po b/nl/server.po
index bbd257f..ce732a4 100644
--- a/nl/server.po
+++ b/nl/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/nn/bridges.po b/nn/bridges.po
index 1237afd..fe82160 100644
--- a/nn/bridges.po
+++ b/nn/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/nn/config.po b/nn/config.po
index 537a346..b49e8f4 100644
--- a/nn/config.po
+++ b/nn/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/nn/index.po b/nn/index.po
index 45d25be..e633129 100644
--- a/nn/index.po
+++ b/nn/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/nn/links.po b/nn/links.po
index 96f9eea..7f26668 100644
--- a/nn/links.po
+++ b/nn/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/nn/log.po b/nn/log.po
index b5d3761..1647267 100644
--- a/nn/log.po
+++ b/nn/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/nn/netview.po b/nn/netview.po
index ba232c5..bd58d3b 100644
--- a/nn/netview.po
+++ b/nn/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/nn/running.po b/nn/running.po
index e28fa1b..dedb324 100644
--- a/nn/running.po
+++ b/nn/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/nn/server.po b/nn/server.po
index bbd257f..2f858b9 100644
--- a/nn/server.po
+++ b/nn/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/nn/services.po b/nn/services.po
index 1090190..1d1e0bb 100644
--- a/nn/services.po
+++ b/nn/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/nn/troubleshooting.po b/nn/troubleshooting.po
index 5214888..56c13ff 100644
--- a/nn/troubleshooting.po
+++ b/nn/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/nso/bridges.po b/nso/bridges.po
index 13499b5..e372f2a 100644
--- a/nso/bridges.po
+++ b/nso/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/nso/config.po b/nso/config.po
index 537a346..e4fb940 100644
--- a/nso/config.po
+++ b/nso/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/nso/index.po b/nso/index.po
index 45d25be..4b61bf2 100644
--- a/nso/index.po
+++ b/nso/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/nso/links.po b/nso/links.po
index 14e406e..87cc054 100644
--- a/nso/links.po
+++ b/nso/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/nso/log.po b/nso/log.po
index b5d3761..8e6e4f2 100644
--- a/nso/log.po
+++ b/nso/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/nso/netview.po b/nso/netview.po
index 88179c3..b15b4b7 100644
--- a/nso/netview.po
+++ b/nso/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/nso/running.po b/nso/running.po
index e28fa1b..97f1af8 100644
--- a/nso/running.po
+++ b/nso/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/nso/server.po b/nso/server.po
index bbd257f..824f114 100644
--- a/nso/server.po
+++ b/nso/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/nso/services.po b/nso/services.po
index 1090190..5d2e595 100644
--- a/nso/services.po
+++ b/nso/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/nso/troubleshooting.po b/nso/troubleshooting.po
index 5214888..fc235fa 100644
--- a/nso/troubleshooting.po
+++ b/nso/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/oc/bridges.po b/oc/bridges.po
index 0ad8d43..0583410 100644
--- a/oc/bridges.po
+++ b/oc/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/oc/config.po b/oc/config.po
index 537a346..183a8ec 100644
--- a/oc/config.po
+++ b/oc/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/oc/index.po b/oc/index.po
index 45d25be..cdc3106 100644
--- a/oc/index.po
+++ b/oc/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/oc/links.po b/oc/links.po
index 3b71c5e..82966b0 100644
--- a/oc/links.po
+++ b/oc/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/oc/log.po b/oc/log.po
index b5d3761..f4b708a 100644
--- a/oc/log.po
+++ b/oc/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/oc/netview.po b/oc/netview.po
index dd2d147..5b24aa0 100644
--- a/oc/netview.po
+++ b/oc/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/oc/running.po b/oc/running.po
index e28fa1b..e49fc10 100644
--- a/oc/running.po
+++ b/oc/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/oc/server.po b/oc/server.po
index bbd257f..430ec1d 100644
--- a/oc/server.po
+++ b/oc/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/oc/services.po b/oc/services.po
index 1090190..5c83ea0 100644
--- a/oc/services.po
+++ b/oc/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/oc/troubleshooting.po b/oc/troubleshooting.po
index 5214888..cf147aa 100644
--- a/oc/troubleshooting.po
+++ b/oc/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/or/bridges.po b/or/bridges.po
index 7e87e97..5646f02 100644
--- a/or/bridges.po
+++ b/or/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/or/config.po b/or/config.po
index 537a346..78d5485 100644
--- a/or/config.po
+++ b/or/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/or/index.po b/or/index.po
index 45d25be..147046c 100644
--- a/or/index.po
+++ b/or/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/or/links.po b/or/links.po
index 979d89d..04733e9 100644
--- a/or/links.po
+++ b/or/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/or/log.po b/or/log.po
index b5d3761..0750650 100644
--- a/or/log.po
+++ b/or/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/or/netview.po b/or/netview.po
index 133164f..1329199 100644
--- a/or/netview.po
+++ b/or/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: or\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/or/running.po b/or/running.po
index e28fa1b..6d64768 100644
--- a/or/running.po
+++ b/or/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/or/server.po b/or/server.po
index bbd257f..20c02e5 100644
--- a/or/server.po
+++ b/or/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/or/services.po b/or/services.po
index 1090190..0487e55 100644
--- a/or/services.po
+++ b/or/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/or/troubleshooting.po b/or/troubleshooting.po
index 5214888..55f7199 100644
--- a/or/troubleshooting.po
+++ b/or/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/pa/bridges.po b/pa/bridges.po
index ad66fb3..7beefaa 100644
--- a/pa/bridges.po
+++ b/pa/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/pa/config.po b/pa/config.po
index 537a346..f1ed77d 100644
--- a/pa/config.po
+++ b/pa/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/pa/index.po b/pa/index.po
index 45d25be..6369965 100644
--- a/pa/index.po
+++ b/pa/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/pa/links.po b/pa/links.po
index 9b0a1e4..d6a132f 100644
--- a/pa/links.po
+++ b/pa/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/pa/log.po b/pa/log.po
index b5d3761..02e5e57 100644
--- a/pa/log.po
+++ b/pa/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/pa/netview.po b/pa/netview.po
index 6b83d68..17418c2 100644
--- a/pa/netview.po
+++ b/pa/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/pa/running.po b/pa/running.po
index e28fa1b..d7467b4 100644
--- a/pa/running.po
+++ b/pa/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/pa/server.po b/pa/server.po
index bbd257f..ca4a1ee 100644
--- a/pa/server.po
+++ b/pa/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/pa/services.po b/pa/services.po
index 1090190..ccb1e2e 100644
--- a/pa/services.po
+++ b/pa/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/pa/troubleshooting.po b/pa/troubleshooting.po
index 5214888..77e2ea6 100644
--- a/pa/troubleshooting.po
+++ b/pa/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/pap/bridges.po b/pap/bridges.po
index c9e1694..6f1509f 100644
--- a/pap/bridges.po
+++ b/pap/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/pap/config.po b/pap/config.po
index 537a346..36e1778 100644
--- a/pap/config.po
+++ b/pap/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/pap/index.po b/pap/index.po
index 45d25be..f3049a7 100644
--- a/pap/index.po
+++ b/pap/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/pap/links.po b/pap/links.po
index ee83271..1c88b41 100644
--- a/pap/links.po
+++ b/pap/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/pap/log.po b/pap/log.po
index b5d3761..9aa858d 100644
--- a/pap/log.po
+++ b/pap/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/pap/netview.po b/pap/netview.po
index 8a52252..fc376b0 100644
--- a/pap/netview.po
+++ b/pap/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/pap/running.po b/pap/running.po
index e28fa1b..ebdf67f 100644
--- a/pap/running.po
+++ b/pap/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/pap/server.po b/pap/server.po
index bbd257f..f0686e1 100644
--- a/pap/server.po
+++ b/pap/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/pap/services.po b/pap/services.po
index 1090190..705f5c4 100644
--- a/pap/services.po
+++ b/pap/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/pap/troubleshooting.po b/pap/troubleshooting.po
index 5214888..1a05d0a 100644
--- a/pap/troubleshooting.po
+++ b/pap/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/pl/config.po b/pl/config.po
index 537a346..dfa87cf 100644
--- a/pl/config.po
+++ b/pl/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/pl/log.po b/pl/log.po
index b5d3761..8de92b4 100644
--- a/pl/log.po
+++ b/pl/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/pl/netview.po b/pl/netview.po
index 05900ed..0ad346b 100644
--- a/pl/netview.po
+++ b/pl/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/pl/running.po b/pl/running.po
index e28fa1b..5ed4686 100644
--- a/pl/running.po
+++ b/pl/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/pl/server.po b/pl/server.po
index bbd257f..b1a399a 100644
--- a/pl/server.po
+++ b/pl/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/pl/services.po b/pl/services.po
index 1090190..accb036 100644
--- a/pl/services.po
+++ b/pl/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/pl/troubleshooting.po b/pl/troubleshooting.po
index 5214888..d039620 100644
--- a/pl/troubleshooting.po
+++ b/pl/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/pms/bridges.po b/pms/bridges.po
index bac72f2..77a36e7 100644
--- a/pms/bridges.po
+++ b/pms/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/pms/config.po b/pms/config.po
index 537a346..5739d20 100644
--- a/pms/config.po
+++ b/pms/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/pms/index.po b/pms/index.po
index 45d25be..4302fd5 100644
--- a/pms/index.po
+++ b/pms/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/pms/links.po b/pms/links.po
index 3216ff0..020bce2 100644
--- a/pms/links.po
+++ b/pms/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/pms/log.po b/pms/log.po
index b5d3761..73b0644 100644
--- a/pms/log.po
+++ b/pms/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/pms/netview.po b/pms/netview.po
index bc52b3c..0486d4c 100644
--- a/pms/netview.po
+++ b/pms/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/pms/running.po b/pms/running.po
index e28fa1b..0cd70ca 100644
--- a/pms/running.po
+++ b/pms/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/pms/server.po b/pms/server.po
index bbd257f..757da58 100644
--- a/pms/server.po
+++ b/pms/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/pms/services.po b/pms/services.po
index 1090190..898fd08 100644
--- a/pms/services.po
+++ b/pms/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/pms/troubleshooting.po b/pms/troubleshooting.po
index 5214888..760e247 100644
--- a/pms/troubleshooting.po
+++ b/pms/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ps/bridges.po b/ps/bridges.po
index 2f432af..083596e 100644
--- a/ps/bridges.po
+++ b/ps/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ps/config.po b/ps/config.po
index 537a346..8ccbbbb 100644
--- a/ps/config.po
+++ b/ps/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ps/index.po b/ps/index.po
index 45d25be..df779fd 100644
--- a/ps/index.po
+++ b/ps/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ps/links.po b/ps/links.po
index e4512d9..ab757c1 100644
--- a/ps/links.po
+++ b/ps/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ps/log.po b/ps/log.po
index b5d3761..8692874 100644
--- a/ps/log.po
+++ b/ps/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ps/netview.po b/ps/netview.po
index 69eece5..863852d 100644
--- a/ps/netview.po
+++ b/ps/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ps/running.po b/ps/running.po
index e28fa1b..97c1d66 100644
--- a/ps/running.po
+++ b/ps/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ps/server.po b/ps/server.po
index bbd257f..740ff13 100644
--- a/ps/server.po
+++ b/ps/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ps/services.po b/ps/services.po
index 1090190..f38a017 100644
--- a/ps/services.po
+++ b/ps/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ps/troubleshooting.po b/ps/troubleshooting.po
index 5214888..ca2412c 100644
--- a/ps/troubleshooting.po
+++ b/ps/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/pt/bridges.po b/pt/bridges.po
index f342263..6ec7596 100644
--- a/pt/bridges.po
+++ b/pt/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/pt/config.po b/pt/config.po
index 537a346..dbca9d9 100644
--- a/pt/config.po
+++ b/pt/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/pt/index.po b/pt/index.po
index 45d25be..123dae9 100644
--- a/pt/index.po
+++ b/pt/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/pt/links.po b/pt/links.po
index 54c8dd1..4e87058 100644
--- a/pt/links.po
+++ b/pt/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/pt/log.po b/pt/log.po
index b5d3761..c783956 100644
--- a/pt/log.po
+++ b/pt/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/pt/netview.po b/pt/netview.po
index 4db7bf2..5c191f2 100644
--- a/pt/netview.po
+++ b/pt/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/pt/running.po b/pt/running.po
index e28fa1b..def5865 100644
--- a/pt/running.po
+++ b/pt/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/pt/server.po b/pt/server.po
index bbd257f..643cdb7 100644
--- a/pt/server.po
+++ b/pt/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/pt/services.po b/pt/services.po
index 1090190..df9e8c1 100644
--- a/pt/services.po
+++ b/pt/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/pt/troubleshooting.po b/pt/troubleshooting.po
index 5214888..679c7f6 100644
--- a/pt/troubleshooting.po
+++ b/pt/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/pt_BR/config.po b/pt_BR/config.po
index 537a346..1979947 100644
--- a/pt_BR/config.po
+++ b/pt_BR/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/pt_BR/index.po b/pt_BR/index.po
index 45d25be..3c4d59a 100644
--- a/pt_BR/index.po
+++ b/pt_BR/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/pt_BR/links.po b/pt_BR/links.po
index c9ccede..62b2965 100644
--- a/pt_BR/links.po
+++ b/pt_BR/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/pt_BR/log.po b/pt_BR/log.po
index b5d3761..4adc5c3 100644
--- a/pt_BR/log.po
+++ b/pt_BR/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/pt_BR/netview.po b/pt_BR/netview.po
index c5d07fb..d0cb191 100644
--- a/pt_BR/netview.po
+++ b/pt_BR/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/pt_BR/running.po b/pt_BR/running.po
index e28fa1b..1fb1a9f 100644
--- a/pt_BR/running.po
+++ b/pt_BR/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/pt_BR/server.po b/pt_BR/server.po
index bbd257f..c39d7d5 100644
--- a/pt_BR/server.po
+++ b/pt_BR/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/pt_BR/services.po b/pt_BR/services.po
index 1090190..651243a 100644
--- a/pt_BR/services.po
+++ b/pt_BR/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/pt_BR/troubleshooting.po b/pt_BR/troubleshooting.po
index 5214888..e69c2fe 100644
--- a/pt_BR/troubleshooting.po
+++ b/pt_BR/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ro/bridges.po b/ro/bridges.po
index 523e96c..d8a1766 100644
--- a/ro/bridges.po
+++ b/ro/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ro/config.po b/ro/config.po
index 537a346..f307ff5 100644
--- a/ro/config.po
+++ b/ro/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ro/index.po b/ro/index.po
index 45d25be..20109c3 100644
--- a/ro/index.po
+++ b/ro/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ro/links.po b/ro/links.po
index f75d7ab..5e50a7b 100644
--- a/ro/links.po
+++ b/ro/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ro/log.po b/ro/log.po
index b5d3761..fc5ef1e 100644
--- a/ro/log.po
+++ b/ro/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ro/netview.po b/ro/netview.po
index 87d598e..ec2b159 100644
--- a/ro/netview.po
+++ b/ro/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ro/running.po b/ro/running.po
index e28fa1b..5f60e1a 100644
--- a/ro/running.po
+++ b/ro/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ro/server.po b/ro/server.po
index bbd257f..46aa000 100644
--- a/ro/server.po
+++ b/ro/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ro/services.po b/ro/services.po
index 1090190..542d09a 100644
--- a/ro/services.po
+++ b/ro/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ro/troubleshooting.po b/ro/troubleshooting.po
index 5214888..9b20d03 100644
--- a/ro/troubleshooting.po
+++ b/ro/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/sco/bridges.po b/sco/bridges.po
index 2145370..09ea719 100644
--- a/sco/bridges.po
+++ b/sco/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/sco/config.po b/sco/config.po
index 537a346..1f8c2a8 100644
--- a/sco/config.po
+++ b/sco/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/sco/links.po b/sco/links.po
index ea796c4..864d6bd 100644
--- a/sco/links.po
+++ b/sco/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/sco/log.po b/sco/log.po
index b5d3761..7a939c3 100644
--- a/sco/log.po
+++ b/sco/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/sco/netview.po b/sco/netview.po
index 8c51092..f6e8e07 100644
--- a/sco/netview.po
+++ b/sco/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/sco/running.po b/sco/running.po
index e28fa1b..2eebe6e 100644
--- a/sco/running.po
+++ b/sco/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/sco/server.po b/sco/server.po
index bbd257f..c90a518 100644
--- a/sco/server.po
+++ b/sco/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/sco/services.po b/sco/services.po
index 1090190..3ddff1e 100644
--- a/sco/services.po
+++ b/sco/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/sco/troubleshooting.po b/sco/troubleshooting.po
index 5214888..a91bbab 100644
--- a/sco/troubleshooting.po
+++ b/sco/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/sk/bridges.po b/sk/bridges.po
index 7e87e97..252b38b 100644
--- a/sk/bridges.po
+++ b/sk/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/sk/config.po b/sk/config.po
index 537a346..4cd57a3 100644
--- a/sk/config.po
+++ b/sk/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/sk/index.po b/sk/index.po
index 45d25be..466ec54 100644
--- a/sk/index.po
+++ b/sk/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/sk/links.po b/sk/links.po
index 979d89d..c05ac36 100644
--- a/sk/links.po
+++ b/sk/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/sk/log.po b/sk/log.po
index b5d3761..bfbae92 100644
--- a/sk/log.po
+++ b/sk/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/sk/netview.po b/sk/netview.po
index 133164f..04d1cdb 100644
--- a/sk/netview.po
+++ b/sk/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sk\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/sk/running.po b/sk/running.po
index e28fa1b..ebc49ed 100644
--- a/sk/running.po
+++ b/sk/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/sk/server.po b/sk/server.po
index bbd257f..d9b3df3 100644
--- a/sk/server.po
+++ b/sk/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/sk/services.po b/sk/services.po
index 1090190..9a09543 100644
--- a/sk/services.po
+++ b/sk/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/sk/troubleshooting.po b/sk/troubleshooting.po
index 5214888..4047be2 100644
--- a/sk/troubleshooting.po
+++ b/sk/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/sl/bridges.po b/sl/bridges.po
index 7e87e97..3f553aa 100644
--- a/sl/bridges.po
+++ b/sl/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/sl/config.po b/sl/config.po
index 537a346..7333988 100644
--- a/sl/config.po
+++ b/sl/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/sl/index.po b/sl/index.po
index 45d25be..47dedcd 100644
--- a/sl/index.po
+++ b/sl/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/sl/links.po b/sl/links.po
index 979d89d..3ecf063 100644
--- a/sl/links.po
+++ b/sl/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/sl/log.po b/sl/log.po
index b5d3761..525238c 100644
--- a/sl/log.po
+++ b/sl/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/sl/netview.po b/sl/netview.po
index 133164f..17330a9 100644
--- a/sl/netview.po
+++ b/sl/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/sl/running.po b/sl/running.po
index e28fa1b..f1da5d3 100644
--- a/sl/running.po
+++ b/sl/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/sl/server.po b/sl/server.po
index bbd257f..f05c47a 100644
--- a/sl/server.po
+++ b/sl/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/sl/services.po b/sl/services.po
index 1090190..42515fc 100644
--- a/sl/services.po
+++ b/sl/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/sl/troubleshooting.po b/sl/troubleshooting.po
index 5214888..f64092b 100644
--- a/sl/troubleshooting.po
+++ b/sl/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/so/bridges.po b/so/bridges.po
index 7e87e97..d723195 100644
--- a/so/bridges.po
+++ b/so/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/so/config.po b/so/config.po
index 537a346..d5dc758 100644
--- a/so/config.po
+++ b/so/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/so/index.po b/so/index.po
index 45d25be..7df9a30 100644
--- a/so/index.po
+++ b/so/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/so/links.po b/so/links.po
index 979d89d..30e1248 100644
--- a/so/links.po
+++ b/so/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/so/log.po b/so/log.po
index b5d3761..d371a68 100644
--- a/so/log.po
+++ b/so/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/so/netview.po b/so/netview.po
index 133164f..125ca58 100644
--- a/so/netview.po
+++ b/so/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: so\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/so/running.po b/so/running.po
index e28fa1b..a20872d 100644
--- a/so/running.po
+++ b/so/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/so/server.po b/so/server.po
index bbd257f..b9bd428 100644
--- a/so/server.po
+++ b/so/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/so/services.po b/so/services.po
index 1090190..10be8e2 100644
--- a/so/services.po
+++ b/so/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/so/troubleshooting.po b/so/troubleshooting.po
index 5214888..aaf41ce 100644
--- a/so/troubleshooting.po
+++ b/so/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/son/bridges.po b/son/bridges.po
index 39f0428..3512bee 100644
--- a/son/bridges.po
+++ b/son/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/son/config.po b/son/config.po
index 537a346..86739d0 100644
--- a/son/config.po
+++ b/son/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/son/index.po b/son/index.po
index 45d25be..67df4d3 100644
--- a/son/index.po
+++ b/son/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/son/links.po b/son/links.po
index 1427b4f..821b6c9 100644
--- a/son/links.po
+++ b/son/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/son/log.po b/son/log.po
index b5d3761..9603562 100644
--- a/son/log.po
+++ b/son/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/son/netview.po b/son/netview.po
index bf48885..14a22c8 100644
--- a/son/netview.po
+++ b/son/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/son/running.po b/son/running.po
index e28fa1b..2e66238 100644
--- a/son/running.po
+++ b/son/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/son/server.po b/son/server.po
index bbd257f..62a55ca 100644
--- a/son/server.po
+++ b/son/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/son/services.po b/son/services.po
index 1090190..48eb94b 100644
--- a/son/services.po
+++ b/son/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/son/troubleshooting.po b/son/troubleshooting.po
index 5214888..adfc4c1 100644
--- a/son/troubleshooting.po
+++ b/son/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/sq/bridges.po b/sq/bridges.po
index 7e87e97..2e663ac 100644
--- a/sq/bridges.po
+++ b/sq/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/sq/config.po b/sq/config.po
index 537a346..8b70848 100644
--- a/sq/config.po
+++ b/sq/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/sq/index.po b/sq/index.po
index 45d25be..83ccd0e 100644
--- a/sq/index.po
+++ b/sq/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/sq/links.po b/sq/links.po
index 979d89d..d727727 100644
--- a/sq/links.po
+++ b/sq/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/sq/log.po b/sq/log.po
index b5d3761..d69d0c6 100644
--- a/sq/log.po
+++ b/sq/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/sq/netview.po b/sq/netview.po
index 133164f..7d1e0a0 100644
--- a/sq/netview.po
+++ b/sq/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sq\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/sq/running.po b/sq/running.po
index e28fa1b..d5f5e62 100644
--- a/sq/running.po
+++ b/sq/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/sq/server.po b/sq/server.po
index bbd257f..6f9499c 100644
--- a/sq/server.po
+++ b/sq/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/sq/services.po b/sq/services.po
index 1090190..685b24b 100644
--- a/sq/services.po
+++ b/sq/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/sq/troubleshooting.po b/sq/troubleshooting.po
index 5214888..414a7b0 100644
--- a/sq/troubleshooting.po
+++ b/sq/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/sr/bridges.po b/sr/bridges.po
index 7e87e97..79ed5d1 100644
--- a/sr/bridges.po
+++ b/sr/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sr\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/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/sr/config.po b/sr/config.po
index 537a346..73de56a 100644
--- a/sr/config.po
+++ b/sr/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sr\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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/sr/index.po b/sr/index.po
index 45d25be..7fa95d0 100644
--- a/sr/index.po
+++ b/sr/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sr\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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/sr/links.po b/sr/links.po
index 979d89d..a52d091 100644
--- a/sr/links.po
+++ b/sr/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sr\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/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/sr/log.po b/sr/log.po
index b5d3761..82f8391 100644
--- a/sr/log.po
+++ b/sr/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sr\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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/sr/netview.po b/sr/netview.po
index 133164f..aa328fc 100644
--- a/sr/netview.po
+++ b/sr/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sr\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/sr/running.po b/sr/running.po
index e28fa1b..f157a6a 100644
--- a/sr/running.po
+++ b/sr/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sr\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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/sr/server.po b/sr/server.po
index bbd257f..173da28 100644
--- a/sr/server.po
+++ b/sr/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sr\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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/sr/services.po b/sr/services.po
index 1090190..c04e7a5 100644
--- a/sr/services.po
+++ b/sr/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sr\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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/sr/troubleshooting.po b/sr/troubleshooting.po
index 5214888..d58e2f7 100644
--- a/sr/troubleshooting.po
+++ b/sr/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sr\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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/st/bridges.po b/st/bridges.po
index 7e87e97..3ae5262 100644
--- a/st/bridges.po
+++ b/st/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: st\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/st/config.po b/st/config.po
index 537a346..6c465f5 100644
--- a/st/config.po
+++ b/st/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: st\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/st/index.po b/st/index.po
index 45d25be..8859cfb 100644
--- a/st/index.po
+++ b/st/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: st\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/st/links.po b/st/links.po
index 979d89d..39823da 100644
--- a/st/links.po
+++ b/st/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: st\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/st/log.po b/st/log.po
index b5d3761..157b6c0 100644
--- a/st/log.po
+++ b/st/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: st\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/st/netview.po b/st/netview.po
index 133164f..da2b781 100644
--- a/st/netview.po
+++ b/st/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: st\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/st/running.po b/st/running.po
index e28fa1b..f7f6a29 100644
--- a/st/running.po
+++ b/st/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: st\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/st/server.po b/st/server.po
index bbd257f..71740fc 100644
--- a/st/server.po
+++ b/st/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: st\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/st/services.po b/st/services.po
index 1090190..7c8b6c1 100644
--- a/st/services.po
+++ b/st/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: st\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/st/troubleshooting.po b/st/troubleshooting.po
index 5214888..c5cf383 100644
--- a/st/troubleshooting.po
+++ b/st/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: st\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/su/bridges.po b/su/bridges.po
index e85549e..bdbceeb 100644
--- a/su/bridges.po
+++ b/su/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/su/config.po b/su/config.po
index 537a346..f3ba783 100644
--- a/su/config.po
+++ b/su/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/su/index.po b/su/index.po
index 45d25be..7fa0b62 100644
--- a/su/index.po
+++ b/su/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/su/links.po b/su/links.po
index db118d2..fc6ebd8 100644
--- a/su/links.po
+++ b/su/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/su/log.po b/su/log.po
index b5d3761..d367986 100644
--- a/su/log.po
+++ b/su/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/su/netview.po b/su/netview.po
index c7bfdd5..e7e73ab 100644
--- a/su/netview.po
+++ b/su/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/su/running.po b/su/running.po
index e28fa1b..2b4573b 100644
--- a/su/running.po
+++ b/su/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/su/server.po b/su/server.po
index bbd257f..4a49547 100644
--- a/su/server.po
+++ b/su/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/su/services.po b/su/services.po
index 1090190..2f79617 100644
--- a/su/services.po
+++ b/su/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/su/troubleshooting.po b/su/troubleshooting.po
index 5214888..8a1bac9 100644
--- a/su/troubleshooting.po
+++ b/su/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/sv/bridges.po b/sv/bridges.po
index a3181cb..6041baf 100644
--- a/sv/bridges.po
+++ b/sv/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/sv/config.po b/sv/config.po
index e9450b3..464e84f 100644
--- a/sv/config.po
+++ b/sv/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/sv/index.po b/sv/index.po
index b4a7941..cd2ca82 100644
--- a/sv/index.po
+++ b/sv/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/sv/links.po b/sv/links.po
index 0c43d47..d62bfdf 100644
--- a/sv/links.po
+++ b/sv/links.po
@@ -1,123 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-06-27 08:33-0600\n"
-"Last-Translator: Yosh Marklund torproject@yosh.se\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
+"Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
-msgstr "Nyttiga Länkar"
+msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
-msgstr "Vidalia"
+msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
-msgstr "&nbsp;&nbsp;&nbsp;"
+msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
-msgstr "Hemsida"
+msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
-"<a href="https://www.torproject.org/vidalia/%5C%22%3E "
-"https://www.torproject.org/vidalia/</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr "Wiki"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E http://trac.vidalia-"
-"project.net/wiki</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr "Bugtracker"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E http://trac.vidalia-"
-"project.net/report</a>"
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
-msgstr "Tor"
+msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
-msgstr "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
+msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
-msgstr "FAQ"
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
 msgstr ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
+
+
diff --git a/sv/log.po b/sv/log.po
index 7e226bc..1361097 100644
--- a/sv/log.po
+++ b/sv/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/sv/netview.po b/sv/netview.po
index 3ab66ec..6380d0b 100644
--- a/sv/netview.po
+++ b/sv/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sv\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/sv/running.po b/sv/running.po
index b503af0..bf469b1 100644
--- a/sv/running.po
+++ b/sv/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/sv/server.po b/sv/server.po
index 3cb445f..7fdd9a1 100644
--- a/sv/server.po
+++ b/sv/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/sv/services.po b/sv/services.po
index 73d206c..a9dc9ab 100644
--- a/sv/services.po
+++ b/sv/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/sv/troubleshooting.po b/sv/troubleshooting.po
index b495396..8bdbdba 100644
--- a/sv/troubleshooting.po
+++ b/sv/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/sw/bridges.po b/sw/bridges.po
index d25ebe1..7eb71ae 100644
--- a/sw/bridges.po
+++ b/sw/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/sw/config.po b/sw/config.po
index 537a346..8f5b022 100644
--- a/sw/config.po
+++ b/sw/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/sw/index.po b/sw/index.po
index 45d25be..5fbbaf2 100644
--- a/sw/index.po
+++ b/sw/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/sw/links.po b/sw/links.po
index 5c23a24..77f1a1b 100644
--- a/sw/links.po
+++ b/sw/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/sw/log.po b/sw/log.po
index b5d3761..499122a 100644
--- a/sw/log.po
+++ b/sw/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/sw/netview.po b/sw/netview.po
index 390bae9..28d4751 100644
--- a/sw/netview.po
+++ b/sw/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/sw/running.po b/sw/running.po
index e28fa1b..3bbbe7b 100644
--- a/sw/running.po
+++ b/sw/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/sw/server.po b/sw/server.po
index bbd257f..e9abb5c 100644
--- a/sw/server.po
+++ b/sw/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/sw/services.po b/sw/services.po
index 1090190..58cc70e 100644
--- a/sw/services.po
+++ b/sw/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/sw/troubleshooting.po b/sw/troubleshooting.po
index 5214888..4b3fdbe 100644
--- a/sw/troubleshooting.po
+++ b/sw/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ta/bridges.po b/ta/bridges.po
index 722b841..994dedd 100644
--- a/ta/bridges.po
+++ b/ta/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ta/config.po b/ta/config.po
index 537a346..6fb4318 100644
--- a/ta/config.po
+++ b/ta/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ta/index.po b/ta/index.po
index 45d25be..c76d0ec 100644
--- a/ta/index.po
+++ b/ta/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ta/links.po b/ta/links.po
index 2621f70..d6e891a 100644
--- a/ta/links.po
+++ b/ta/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ta/log.po b/ta/log.po
index b5d3761..7718791 100644
--- a/ta/log.po
+++ b/ta/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ta/netview.po b/ta/netview.po
index d83916d..9912202 100644
--- a/ta/netview.po
+++ b/ta/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ta/running.po b/ta/running.po
index e28fa1b..2813eec 100644
--- a/ta/running.po
+++ b/ta/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ta/server.po b/ta/server.po
index bbd257f..aa40dbc 100644
--- a/ta/server.po
+++ b/ta/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ta/services.po b/ta/services.po
index 1090190..ef2114f 100644
--- a/ta/services.po
+++ b/ta/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ta/troubleshooting.po b/ta/troubleshooting.po
index 5214888..d86aa29 100644
--- a/ta/troubleshooting.po
+++ b/ta/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/te/bridges.po b/te/bridges.po
index 76be3c6..32a7987 100644
--- a/te/bridges.po
+++ b/te/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/te/config.po b/te/config.po
index 537a346..d0f8a86 100644
--- a/te/config.po
+++ b/te/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/te/index.po b/te/index.po
index 45d25be..9d743f1 100644
--- a/te/index.po
+++ b/te/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/te/links.po b/te/links.po
index c246d24..eb03b62 100644
--- a/te/links.po
+++ b/te/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/te/log.po b/te/log.po
index b5d3761..c0fa0d5 100644
--- a/te/log.po
+++ b/te/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/te/netview.po b/te/netview.po
index b6d8750..a325b9b 100644
--- a/te/netview.po
+++ b/te/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/te/running.po b/te/running.po
index e28fa1b..ba7b94d 100644
--- a/te/running.po
+++ b/te/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/te/server.po b/te/server.po
index bbd257f..aa81d1e 100644
--- a/te/server.po
+++ b/te/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/te/services.po b/te/services.po
index 1090190..f6f0732 100644
--- a/te/services.po
+++ b/te/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/te/troubleshooting.po b/te/troubleshooting.po
index 5214888..69d067a 100644
--- a/te/troubleshooting.po
+++ b/te/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/tg/bridges.po b/tg/bridges.po
index b986600..86c606f 100644
--- a/tg/bridges.po
+++ b/tg/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/tg/config.po b/tg/config.po
index 537a346..99cb8c2 100644
--- a/tg/config.po
+++ b/tg/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/tg/index.po b/tg/index.po
index 45d25be..8578ea2 100644
--- a/tg/index.po
+++ b/tg/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/tg/links.po b/tg/links.po
index b74052e..efe36b9 100644
--- a/tg/links.po
+++ b/tg/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/tg/log.po b/tg/log.po
index b5d3761..daa6b01 100644
--- a/tg/log.po
+++ b/tg/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/tg/netview.po b/tg/netview.po
index 8cea836..27bc2ae 100644
--- a/tg/netview.po
+++ b/tg/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/tg/running.po b/tg/running.po
index e28fa1b..98b7cf7 100644
--- a/tg/running.po
+++ b/tg/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/tg/server.po b/tg/server.po
index bbd257f..698d158 100644
--- a/tg/server.po
+++ b/tg/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/tg/services.po b/tg/services.po
index 1090190..3e8ec39 100644
--- a/tg/services.po
+++ b/tg/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/tg/troubleshooting.po b/tg/troubleshooting.po
index 5214888..bc84a46 100644
--- a/tg/troubleshooting.po
+++ b/tg/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/th/bridges.po b/th/bridges.po
index 95fd52e..4b3828e 100644
--- a/th/bridges.po
+++ b/th/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/th/config.po b/th/config.po
index 537a346..2727d6b 100644
--- a/th/config.po
+++ b/th/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/th/index.po b/th/index.po
index 45d25be..eee4fee 100644
--- a/th/index.po
+++ b/th/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/th/links.po b/th/links.po
index dd761af..13d3038 100644
--- a/th/links.po
+++ b/th/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/th/log.po b/th/log.po
index b5d3761..8ff0c05 100644
--- a/th/log.po
+++ b/th/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/th/netview.po b/th/netview.po
index 2389315..0666211 100644
--- a/th/netview.po
+++ b/th/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/th/running.po b/th/running.po
index e28fa1b..0280ef8 100644
--- a/th/running.po
+++ b/th/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/th/server.po b/th/server.po
index bbd257f..7f831ba 100644
--- a/th/server.po
+++ b/th/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/th/services.po b/th/services.po
index 1090190..d49b94e 100644
--- a/th/services.po
+++ b/th/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/th/troubleshooting.po b/th/troubleshooting.po
index 5214888..e411bc1 100644
--- a/th/troubleshooting.po
+++ b/th/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ti/bridges.po b/ti/bridges.po
index fab2f76..684c4e6 100644
--- a/ti/bridges.po
+++ b/ti/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ti/config.po b/ti/config.po
index 537a346..a489f4c 100644
--- a/ti/config.po
+++ b/ti/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ti/index.po b/ti/index.po
index 45d25be..1e88fab 100644
--- a/ti/index.po
+++ b/ti/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ti/links.po b/ti/links.po
index ce522c9..3ebee57 100644
--- a/ti/links.po
+++ b/ti/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ti/log.po b/ti/log.po
index b5d3761..fcde448 100644
--- a/ti/log.po
+++ b/ti/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ti/netview.po b/ti/netview.po
index d5e4b59..3dc1fbe 100644
--- a/ti/netview.po
+++ b/ti/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ti/running.po b/ti/running.po
index e28fa1b..a5622db 100644
--- a/ti/running.po
+++ b/ti/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ti/server.po b/ti/server.po
index bbd257f..2e325f9 100644
--- a/ti/server.po
+++ b/ti/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ti/services.po b/ti/services.po
index 1090190..5288413 100644
--- a/ti/services.po
+++ b/ti/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ti/troubleshooting.po b/ti/troubleshooting.po
index 5214888..9159d67 100644
--- a/ti/troubleshooting.po
+++ b/ti/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/tk/bridges.po b/tk/bridges.po
index 8760ae8..af7596d 100644
--- a/tk/bridges.po
+++ b/tk/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/tk/config.po b/tk/config.po
index 537a346..871a0fc 100644
--- a/tk/config.po
+++ b/tk/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/tk/index.po b/tk/index.po
index 45d25be..1fafd33 100644
--- a/tk/index.po
+++ b/tk/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/tk/links.po b/tk/links.po
index 9edce2b..21ef55d 100644
--- a/tk/links.po
+++ b/tk/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/tk/log.po b/tk/log.po
index b5d3761..b3edaf0 100644
--- a/tk/log.po
+++ b/tk/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/tk/netview.po b/tk/netview.po
index d26fa09..5e94219 100644
--- a/tk/netview.po
+++ b/tk/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/tk/running.po b/tk/running.po
index e28fa1b..4cb40f4 100644
--- a/tk/running.po
+++ b/tk/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/tk/server.po b/tk/server.po
index bbd257f..e0d9a06 100644
--- a/tk/server.po
+++ b/tk/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/tk/services.po b/tk/services.po
index 1090190..04d5c4b 100644
--- a/tk/services.po
+++ b/tk/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/tk/troubleshooting.po b/tk/troubleshooting.po
index 5214888..2edb3e6 100644
--- a/tk/troubleshooting.po
+++ b/tk/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/tr/bridges.po b/tr/bridges.po
index 0149ac0..ad75433 100644
--- a/tr/bridges.po
+++ b/tr/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/tr/log.po b/tr/log.po
index b5d3761..babf94a 100644
--- a/tr/log.po
+++ b/tr/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/tr/netview.po b/tr/netview.po
index 4e33465..292217c 100644
--- a/tr/netview.po
+++ b/tr/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:03+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/tr/running.po b/tr/running.po
index e28fa1b..c6a9429 100644
--- a/tr/running.po
+++ b/tr/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/tr/server.po b/tr/server.po
index bbd257f..95c03f9 100644
--- a/tr/server.po
+++ b/tr/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/tr/services.po b/tr/services.po
index 1090190..5359aec 100644
--- a/tr/services.po
+++ b/tr/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/tr/troubleshooting.po b/tr/troubleshooting.po
index 5214888..7912089 100644
--- a/tr/troubleshooting.po
+++ b/tr/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/uk/bridges.po b/uk/bridges.po
index a2f51c3..462b608 100644
--- a/uk/bridges.po
+++ b/uk/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/uk/config.po b/uk/config.po
index 537a346..b3822d4 100644
--- a/uk/config.po
+++ b/uk/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/uk/index.po b/uk/index.po
index 45d25be..fa16734 100644
--- a/uk/index.po
+++ b/uk/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/uk/links.po b/uk/links.po
index ec4555e..f134333 100644
--- a/uk/links.po
+++ b/uk/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/uk/log.po b/uk/log.po
index b5d3761..2c976cf 100644
--- a/uk/log.po
+++ b/uk/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/uk/netview.po b/uk/netview.po
index 0aa4250..a19538e 100644
--- a/uk/netview.po
+++ b/uk/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/uk/running.po b/uk/running.po
index e28fa1b..302fb9e 100644
--- a/uk/running.po
+++ b/uk/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/uk/server.po b/uk/server.po
index bbd257f..6a18de7 100644
--- a/uk/server.po
+++ b/uk/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/uk/services.po b/uk/services.po
index 1090190..0357fc9 100644
--- a/uk/services.po
+++ b/uk/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/uk/troubleshooting.po b/uk/troubleshooting.po
index 5214888..57834f2 100644
--- a/uk/troubleshooting.po
+++ b/uk/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ur/bridges.po b/ur/bridges.po
index 821685d..66bcb03 100644
--- a/ur/bridges.po
+++ b/ur/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ur/config.po b/ur/config.po
index 537a346..d9347cf 100644
--- a/ur/config.po
+++ b/ur/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ur/index.po b/ur/index.po
index 45d25be..196be60 100644
--- a/ur/index.po
+++ b/ur/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ur/links.po b/ur/links.po
index d44a783..7f74b42 100644
--- a/ur/links.po
+++ b/ur/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ur/log.po b/ur/log.po
index b5d3761..2afa247 100644
--- a/ur/log.po
+++ b/ur/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ur/netview.po b/ur/netview.po
index f33fcb8..7998f03 100644
--- a/ur/netview.po
+++ b/ur/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ur/running.po b/ur/running.po
index e28fa1b..67982bb 100644
--- a/ur/running.po
+++ b/ur/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ur/server.po b/ur/server.po
index bbd257f..14bb034 100644
--- a/ur/server.po
+++ b/ur/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ur/services.po b/ur/services.po
index 1090190..43f8fbd 100644
--- a/ur/services.po
+++ b/ur/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ur/troubleshooting.po b/ur/troubleshooting.po
index 5214888..1884757 100644
--- a/ur/troubleshooting.po
+++ b/ur/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/ve/bridges.po b/ve/bridges.po
index 4993e71..84d4031 100644
--- a/ve/bridges.po
+++ b/ve/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/ve/config.po b/ve/config.po
index 537a346..10fdcbb 100644
--- a/ve/config.po
+++ b/ve/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/ve/index.po b/ve/index.po
index 45d25be..7050c5c 100644
--- a/ve/index.po
+++ b/ve/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/ve/links.po b/ve/links.po
index 478ec09..f0c1af9 100644
--- a/ve/links.po
+++ b/ve/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ve/log.po b/ve/log.po
index b5d3761..e321f35 100644
--- a/ve/log.po
+++ b/ve/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/ve/netview.po b/ve/netview.po
index 36708a4..d4e84d0 100644
--- a/ve/netview.po
+++ b/ve/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/ve/running.po b/ve/running.po
index e28fa1b..49a0b75 100644
--- a/ve/running.po
+++ b/ve/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/ve/server.po b/ve/server.po
index bbd257f..ec417e3 100644
--- a/ve/server.po
+++ b/ve/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/ve/services.po b/ve/services.po
index 1090190..5dd6731 100644
--- a/ve/services.po
+++ b/ve/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/ve/troubleshooting.po b/ve/troubleshooting.po
index 5214888..2297fa3 100644
--- a/ve/troubleshooting.po
+++ b/ve/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/vi/bridges.po b/vi/bridges.po
index 5916e03..5d5eb1d 100644
--- a/vi/bridges.po
+++ b/vi/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/vi/config.po b/vi/config.po
index 537a346..026cf29 100644
--- a/vi/config.po
+++ b/vi/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/vi/index.po b/vi/index.po
index 45d25be..d6a3acb 100644
--- a/vi/index.po
+++ b/vi/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/vi/links.po b/vi/links.po
index 0815ee7..0fca2ff 100644
--- a/vi/links.po
+++ b/vi/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/vi/log.po b/vi/log.po
index b5d3761..84eb7f3 100644
--- a/vi/log.po
+++ b/vi/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/vi/netview.po b/vi/netview.po
index 10ae0aa..8a59abc 100644
--- a/vi/netview.po
+++ b/vi/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/vi/running.po b/vi/running.po
index e28fa1b..6ec8391 100644
--- a/vi/running.po
+++ b/vi/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/vi/server.po b/vi/server.po
index bbd257f..bd10af4 100644
--- a/vi/server.po
+++ b/vi/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/vi/services.po b/vi/services.po
index 1090190..14059ad 100644
--- a/vi/services.po
+++ b/vi/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/vi/troubleshooting.po b/vi/troubleshooting.po
index 5214888..3e6e0a9 100644
--- a/vi/troubleshooting.po
+++ b/vi/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/wa/bridges.po b/wa/bridges.po
index e87a365..5439d9d 100644
--- a/wa/bridges.po
+++ b/wa/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/wa/config.po b/wa/config.po
index 537a346..4561792 100644
--- a/wa/config.po
+++ b/wa/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/wa/index.po b/wa/index.po
index 45d25be..3529b6e 100644
--- a/wa/index.po
+++ b/wa/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/wa/links.po b/wa/links.po
index 2b0c41b..cbbab26 100644
--- a/wa/links.po
+++ b/wa/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/wa/log.po b/wa/log.po
index b5d3761..cfa4b63 100644
--- a/wa/log.po
+++ b/wa/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/wa/netview.po b/wa/netview.po
index 3acb714..88af183 100644
--- a/wa/netview.po
+++ b/wa/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/wa/running.po b/wa/running.po
index e28fa1b..ad82bb2 100644
--- a/wa/running.po
+++ b/wa/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/wa/server.po b/wa/server.po
index bbd257f..30b9a3a 100644
--- a/wa/server.po
+++ b/wa/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/wa/services.po b/wa/services.po
index 1090190..9664358 100644
--- a/wa/services.po
+++ b/wa/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/wa/troubleshooting.po b/wa/troubleshooting.po
index 5214888..8187b33 100644
--- a/wa/troubleshooting.po
+++ b/wa/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/wo/bridges.po b/wo/bridges.po
index 7e87e97..a215dde 100644
--- a/wo/bridges.po
+++ b/wo/bridges.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: wo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -43,13 +32,13 @@ msgstr ""
 #: en/bridges.html:22
 msgid ""
 "Some Internet Service Providers (ISPs) attempt to prevent users from "
-"accessing the Tor network by blocking connections to known Tor "
-"relays. Bridge relays (or <i>bridges</i> for short) are relays that help "
-"these censored users access the Tor network. Unlike other Tor relays, "
-"bridges are not listed in the same public directories as normal "
-"relays. Since there is no complete public list of them, even if your ISP is "
-"filtering connections to all the known Tor relays, they probably won't be "
-"able to block all the bridges."
+"accessing the Tor network by blocking connections to known Tor relays. "
+"Bridge relays (or <i>bridges</i> for short) are relays that help these "
+"censored users access the Tor network. Unlike other Tor relays, bridges are "
+"not listed in the same public directories as normal relays. Since there is "
+"no complete public list of them, even if your ISP is filtering connections "
+"to all the known Tor relays, they probably won't be able to block all the "
+"bridges."
 msgstr ""
#. type: Content of: <html><body>
@@ -82,9 +71,9 @@ msgstr ""
 msgid ""
 "To use private bridges, ask your friends to run Vidalia and Tor in an "
 "uncensored area of the Internet, and then click on <i>Help censored "
-"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then "
-"they should privately send you the <i>Bridge address</i> line at the bottom "
-"of their Relay page. Unlike running an exit relay, running a bridge relay "
+"users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then"
+" they should privately send you the <i>Bridge address</i> line at the bottom"
+" of their Relay page. Unlike running an exit relay, running a bridge relay "
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
@@ -108,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/wo/config.po b/wo/config.po
index 537a346..7179140 100644
--- a/wo/config.po
+++ b/wo/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: wo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/wo/index.po b/wo/index.po
index 45d25be..5c34d48 100644
--- a/wo/index.po
+++ b/wo/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: wo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/wo/links.po b/wo/links.po
index 979d89d..25d1aa3 100644
--- a/wo/links.po
+++ b/wo/links.po
@@ -1,112 +1,80 @@
 # 
-#   $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.torproject.org/projects/vidalia.html.
-#   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"
-"POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: wo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
-#: en/links.html:16
+#: links.html:16
 msgid "Helpful Links"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:22 en/links.html:30 en/links.html:38 en/links.html:50 en/links.html:57 en/links.html:65 en/links.html:73
+#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:23 en/links.html:51
+#: links.html:23 links.html:43
 msgid "Homepage"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href="https://www.torproject.org/vidalia/%5C%22%3E "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:31 en/links.html:66
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:33
-msgid ""
-"<a href="http://trac.vidalia-project.net/wiki%5C%22%3E "
-"http://trac.vidalia-project.net/wiki</a>"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:39 en/links.html:74
-msgid "Bugtracker"
-msgstr ""
-
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href="http://trac.vidalia-project.net/report%5C%22%3E "
-"http://trac.vidalia-project.net/report</a>"
+#: links.html:33
+msgid "<a href="http://trac.torproject.org/%5C%22%3E http://trac.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href="https://www.torproject.org/%5C%22%3Ehttps://www.torproject.org/</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:60
+#: links.html:52
 msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href="https://www.torproject.org/docs/faq.html%5C%22%3E "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href="https://wiki.torproject.org/noreply/TheOnionRouter%5C%22%3E "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href="https://bugs.torproject.org/flyspray/%5C%22%3E "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
+
diff --git a/wo/log.po b/wo/log.po
index b5d3761..c0a8cfd 100644
--- a/wo/log.po
+++ b/wo/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: wo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/wo/netview.po b/wo/netview.po
index 133164f..c3b89ae 100644
--- a/wo/netview.po
+++ b/wo/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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: wo\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 ""
@@ -255,3 +244,5 @@ msgstr ""
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr ""
+
+
diff --git a/wo/running.po b/wo/running.po
index e28fa1b..26c2004 100644
--- a/wo/running.po
+++ b/wo/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: wo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/wo/server.po b/wo/server.po
index bbd257f..577d12b 100644
--- a/wo/server.po
+++ b/wo/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: wo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/wo/services.po b/wo/services.po
index 1090190..a761bcc 100644
--- a/wo/services.po
+++ b/wo/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: wo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/wo/troubleshooting.po b/wo/troubleshooting.po
index 5214888..ff8f8fa 100644
--- a/wo/troubleshooting.po
+++ b/wo/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: wo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/zh_CN/config.po b/zh_CN/config.po
index 4415b33..c4ce6e7 100644
--- a/zh_CN/config.po
+++ b/zh_CN/config.po
@@ -1,34 +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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2010-11-09 10:52+0200\n"
-"Last-Translator: jonchil abcd666@gmail.com\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
+"Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
 msgid "Configuring Vidalia and Tor"
-msgstr "配置 Vidalia 和 Tor"
+msgstr ""
#. type: Content of: <html><body><p>
 #: en/config.html:20
@@ -37,33 +25,30 @@ 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 允许您配置大多数 Vidalia 和 Tor 的常用部分。它也允许您设置和管理一个<a href="server.html">Tor "
-"中继</a>，使得您能帮助到 Tor 网络的成长。"
#. type: Content of: <html><body>
 #: en/config.html:26
 msgid "<a name="general"/>"
-msgstr "<a name="general"/>"
+msgstr ""
#. 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 ""
-# Tor Executable 不知如何翻译，暂时留空
-# by Jonchil
 #. 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 ""
@@ -74,25 +59,23 @@ 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>：该设定允许您让 Vidalia 在启动的同时也启动 Tor。您也可以配置 Vidalia 在系统启动时运行(<i>仅限 "
-"Windows</i>)。"
#. type: Content of: <html><body>
 #: en/config.html:46
 msgid "<a name="network"/>"
-msgstr "<a name="network"/>"
+msgstr ""
#. type: Content of: <html><body><h3>
 #: en/config.html:47
 msgid "Network Settings"
-msgstr "网络设置"
+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>设置页面使您可以更改 Tor 连接到网络的方式。"
+"The <i>Network</i> settings page lets you change how Tor connects to the Tor"
+" network."
+msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/config.html:53
@@ -105,9 +88,6 @@ 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>：如果您的 Internet 连接需要以 HTTP 代理方式，您可以配置 Tor 通过您的代理服务器发送所有的目"
-"录请求和中继连接。您必须至少指定一个主机名或代理服务器的地址，并且您代理服务器的端口也必须处于监听连接状态。如果您的代理服务器要求身份验证，您也可以输入"
-"连接到代理服务器的<i>用户名</i和<i>密码</i>。或者，您可以留空这些选项。"
#. type: Content of: <html><body><ul><li>
 #: en/config.html:62
@@ -116,115 +96,98 @@ 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>：如果您处于防火墙限制下或代理服务器限制您连接的端口，您可以配置 Tor "
-"直接从您防火墙或代理服务器允许的端口连接。仅需要输入您防火墙或代理服务器允许的端口列表，通过逗号来分隔。（例如：80,443,8080）"
-# 版本号随时更新，模糊记号
-# by Jonchil
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:69
-#, fuzzy
 msgid ""
 "<b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet "
 "Service Provider) blocks connections to the Tor network, Tor can attempt to "
 "avoid being filtered by encrypting its directory connections and connecting "
 "to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha "
-"or newer only). You can add bridge relays by specifying either their address "
-"and port number, or their address, port number, and fingerprint."
+"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 阻挡了对 Tor 网络的连接</b>：如果您的 ISP(互联网服务提供商)阻止了您连接到 Tor "
-"网络，Tor会通过尝试加密目录连接和以被称作<i>网桥</i>的中继连接，来避免被过滤掉（仅限 Tor 0.2.0.3-alpha "
-"或更高版本）。您可以通过指定地址或端口来添加网桥中继，或者他们的地址，端口号，和指纹。"
#. 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
 msgid "128.213.48.13:8080"
-msgstr "128.213.48.13:8080"
+msgstr ""
#. 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 "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
+msgstr ""
#. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:86
 msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
-msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
+msgstr ""
-# fingerprints 不知如何翻译，模糊
-# by Jonchil
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:89
-#, fuzzy
 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 ""
-"即使您无从得知任何网桥中继的地址，配置该部分也仍然很有帮助。Tor 会加密他的目录请求，该方式可以防止过滤 Tor "
-"请求网桥和其他信息的阻止机制。如果链接到常规 Tor 中继被阻止，您就需要通过某种方式来寻找 Tor "
-"网桥中继地址，并且添加到这里。更多关于寻找新网桥中继地址和指纹的信息，请查看帮助主题<a "
-"href="bridges.html#finding">寻找网桥中继</a>。"
#. type: Content of: <html><body>
 #: en/config.html:100
 msgid "<a name="relay"/>"
-msgstr "<a name="relay"/>"
+msgstr ""
#. 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>"
-msgstr "更多关于设置和管理一个 Tor 中继的细节，<i>请查看<a href="server.html">该帮助主题</a>。"
+"<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 "<a name="appearance"/>"
+msgstr ""
#. type: Content of: <html><body><h3>
 #: en/config.html:110
 msgid "Appearance Settings"
-msgstr "外观设定"
+msgstr ""
#. type: Content of: <html><body><p>
 #: en/config.html:112
 msgid ""
 "The settings on the <i>Appearance</i> page allow you to customize the look "
 "and feel of Vidalia."
-msgstr "<i>外观</i>页的设置允许您定制 Vidalia 的外观。"
+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 ""
-"<b>语言</b>：Vidalia 的界面已经被志愿者们翻译成了许多种语言.当 Vidalia 第一次运行的时候,他会试着猜测您正使用哪种语言。如果 "
-"Vidalia 猜测错误，或如果您更喜欢不同的语言，您可以从下拉菜单中选择别的语言。在改变显示语言之后,您需要重启 Vidalia 使之生效。"
#. type: Content of: <html><body><ul><li>
 #: en/config.html:124
@@ -232,35 +195,33 @@ msgid ""
 "<b>Style</b>: In most cases, Vidalia will default to using your platform's "
 "default interface style. If you dislike the default, you can choose "
 "whichever interface style you prefer from the dropdown box."
-msgstr "<b>风格</b>：在很多情况下，Vidalia 会默认使用您平台的默认界面风格。如果您不喜欢默认风格，可以从下拉菜单中选择您喜欢的风格。"
+msgstr ""
#. type: Content of: <html><body>
 #: en/config.html:131
 msgid "<a name="advanced"/>"
-msgstr "<a name="advanced"/>"
+msgstr ""
#. type: Content of: <html><body><h3>
 #: en/config.html:132
 msgid "Advanced Settings"
-msgstr "高级设定"
+msgstr ""
#. type: Content of: <html><body><p>
 #: en/config.html:134
 msgid ""
 "The settings on the <i>Advanced</i> page should generally only be modified "
 "by more experienced users."
-msgstr "<i>高级</i>页面中的设置通常情况下应当需要有更多经验的用户来改变。"
+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 ""
-"<b>控制地址 &amp; 端口</b>：<i>控制端口</i>是 Vidalia 与 Tor "
-"通信的端口。通常无需改变，除非与您机器上的其他服务有冲突，或者您正在使用 Vidalia 控制和监视在其他机器上运行的 Tor 进程。"
#. type: Content of: <html><body><ul><li>
 #: en/config.html:144
@@ -268,7 +229,7 @@ msgid ""
 "<b>Control Port Authentication</b>: Control port authentication is used to "
 "limit the applications on your machine that can connect to and reconfigure "
 "your Tor installation. The available authentication methods are:"
-msgstr "<b>控制端口身份验证</b>：控制端口身份验证是用于限制您机器上的应用程序连接和配置您的 Tor 设备的。可用的身份验证格式如下："
+msgstr ""
#. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:150
@@ -276,7 +237,7 @@ msgid ""
 "<b>None</b> -- No authentication is required. Use of this option is "
 "<b>strongly</b> discouraged. Any application or user on your computer can "
 "reconfigure your Tor installation."
-msgstr "<b>无</b> -- 要求无身份验证。使用该设置是<b>强烈</b>不鼓励的。任何您电脑上的应用程序或用户都可以配置您的 Tor 设备。"
+msgstr ""
#. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:155
@@ -284,23 +245,18 @@ 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> -- 如果选择该方式，您可以指定一个 Tor 要求每次用户或应用程序访问控制端口的密码。如果 Vidalia "
-"为您启动 Tor,您可以通过勾选<i>随机生成</i>项使得 Vidalia 每次启动 Tor 随机生成一个密码。"
#. 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>Cookie</b> -- 如果选择 Cookie 身份验证，Tor "
-"在启动时会写一个包含随机字符的文件（或<i>cookie</i>）到它的数据目录中。任何试着连接到 Tor 的控制端口的用户和应用程序都必须提供 "
-"Cookie 的内容。"
#. type: Content of: <html><body><ul><li>
 #: en/config.html:170
@@ -310,8 +266,6 @@ msgid ""
 "file. If you leave this field blank, Tor will uses its own default torrc "
 "location."
 msgstr ""
-"<b>Tor 配置文件</b><i>（可选）</i>：您可以通过该选项使得 Vidalia 启动 Tor 时使用指定的<i>torrc</i>,Tor "
-"的配置文件。如果您留空该项，Tor 会使用它默认的 torrc。"
#. type: Content of: <html><body><ul><li>
 #: en/config.html:175
@@ -321,34 +275,31 @@ 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>Tor 数据目录</b><i>（可选）</i>：您可以指定目录让 Tor 存储数据，例如缓存 Tor 中继信息，Tor "
-"中继密钥，和配置文件。如果您留空该项，Tor 会使用它默认的数据目录位置。"
-# Linux命令如何翻译？
-# by Jonchil
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:181
-#, fuzzy
 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>（可选，Windows 中不可用）</i>：如果您输入一个"
+msgstr ""
#. type: Content of: <html><body>
 #: en/config.html:189
 msgid "<a name="services"/>"
-msgstr "<a name="services"/>"
+msgstr ""
#. 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."
-msgstr "隐藏服务允许您提供任何形式基于 TCP 的服务给他人而无需隐藏您的 IP 地址，例如，一种 HTTP 服务。"
+"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/zh_CN/netview.po b/zh_CN/netview.po
index 26e8ab4..93b3788 100644
--- a/zh_CN/netview.po
+++ b/zh_CN/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/zh_CN/running.po b/zh_CN/running.po
index 66b90cf..f734a7f 100644
--- a/zh_CN/running.po
+++ b/zh_CN/running.po
@@ -1,34 +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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-11-05 13:03+0200\n"
-"Last-Translator: jonchil abcd666@gmail.com\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
+"Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
 msgid "Running Tor"
-msgstr "运行 Tor"
+msgstr ""
#. type: Content of: <html><body><p>
 #: en/running.html:20
@@ -36,88 +24,84 @@ msgid ""
 "Vidalia can help you control your Tor process by letting you start and stop "
 "Tor, as well as monitoring Tor's status and letting you know if it exits "
 "unexpectedly."
-msgstr "Vidalia 能帮助控制您的 Tor 进程使之启动或停止，同样也像监视器一样监视 Tor 的状态并且是您知道它是否异常退出。"
+msgstr ""
#. type: Content of: <html><body>
 #: en/running.html:25
 msgid "<a name="starting"/>"
-msgstr "<a name="starting"/>"
+msgstr ""
#. type: Content of: <html><body><h3>
 #: en/running.html:26
 msgid "Starting and Stopping Tor"
-msgstr "启动和停止 Tor"
+msgstr ""
#. type: Content of: <html><body><p>
 #: en/running.html:28
 msgid "To <i>start</i> Tor,"
-msgstr "<i>启动</i> Tor，"
+msgstr ""
#. type: Content of: <html><body><p><ol><li>
 #: en/running.html:30
 msgid "Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i>"
-msgstr "在 Vidalia 的托盘菜单中选择<i>启动</i>,或按<i>Ctrl+S</i>"
+msgstr ""
#. type: Content of: <html><body><p><ol>
 #: en/running.html:30 en/running.html:45
 msgid "."
-msgstr "。"
+msgstr ""
#. type: Content of: <html><body><p><ol><li>
 #: en/running.html:32
 msgid ""
 "Vidalia's tray icon will change from an onion with a red X to a green onion "
 "when Tor has started."
-msgstr "当 Tor 已经启动的时候，Vidalia 面板图标会从一个有红X的洋葱图标，变成一个绿色的洋葱。"
+msgstr ""
#. type: Content of: <html><body><p>
 #: en/running.html:36
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
-"如果 Vidalia 未能成功启动 Tor，Vidalia会显示一个错误信息来告诉您哪里有问题。您也可以查看您的<a "
-"href="log.html">消息日志</a>来发现 Tor 打印了哪些运行中的错误。"
#. type: Content of: <html><body><p>
 #: en/running.html:43
 msgid "To <i>stop</i> Tor,"
-msgstr "<i>停止</i> Tor，"
+msgstr ""
#. type: Content of: <html><body><p><ol><li>
 #: en/running.html:45
 msgid "Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i>"
-msgstr "在 Vidalia 的托盘图标中选择<i>停止</i>或按<i>Ctrl+T</i>"
+msgstr ""
#. type: Content of: <html><body><p><ol><li>
 #: en/running.html:47
 msgid ""
 "Vidalia's tray icon will change from a green onion to a gray onion with a "
 "red X when Tor has stopped."
-msgstr "当 Tor 停止的时候，Vidalia 面板图标会从一个绿色的洋葱变成一个有红X的洋葱。"
+msgstr ""
#. type: Content of: <html><body><p>
 #: en/running.html:51
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
-"如果 Vidalia 无法停止 Tor,Vidalia 会显示一个错误信息来告诉您哪里出了问题。您也可以通过<a "
-"href="log.html">消息日志</a>来查看 Tor 是否有更多有关运行的错误。"
#. type: Content of: <html><body>
 #: en/running.html:57
 msgid "<a name="monitoring"/>"
-msgstr "<a name="monitoring"/>"
+msgstr ""
#. type: Content of: <html><body><h3>
 #: en/running.html:58
 msgid "Monitoring Tor's Status"
-msgstr "监视 Tor 的状态"
+msgstr ""
#. type: Content of: <html><body><p>
 #: en/running.html:60
@@ -125,43 +109,42 @@ msgid ""
 "Vidalia tells you about the status of Tor by displaying an icon in your "
 "system tray or dock area. The following table shows the different states "
 "indicated by an icon in your system's notification area:"
-msgstr "Vidalia 会通过显示在系统托盘或 Dock 区域的图标来告诉您 Tor 的状态。下面的表格会为您指出系统提醒区域 Tor 不同的状态。"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
-msgstr "Tor 已经停止。请在 Vidalia 菜单中选择<i>启动</i>来启动 Tor。"
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:76
 msgid ""
 "Tor is starting up. You can check the <a href="log.html">message log</a> "
 "for status information about Tor while it is starting."
-msgstr "Tor 正在启动中。您可以通过检查<a href="log.html">消息日志</a>获得有关 Tor 启动阶段的状态信息。"
+msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
-"Tor 正在运行。如果您想要停止 Tor，请在 Vidalia 菜单中选择<i>停止</i>。如果您想要查看 Tor 在做什么，Tor 在运行时会在<a "
-"href="log.html">消息日志</a>中打印消息。"
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:92
 msgid "Tor is in the process of shutting down."
-msgstr "Tor 正在关闭中。"
+msgstr ""
#. type: Content of: <html><body><p>
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
-"如果 Tor 异常退出，Vidalia 会将图标变成一个有红X的黑色洋葱,并且显示一个错误消息,让您知道哪里有错误。您也可以通过查看<a "
-"href="log.html">消息日志</a>获得关于 Tor 退出前发生情况的详细信息。"
+
+
diff --git a/zh_CN/server.po b/zh_CN/server.po
index 3cb445f..6eaa53f 100644
--- a/zh_CN/server.po
+++ b/zh_CN/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/zh_CN/services.po b/zh_CN/services.po
index 73d206c..c6eb74b 100644
--- a/zh_CN/services.po
+++ b/zh_CN/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/zh_HK/bridges.po b/zh_HK/bridges.po
index 07cd2ce..6628b48 100644
--- a/zh_HK/bridges.po
+++ b/zh_HK/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/zh_HK/config.po b/zh_HK/config.po
index 537a346..196d106 100644
--- a/zh_HK/config.po
+++ b/zh_HK/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/zh_HK/index.po b/zh_HK/index.po
index 45d25be..97cf6ac 100644
--- a/zh_HK/index.po
+++ b/zh_HK/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/zh_HK/links.po b/zh_HK/links.po
index cc606ac..5df29d8 100644
--- a/zh_HK/links.po
+++ b/zh_HK/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/zh_HK/log.po b/zh_HK/log.po
index b5d3761..c50a920 100644
--- a/zh_HK/log.po
+++ b/zh_HK/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/zh_HK/netview.po b/zh_HK/netview.po
index 9aa5dc4..1a0c1c4 100644
--- a/zh_HK/netview.po
+++ b/zh_HK/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/zh_HK/running.po b/zh_HK/running.po
index e28fa1b..f85fe47 100644
--- a/zh_HK/running.po
+++ b/zh_HK/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/zh_HK/server.po b/zh_HK/server.po
index bbd257f..3d85552 100644
--- a/zh_HK/server.po
+++ b/zh_HK/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/zh_HK/services.po b/zh_HK/services.po
index 1090190..8189740 100644
--- a/zh_HK/services.po
+++ b/zh_HK/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/zh_HK/troubleshooting.po b/zh_HK/troubleshooting.po
index 5214888..364e515 100644
--- a/zh_HK/troubleshooting.po
+++ b/zh_HK/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/zh_TW/bridges.po b/zh_TW/bridges.po
index 9efc47a..a76be68 100644
--- a/zh_TW/bridges.po
+++ b/zh_TW/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/zh_TW/config.po b/zh_TW/config.po
index 537a346..8927ec8 100644
--- a/zh_TW/config.po
+++ b/zh_TW/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/zh_TW/index.po b/zh_TW/index.po
index 45d25be..e5f7c1a 100644
--- a/zh_TW/index.po
+++ b/zh_TW/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/zh_TW/links.po b/zh_TW/links.po
index 9ac6f24..e8a5241 100644
--- a/zh_TW/links.po
+++ b/zh_TW/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/zh_TW/log.po b/zh_TW/log.po
index b5d3761..4fbacd2 100644
--- a/zh_TW/log.po
+++ b/zh_TW/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/zh_TW/netview.po b/zh_TW/netview.po
index 3b07eb1..1c889ec 100644
--- a/zh_TW/netview.po
+++ b/zh_TW/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:21+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/zh_TW/running.po b/zh_TW/running.po
index e28fa1b..0636c46 100644
--- a/zh_TW/running.po
+++ b/zh_TW/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/zh_TW/server.po b/zh_TW/server.po
index bbd257f..5cf26e0 100644
--- a/zh_TW/server.po
+++ b/zh_TW/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/zh_TW/services.po b/zh_TW/services.po
index 1090190..ee76f1c 100644
--- a/zh_TW/services.po
+++ b/zh_TW/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/zh_TW/troubleshooting.po b/zh_TW/troubleshooting.po
index 5214888..c00f55a 100644
--- a/zh_TW/troubleshooting.po
+++ b/zh_TW/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/zu/bridges.po b/zu/bridges.po
index 9a56b88..e226730 100644
--- a/zu/bridges.po
+++ b/zu/bridges.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +97,5 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+
+
diff --git a/zu/config.po b/zu/config.po
index 537a346..d4f1d37 100644
--- a/zu/config.po
+++ b/zu/config.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:27+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/config.html:16
@@ -49,16 +38,17 @@ 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."
+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 ""
@@ -83,8 +73,8 @@ 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."
+"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>
@@ -146,10 +136,10 @@ msgstr ""
 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,8 +157,8 @@ 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>
@@ -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>
@@ -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,9 +279,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 +298,8 @@ 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/zu/index.po b/zu/index.po
index 45d25be..297e9bd 100644
--- a/zu/index.po
+++ b/zu/index.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:25+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/index.html:16
@@ -54,3 +43,5 @@ msgid ""
 "See the <a href="links.html">Helpful Links</a> topic for some places you "
 "can visit to find additional help and information about Vidalia and Tor."
 msgstr ""
+
+
diff --git a/zu/links.po b/zu/links.po
index eff4270..8c44824 100644
--- a/zu/links.po
+++ b/zu/links.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2011-09-03 13:26+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +76,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href="https://trac.torproject.org/%5C%22%3E https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/zu/log.po b/zu/log.po
index b5d3761..837a088 100644
--- a/zu/log.po
+++ b/zu/log.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:28+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/log.html:16
@@ -32,11 +21,11 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/log.html:19
 msgid ""
-"The message log lets you see status information about a running Tor "
-"process.  <a name="basic"/> Each message has a <i>severity</i> associated "
-"with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most "
-"verbose). See the help section on <a href="#severities">message "
-"severities</a> for more information.  <a name="severities"/>"
+"The message log lets you see status information about a running Tor process."
+"  <a name="basic"/> Each message has a <i>severity</i> associated with it,"
+" ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). "
+"See the help section on <a href="#severities">message severities</a> for "
+"more information.  <a name="severities"/>"
 msgstr ""
#. type: Content of: <html><body><h3>
@@ -48,14 +37,15 @@ msgstr ""
 #: en/log.html:30
 msgid ""
 "A message's severity tells you how important the message is. A higher "
-"severity message usually indicates that something has gone wrong with "
-"Tor. Lower severity messages appear frequently during normal Tor operations "
-"and usually do not need to be logged."
+"severity message usually indicates that something has gone wrong with Tor. "
+"Lower severity messages appear frequently during normal Tor operations and "
+"usually do not need to be logged."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
 msgstr ""
#. type: Content of: <html><body><ul><li>
@@ -69,31 +59,31 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:46
 msgid ""
-"<b>Warning</b>: Messages that only appear when something has gone wrong with "
-"Tor, but are not fatal and Tor will continue running. These messages will be "
-"highlighted in <i>yellow</i>."
+"<b>Warning</b>: Messages that only appear when something has gone wrong with"
+" Tor, but are not fatal and Tor will continue running. These messages will "
+"be highlighted in <i>yellow</i>."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:51
 msgid ""
-"<b>Notice</b>: Messages that appear infrequently during normal Tor operation "
-"and are not considered errors, but you still may care about."
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:55
 msgid ""
-"<b>Info</b>: Messages that appear frequently during normal Tor operation and "
-"are not usually of interest to most users."
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 msgstr ""
#. type: Content of: <html><body><ul><li>
 #: en/log.html:59
 msgid ""
 "<b>Debug</b>: Extremely verbose messages that are primarily of interest to "
-"developers. You should generally not log debug messages unless you know what "
-"you are doing."
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -105,7 +95,8 @@ msgstr ""
#. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -121,8 +112,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:76
 msgid ""
-"Check message severities you would like to see from the Message Filter group "
-"on the left and uncheck message severities you would like to hide."
+"Check message severities you would like to see from the Message Filter group"
+" on the left and uncheck message severities you would like to hide."
 msgstr ""
#. type: Content of: <html><body><p><ol><li>
@@ -149,7 +140,8 @@ msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/log.html:94
-msgid "Check the box labeled <i>Automatically save new log messages to a file</i>."
+msgid ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -164,3 +156,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/zu/netview.po b/zu/netview.po
index b7517cb..1503d4c 100644
--- a/zu/netview.po
+++ b/zu/netview.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2011-09-03 13:22+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "MIME-Version: 1.0\n"
diff --git a/zu/running.po b/zu/running.po
index e28fa1b..a03e590 100644
--- a/zu/running.po
+++ b/zu/running.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/running.html:16
@@ -74,8 +63,8 @@ msgstr ""
 msgid ""
 "If Vidalia is unable to start Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -100,8 +89,8 @@ msgstr ""
 msgid ""
 "If Vidalia was unable to stop Tor, Vidalia will display an error message "
 "telling you what went wrong. You can also look at your <a "
-"href="log.html">message log</a> to see if Tor printed any more information "
-"about what went wrong."
+"href="log.html">message log</a> to see if Tor printed any more information"
+" about what went wrong."
 msgstr ""
#. type: Content of: <html><body>
@@ -124,7 +113,8 @@ msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:69
-msgid "Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
 msgstr ""
#. type: Content of: <html><body><p><table><tr><td>
@@ -137,8 +127,8 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:84
 msgid ""
-"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia "
-"menu. Tor will print informational messages to the <a "
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
 "href="log.html">message log</a> while it is running, if you want to see "
 "what Tor is doing."
 msgstr ""
@@ -152,7 +142,9 @@ msgstr ""
 #: en/running.html:98
 msgid ""
 "If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
-"with a red X and display an error message letting you know what went "
-"wrong. You can also check the <a href="log.html">message log</a> for "
-"details about any problems Tor encountered before it exited."
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href="log.html">message log</a> for details "
+"about any problems Tor encountered before it exited."
 msgstr ""
+
+
diff --git a/zu/server.po b/zu/server.po
index bbd257f..cb74ec9 100644
--- a/zu/server.po
+++ b/zu/server.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/server.html:16
@@ -69,8 +58,8 @@ msgid ""
 "(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are "
 "blocked from accessing the Tor network directly.  Check the box labeled "
 "<i>Relay traffic for the Tor network</i> if you want to run a normal Tor "
-"relay or <i>Help censored users reach the Tor network</i> if you want to run "
-"a bridge relay."
+"relay or <i>Help censored users reach the Tor network</i> if you want to run"
+" a bridge relay."
 msgstr ""
#. type: Content of: <html><body><ol><li>
@@ -97,19 +86,19 @@ msgstr ""
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
 msgid ""
-"<b>Relay Port</b>: The port on which your relay will listen for traffic from "
-"clients or other Tor relays."
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 msgstr ""
#. type: Content of: <html><body><ol><li>
 #: en/server.html:62
 msgid ""
 "If you would like to mirror Tor's directory of relays for others on the "
-"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If "
-"you do not have much bandwidth, uncheck this box. If you do decide to mirror "
-"the relay directory, make sure the <i>Directory Port</i> is different than "
-"the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror "
-"the relay directory."
+"network you can check the box labeled <i>Mirror the Relay Directory</i>.  If"
+" you do not have much bandwidth, uncheck this box. If you do decide to "
+"mirror the relay directory, make sure the <i>Directory Port</i> is different"
+" than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
+"mirror the relay directory."
 msgstr ""
#. type: Content of: <html><body>
@@ -127,8 +116,8 @@ msgstr ""
 msgid ""
 "Running a Tor relay can consume a large amount of bandwidth; however, Tor "
 "allows you to limit the amount of bandwidth that you are willing to "
-"contribute to the Tor network. You can run a relay, while still keeping your "
-"network connection usable for your own use."
+"contribute to the Tor network. You can run a relay, while still keeping your"
+" network connection usable for your own use."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -148,11 +137,11 @@ msgstr ""
 #: en/server.html:86
 msgid ""
 "The <i>maximum rate</i> is a pool of bytes used to fulfill requests during "
-"short periods of traffic higher than your specified <i>average rate</i>, but "
-"still maintains the average over a long period. A low average rate but a "
+"short periods of traffic higher than your specified <i>average rate</i>, but"
+" still maintains the average over a long period. A low average rate but a "
 "high maximum rate enforces a long-term average while still allowing more "
-"traffic during peak times if the average hasn't been reached lately. If your "
-"average rate is the same as your <i>maximum rate</i>, then Tor will never "
+"traffic during peak times if the average hasn't been reached lately. If your"
+" average rate is the same as your <i>maximum rate</i>, then Tor will never "
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
@@ -161,8 +150,8 @@ msgstr ""
 #: en/server.html:96
 msgid ""
 "The <i>average rate</i> is the maximum long-term average bandwidth allowed "
-"(in kilobytes per second). For example, you might want to choose 2 megabytes "
-"per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
+"(in kilobytes per second). For example, you might want to choose 2 megabytes"
+" per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable "
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
@@ -170,9 +159,9 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/server.html:103
 msgid ""
-"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not "
-"bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For "
-"example, if your relay acts as a directory mirror, you may be sending more "
+"It is important to remember that Tor measures bandwidth in <b>bytes</b>, not"
+" bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For"
+" example, if your relay acts as a directory mirror, you may be sending more "
 "outgoing bytes than incoming. If you find this is the case and is putting "
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
@@ -214,8 +203,8 @@ msgstr ""
 msgid ""
 "For completeness, the following table lists the specific port numbers "
 "represented by each of the exit policy checkboxes. The <b>Description</b> "
-"column describes the resources Tor clients will be allowed to access through "
-"your relay, if the associated box is checked."
+"column describes the resources Tor clients will be allowed to access through"
+" your relay, if the associated box is checked."
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -290,7 +279,8 @@ msgstr ""
#. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 msgstr ""
#. type: Content of: <html><body><table><tr><td>
@@ -355,11 +345,11 @@ msgstr ""
 #: en/server.html:191
 msgid ""
 "Many home users connect to the Internet via a <i>router</i>, which allows "
-"multiple computers on a local network to share the same Internet "
-"connection.  Some users may also be behind a <i>firewall</i> that blocks "
-"incoming connections to your computer from other computers on the Internet.  "
-"If you want to run a Tor relay, however, other Tor clients and relays must "
-"be able to connect to your relay through your home router or firewall."
+"multiple computers on a local network to share the same Internet connection."
+"  Some users may also be behind a <i>firewall</i> that blocks incoming "
+"connections to your computer from other computers on the Internet.  If you "
+"want to run a Tor relay, however, other Tor clients and relays must be able "
+"to connect to your relay through your home router or firewall."
 msgstr ""
#. type: Content of: <html><body><p>
@@ -376,8 +366,8 @@ msgstr ""
 #: en/server.html:208
 msgid ""
 "If you check the box labeled <i>Attempt to automatically configure port "
-"forwarding</i>, Vidalia will attempt to automatically set up port forwarding "
-"on your local network connection so that other Tor clients can connect to "
+"forwarding</i>, Vidalia will attempt to automatically set up port forwarding"
+" on your local network connection so that other Tor clients can connect to "
 "your relay. Not all routers support automatic port forwarding, though. You "
 "can use the <i>Test</i> button next to the checkbox to find out if Vidalia "
 "is able to automatically set up port forwarding for you."
@@ -393,16 +383,16 @@ msgid ""
 "administrative interface, you should look for an option to enable UPnP. The "
 "administrative interface for most routers can be accessed by opening <a "
 "href="http://192.168.0.1/%5C%22%3Ehttp://192.168.0.1</a> or <a "
-"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
+"href="http://192.168.1.1/%5C%22%3Ehttp://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
#. type: Content of: <html><body><p>
 #: en/server.html:229
 msgid ""
 "If you need to set up port forwarding manually, the website <a "
-"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5... "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm%5..."
+" portforward.com</a> has instructions for how to set up port forwarding for "
 "many types of routers and firewalls. At a minimum, you will need to forward "
 "your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on "
 "all other operating systems. If you also checked the checkbox labeled "
@@ -410,3 +400,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+
+
diff --git a/zu/services.po b/zu/services.po
index 1090190..1cb92fe 100644
--- a/zu/services.po
+++ b/zu/services.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:23+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/services.html:16
@@ -93,9 +82,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:50
 msgid ""
-"There is a fine tutorial on the Tor website "
-"(https://www.torproject.org/docs/tor-hidden-service.html) that describes "
-"these steps in more detail."
+"There is a fine tutorial on the Tor website (https://www.torproject.org/docs"
+"/tor-hidden-service.html) that describes these steps in more detail."
 msgstr ""
#. type: Content of: <html><body>
@@ -119,19 +107,19 @@ msgstr ""
 #: en/services.html:61
 msgid ""
 "Onion Address (generated): The service (or onion) address is generated by "
-"Tor to uniquely identify your service. Give this onion address to the people "
-"who shall be able to access your service. You may use the "Copy to "
+"Tor to uniquely identify your service. Give this onion address to the people"
+" who shall be able to access your service. You may use the "Copy to "
 "clipboard" button for that to avoid typos. If you have just created a "
 "hidden service, the field says "[Created by Tor]"; in order to make it "
-"display the real onion address, you need to save your configuration and "
-"re-open the settings window."
+"display the real onion address, you need to save your configuration and re-"
+"open the settings window."
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
 msgid ""
-"Virtual Port (required): This is the TCP port that clients will need to know "
-"in order to access your service. Typically, you will want to use the "
+"Virtual Port (required): This is the TCP port that clients will need to know"
+" in order to access your service. Typically, you will want to use the "
 "service-specific port here, e.g. port 80 for HTTP. Note that the virtual "
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
@@ -170,9 +158,9 @@ msgstr ""
 #: en/services.html:95
 msgid ""
 "Enabled: If this checkbox is disabled, Vidalia will not configure the given "
-"hidden service in Tor. This can be useful for keeping the configuration of a "
-"currently unused service for later use. All non-enabled services are stored "
-"in the Vidalia-specific configuration file vidalia.conf."
+"hidden service in Tor. This can be useful for keeping the configuration of a"
+" currently unused service for later use. All non-enabled services are stored"
+" in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
#. type: Content of: <html><body>
@@ -193,8 +181,8 @@ msgstr ""
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
 msgid ""
-"Remove service: Permanently removes a hidden service configuration.  (If you "
-"want to temporarily remove a service, uncheck its Enabled checkbox.)"
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
#. type: Content of: <html><body><p><ul><li>
@@ -222,8 +210,8 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/services.html:122
 msgid ""
-"Tor allows configuration of more specific settings for hidden services, "
-"e.g. forcing to use (or avoiding) certain nodes as introduction points, or "
+"Tor allows configuration of more specific settings for hidden services, e.g."
+" forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
@@ -232,9 +220,9 @@ msgstr ""
 msgid ""
 "However, we decided to simplify things in Vidalia and provide only the most "
 "common settings. If you want to configure advanced settings, you need to do "
-"so in Tor's torrc file. Vidalia will not remove those settings even when you "
-"are editing your hidden services. If you specify more than one virtual port, "
-"only the first will be displayed and be editable."
+"so in Tor's torrc file. Vidalia will not remove those settings even when you"
+" are editing your hidden services. If you specify more than one virtual "
+"port, only the first will be displayed and be editable."
 msgstr ""
#. type: Content of: <html><body>
@@ -255,3 +243,5 @@ msgid ""
 "client application if it's not a web service), and Tor does the rest for "
 "you. There is no need to specifically configure Tor for that."
 msgstr ""
+
+
diff --git a/zu/troubleshooting.po b/zu/troubleshooting.po
index 5214888..abd879f 100644
--- a/zu/troubleshooting.po
+++ b/zu/troubleshooting.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.torproject.org/projects/vidalia.html.
-#   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%5Cn"
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-09-03 13:24+0000\n"
 "Last-Translator: FULL NAME EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE LL@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/troubleshooting.html:16
@@ -48,23 +37,23 @@ msgstr ""
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
 "is looking for your Tor installation in the wrong directory. You can tell "
-"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in "
-"the <a href="config.html#general">general configuration settings</a>."
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href="config.html#general">general configuration settings</a>."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
-"another Tor process running. Check your list of running process and stop the "
-"previous Tor process, if you find one. Then, try running Tor again."
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
-"If that did not help, check your <a href="log.html">message log</a> to see "
-"if Tor printed any information about errors it encountered while trying to "
+"If that did not help, check your <a href="log.html">message log</a> to see"
+" if Tor printed any information about errors it encountered while trying to "
 "start."
 msgstr ""
@@ -80,7 +69,8 @@ msgstr ""
# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
-msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
# type: Content of: <html><body><p>
@@ -98,9 +88,9 @@ msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
 "be unable to connect to Tor. You rarely need to change this setting, but if "
 "there is another service running on your machine that conflicts with Tor's "
-"control port, you will need to specify a different port. You can change this "
-"setting in Vidalia's <a href="config.html#advanced">advanced configuration "
-"settings</a>."
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href="config.html#advanced">advanced "
+"configuration settings</a>."
 msgstr ""
# type: Content of: <html><body>
@@ -144,9 +134,9 @@ msgstr ""
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:89
 msgid ""
-"Vidalia crashed, but left Tor running with the last known random "
-"password. After you restart Vidalia, it generates a new random password, but "
-"Vidalia can't talk to Tor, because the random passwords are different."
+"Vidalia crashed, but left Tor running with the last known random password. "
+"After you restart Vidalia, it generates a new random password, but Vidalia "
+"can't talk to Tor, because the random passwords are different."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -171,11 +161,11 @@ msgstr ""
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
-"as a service through Vidalia, a random password was set and saved in "
-"Tor. When you reboot, Tor starts up and uses the random password it saved.  "
-"You login and start up Vidalia. Vidalia attempts to talk to the already "
-"running Tor. Vidalia generates a random password, but it is different than "
-"the saved password in the Tor service."
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved.  You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
 msgstr ""
# type: Content of: <html><body><ul><li><p>
@@ -183,8 +173,8 @@ msgstr ""
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
-"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22... "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService%5C%22..."
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
# type: Content of: <html><body>
@@ -200,18 +190,17 @@ msgstr ""
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:125
 msgid ""
-"If Tor exits immediately after trying to start, you most likely have another "
-"Tor process already running. Check the <a href="log.html">message log</a> "
-"to see if any of the last few messages in the list are highlighted in yellow "
-"and contain a message similar to the following:"
+"If Tor exits immediately after trying to start, you most likely have another"
+" Tor process already running. Check the <a href="log.html">message log</a>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
 msgstr ""
# type: Content of: <html><body><pre>
 #: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
-"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
-"already in use. \n"
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
 "Is Tor already running?\n"
 msgstr ""
@@ -229,8 +218,8 @@ msgstr ""
 #: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
-"seconds), then you should check the <a href="log.html">message log</a> for "
-"information about any errors Tor experienced before it exited. Such errors "
+"seconds), then you should check the <a href="log.html">message log</a> for"
+" information about any errors Tor experienced before it exited. Such errors "
 "will be highlighted in either red or yellow."
 msgstr ""
@@ -251,3 +240,5 @@ msgid ""
 "href="log.html">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+

    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

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