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

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



commit ee05c262801d92bae2278caf802419d2a1a4e0a7
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Sun Oct 16 10:28:37 2011 +0000

    Update translations for vidalia_help
---
 ar/bridges.po                 |    6 +-
 ar/config.po                  |    8 +-
 ar/index.po                   |   33 ++---
 ar/links.po                   |   16 ++-
 ar/log.po                     |   86 ++++++-------
 ar/netview.po                 |    3 +-
 ar/running.po                 |   60 ++++-----
 ar/server.po                  |  155 +++++++++++------------
 ar/services.po                |  103 +++++++---------
 ar/troubleshooting.po         |  127 +++++++++----------
 ca/index.po                   |   38 +++---
 ca/links.po                   |    4 +
 cy/links.po                   |   31 +++--
 cy/netview.po                 |    1 +
 da/config.po                  |    8 +-
 da/index.po                   |   36 +++---
 da/log.po                     |  130 ++++++++++++-------
 de/bridges.po                 |   90 ++++++++-----
 de/config.po                  |  252 ++++++++++++++++++++++++-------------
 de/index.po                   |   30 ++---
 de/links.po                   |  109 ++++++-----------
 de/log.po                     |  125 ++++++++++++-------
 de/netview.po                 |   58 ++++-----
 de/server.po                  |  220 +++++++++++++++++++-------------
 de/services.po                |   70 +++++------
 de/troubleshooting.po         |  185 +++++++++++++++++++--------
 es/bridges.po                 |    8 +-
 es/config.po                  |  138 +++++++++++---------
 es/links.po                   |    5 +-
 es/netview.po                 |    3 +-
 es/running.po                 |   47 +++----
 es/server.po                  |  155 ++++++++++++++---------
 es/troubleshooting.po         |   82 ++++++-------
 fa/bridges.po                 |   75 +++++------
 fa/config.po                  |  149 +++++++++++------------
 fa/index.po                   |   47 +++----
 fa/log.po                     |  158 +++++++++++------------
 fa/netview.po                 |   80 ++++++-------
 fa/server.po                  |  275 ++++++++++++-----------------------------
 fa/services.po                |  236 ++++++++++++++++-------------------
 fa/troubleshooting.po         |  255 ++++++++++++++++++--------------------
 fr/bridges.po                 |    7 +-
 fr/config.po                  |  144 +++++++++++-----------
 fr/links.po                   |   17 ++-
 fr/log.po                     |  102 ++++++++--------
 fr/netview.po                 |    3 +-
 fr/running.po                 |   68 +++++------
 fr/server.po                  |  190 ++++++++++++++---------------
 fr/services.po                |  118 ++++++++----------
 fr/troubleshooting.po         |  137 ++++++++++-----------
 he/links.po                   |   13 ++-
 hu/config.po                  |   91 +++++++++++++-
 hu/server.po                  |  131 ++++++++++++++++++--
 hu/services.po                |   81 ++++++++++++-
 it/bridges.po                 |    7 +-
 it/config.po                  |  235 +++++++++++++++++++++++++----------
 it/index.po                   |   40 +++---
 it/links.po                   |    6 +-
 it/log.po                     |   73 +++++------
 it/netview.po                 |    3 +-
 it/running.po                 |   47 +++----
 it/server.po                  |   95 +++++++--------
 it/services.po                |   63 ++++------
 it/troubleshooting.po         |   82 ++++++-------
 my/bridges.po                 |    6 +-
 my/config.po                  |  127 +++++++++----------
 my/index.po                   |   25 ++---
 my/links.po                   |    6 +-
 my/log.po                     |   79 ++++++------
 my/netview.po                 |    3 +-
 my/running.po                 |   50 ++++----
 my/server.po                  |  153 +++++++++++------------
 my/services.po                |   82 ++++++-------
 my/troubleshooting.po         |  117 ++++++++---------
 nl/index.po                   |   37 +++----
 nl/links.po                   |   17 ++-
 nl/log.po                     |   75 +++++------
 nl/running.po                 |   76 +++++------
 nl/services.po                |   65 ++++------
 nl/troubleshooting.po         |  185 +++++++++++++++++++--------
 pl/bridges.po                 |    6 +-
 pl/index.po                   |   29 ++---
 pl/links.po                   |    6 +-
 pt_BR/bridges.po              |   81 +++++++------
 ru/bridges.po                 |   10 +-
 ru/config.po                  |  136 ++++++++++-----------
 ru/index.po                   |   36 +++---
 ru/links.po                   |    6 +-
 ru/log.po                     |   86 ++++++-------
 ru/netview.po                 |    3 +-
 ru/running.po                 |   62 ++++-----
 ru/server.po                  |  136 ++++++++++-----------
 ru/services.po                |  114 ++++++++---------
 ru/troubleshooting.po         |  132 +++++++++-----------
 sco/index.po                  |   28 ++---
 templates/bridges.pot         |   87 ++++++++-----
 templates/config.pot          |  221 +++++++++++++++++++++++----------
 templates/index.pot           |   36 +++---
 templates/links.pot           |   48 ++++----
 templates/log.pot             |  125 ++++++++++++-------
 templates/netview.pot         |  135 +++++++++++++-------
 templates/server.pot          |  270 ++++++++++++++++++++++++++++------------
 templates/services.pot        |  168 +++++++++++++++++--------
 templates/troubleshooting.pot |  183 +++++++++++++++++++---------
 tr/config.po                  |   10 +-
 tr/index.po                   |   25 ++---
 tr/links.po                   |    6 +-
 zh_CN/bridges.po              |    7 +-
 zh_CN/index.po                |   33 ++---
 zh_CN/links.po                |    6 +-
 zh_CN/log.po                  |   82 ++++++------
 111 files changed, 4822 insertions(+), 4044 deletions(-)

diff --git a/ar/bridges.po b/ar/bridges.po
index 2dc49ba..7010fea 100644
--- a/ar/bridges.po
+++ b/ar/bridges.po
@@ -1,10 +1,12 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -119,3 +121,5 @@ msgid ""
 msgstr ""
 "تÙ?Ù?Ù?Ù? Ø£Ù?ثر Ù?Ù? عÙ?Ù?اÙ? جسر Ù?احد سÙ?Ù? Ù?جعÙ? اتصاÙ? تÙ?ر اÙ?خاص بÙ? Ø£Ù?ثر استÙ?رارا, Ù?Ù? "
 "حاÙ?Ø© اÙ? بعض اÙ?جسÙ?ر أصبحت غÙ?ر Ù?ابÙ?Ø© Ù?Ù?Ù?صÙ?Ù?."
+
+
diff --git a/ar/config.po b/ar/config.po
index 6823c38..cd9cbef 100644
--- a/ar/config.po
+++ b/ar/config.po
@@ -1,11 +1,13 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-22 16:41+0000\n"
-"Last-Translator: gahgeer <gahgeer@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-04-12 15:33+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -381,3 +383,5 @@ msgstr ""
 "اÙ?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø© تسÙ?Ø­ Ù?Ù? بتÙ?دÙ?Ù? Ø£Ù? Ù?Ù?ع Ù?Ù? اÙ?خدÙ?Ø© عÙ?Ù? أساس برÙ?اÙ?ج اÙ?تعاÙ?Ù? "
 "اÙ?Ù?Ù?Ù? Ø? عÙ?Ù? سبÙ?Ù? اÙ?Ù?ثاÙ? خدÙ?Ø© اÙ?Ù?ص اÙ?Ù?تشعب Ø? Ù?Ù?آخرÙ?Ù? دÙ?Ù? اÙ?Ù?Ø´Ù? عÙ? عÙ?Ù?اÙ? "
 "برÙ?تÙ?Ù?Ù?Ù? اÙ?Ø¥Ù?ترÙ?ت اÙ?خاص بÙ?."
+
+
diff --git a/ar/index.po b/ar/index.po
index 934aa12..bb8d35e 100644
--- a/ar/index.po
+++ b/ar/index.po
@@ -1,30 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-09-02 02:21+0200\n"
-"Last-Translator: shadi <shadi@xxxxxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -61,5 +50,7 @@ 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 ""
-"Ø£Ù?ظر Ù?Ù?ضÙ?ع <a href=\"links.html\">رÙ?ابط Ù?Ù?Ù?دة</a> Ù?Ù?حصÙ?Ù? عÙ?Ù? بعض اÙ?اÙ?اÙ?Ù? اÙ?تÙ? "
-"Ù?Ù?Ù?Ù?Ù? زÙ?ارتÙ?ا Ù?اÙ?عثÙ?ر عÙ?Ù? Ù?ساعدة Ù?Ù?عÙ?Ù?Ù?ات إضاÙ?Ù?Ø© Ø­Ù?Ù? Ù?Ù?داÙ?Ù?ا Ù?تÙ?ر."
+"Ø£Ù?ظر Ù?Ù?ضÙ?ع <a href=\"links.html\">رÙ?ابط Ù?Ù?Ù?دة</a> Ù?Ù?حصÙ?Ù? عÙ?Ù? بعض اÙ?اÙ?اÙ?Ù? "
+"اÙ?تÙ? Ù?Ù?Ù?Ù?Ù? زÙ?ارتÙ?ا Ù?اÙ?عثÙ?ر عÙ?Ù? Ù?ساعدة Ù?Ù?عÙ?Ù?Ù?ات إضاÙ?Ù?Ø© Ø­Ù?Ù? Ù?Ù?داÙ?Ù?ا Ù?تÙ?ر."
+
+
diff --git a/ar/links.po b/ar/links.po
index 74d57e0..fb6ed39 100644
--- a/ar/links.po
+++ b/ar/links.po
@@ -1,11 +1,14 @@
 # 
+# Translators:
+# mohammad Alhargan <malham1@xxxxxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-06-08 16:32+0000\n"
+"Last-Translator: imksa <malham1@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,12 +48,12 @@ msgstr ""
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:31 links.html:58
 msgid "Wiki and Bugtracker"
-msgstr ""
+msgstr "Ù?Ù?Ù?Ù? Ù? Ù?راÙ?ب اÙ?عÙ?Ù?"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:33
 msgid "<a href=\"http://trac.torproject.org/\";> http://trac.torproject.org/</a>"
-msgstr ""
+msgstr "<a href=\"http://trac.torproject.org/\";> http://trac.torproject.org/</a>"
 
 #. type: Content of: <html><body><h3>
 #: links.html:39
@@ -73,8 +76,13 @@ msgid ""
 "<a href=\"https://www.torproject.org/docs/faq.html\";> "
 "https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
+"<a href=\"https://www.torproject.org/docs/faq.html\";> "
+"https://www.torproject.org/docs/faq.html</a>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
+"<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
+
+
diff --git a/ar/log.po b/ar/log.po
index ca4d354..0a7a5a5 100644
--- a/ar/log.po
+++ b/ar/log.po
@@ -1,30 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-02 06:15+0200\n"
-"Last-Translator: shadi <shadi@xxxxxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -34,16 +23,16 @@ 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 ""
 "Ù?سÙ?Ø­ Ù?Ù? سجÙ? اÙ?احداث بÙ?شاÙ?دة Ù?عÙ?Ù?Ù?ات اÙ?حاÙ?Ø© Ø­Ù?Ù? عÙ?Ù?Ù?Ø© تÙ?ر Ù?Ù?د اÙ?تشغÙ?Ù?.  <a "
-"name=\"basic\"/> Ù?Ù? رساÙ?Ø© Ù?دÙ?Ù?ا <i>خطÙ?رة</i> Ù?رتبطة بÙ?ا, تتراÙ?Ø­ Ù?Ù? <b>خطأ</b> "
-"(اÙ?أشد خطÙ?رة) اÙ?Ù? <b>تصحÙ?Ø­</b> (Ù?Ø·Ù?Ù?Ù? Ø£Ù?ثر). Ø£Ù?ظر Ù?سÙ? اÙ?Ù?ساعدة Ù?Ù? <a "
-"href=\"#severities\">خطÙ?رات اÙ?رساÙ?Ø©</a> Ù?Ù?Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات <a "
+"name=\"basic\"/> Ù?Ù? رساÙ?Ø© Ù?دÙ?Ù?ا <i>خطÙ?رة</i> Ù?رتبطة بÙ?ا, تتراÙ?Ø­ Ù?Ù? "
+"<b>خطأ</b> (اÙ?أشد خطÙ?رة) اÙ?Ù? <b>تصحÙ?Ø­</b> (Ù?Ø·Ù?Ù?Ù? Ø£Ù?ثر). Ø£Ù?ظر Ù?سÙ? اÙ?Ù?ساعدة Ù?Ù?"
+" <a href=\"#severities\">خطÙ?رات اÙ?رساÙ?Ø©</a> Ù?Ù?Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات <a "
 "name=\"severities\"/>"
 
 #. type: Content of: <html><body><h3>
@@ -55,17 +44,18 @@ 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>
@@ -82,9 +72,9 @@ 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 ""
 "<b>تحذÙ?ر</b>: اÙ?رسائÙ? اÙ?تÙ? تظÙ?ر عÙ?دÙ?ا Ù?Ù?Ù?Ù? Ù?Ù?اÙ? خطأ Ù?د حدث Ù?ع تÙ?ر, Ù?Ù?Ù?Ù?ا "
 "Ù?Ù?ست Ù?ارثة Ù?سÙ?Ù? Ù?ستÙ?ر تÙ?ر باÙ?تشغÙ?Ù?. سÙ?Ù? تÙ?Ù?Ù? تÙ?Ù? اÙ?رسائÙ? بارزة باÙ?Ù?Ù?Ù? "
@@ -93,8 +83,8 @@ 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 ""
 "<b>Ø¥Ù?ذار</b>: اÙ?رسائÙ? اÙ?تÙ? تظÙ?ر أحÙ?اÙ?ا أثÙ?اء تشغÙ?Ù? تÙ?ر اÙ?عادÙ? Ù?Ù?ا تعد "
 "أخطاءا, Ù?Ù?Ù?Ù? Ù?د Ù?ا تزاÙ? تÙ?Ù?Ù?."
@@ -102,8 +92,8 @@ 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 ""
 "<b>Ù?عÙ?Ù?Ù?ات</b>: اÙ?رسائÙ? اÙ?تÙ? تظÙ?ر Ù?Ø«Ù?را أثÙ?اء تشغÙ?Ù? تÙ?ر اÙ?عادÙ? Ù? Ù?ا تسترعÙ? "
 "عادة Ø¥Ù?تÙ?اÙ? Ù?عظÙ? اÙ?Ù?ستخدÙ?Ù?Ù?."
@@ -112,8 +102,8 @@ msgstr ""
 #: 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 ""
 "<b>تصحÙ?Ø­</b>: اÙ?رسائÙ? اÙ?Ù?Ø·Ù?Ù?Ø© Ù?Ù?غاÙ?Ø© اÙ?تÙ? تÙ?Ù?Ù? Ù?Ù? اÙ?Ù?Ù?اÙ? اÙ?Ø£Ù?Ù? Ù?Ù? اÙ?Ø£Ù?Ù?Ù?Ø© "
 "Ù?Ù?Ù?Ø·Ù?رÙ?Ù?. عÙ?Ù?Ù?ا Ù?Ù?بغÙ? عÙ?Ù?Ù? Ø£Ù? Ù?ا تÙ?Ù?Ù? بتسجÙ?Ù? رسائÙ? اÙ?تصحÙ?Ø­ Ø¥Ù?ا إذا Ù?Ù?ت تعرÙ? "
@@ -130,7 +120,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>
@@ -146,8 +137,8 @@ msgstr "Ø£Ù?Ù?ر عÙ?Ù? <i>اÙ?إعدادات</i> Ù?Ù? اÙ?جزء اÙ?عÙ?Ù?Ù? 
 #. 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 ""
 "ضع عÙ?اÙ?Ø© عÙ?Ù? خطÙ?رات اÙ?رساÙ?Ø© اÙ?تÙ? ترغب Ù?Ù? رؤÙ?تÙ?ا Ù?Ù? Ù?جÙ?Ù?عة تصÙ?Ù?Ø© اÙ?رساÙ?Ø© عÙ?Ù? "
 "اÙ?Ù?سار Ù?أزÙ? اÙ?عÙ?اÙ?Ø© عÙ? خطÙ?رات اÙ?رساÙ?Ø© اÙ?تÙ? ترغب Ù?Ù? إخÙ?ائÙ?ا."
@@ -178,7 +169,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 ""
 "ضع عÙ?اÙ?Ø© Ù?Ù? اÙ?صÙ?دÙ?Ù? اÙ?Ù?سÙ?Ù? <i>Ø­Ù?ظ رسائÙ? اÙ?سجÙ? اÙ?جدÙ?دة Ù?Ù? اÙ?Ù?Ù?Ù? تÙ?Ù?ائÙ?ا</i>."
 
@@ -197,3 +189,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr "Ø£Ù?Ù?ر عÙ?Ù? <i>Ø­Ù?ظ اÙ?إعدادات</i> Ù?Ø­Ù?ظ Ù?جÙ?Ø© اÙ?سجÙ? اÙ?خاص بÙ?."
+
+
diff --git a/ar/netview.po b/ar/netview.po
index d3d4e06..e959593 100644
--- a/ar/netview.po
+++ b/ar/netview.po
@@ -1,11 +1,12 @@
 # 
+# Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
diff --git a/ar/running.po b/ar/running.po
index 9f0cc52..503689a 100644
--- a/ar/running.po
+++ b/ar/running.po
@@ -1,30 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-02 02:11+0200\n"
-"Last-Translator: shadi <shadi@xxxxxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -81,8 +70,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 ""
 "إذا Ù?اÙ? Ù?Ù?داÙ?Ù?ا غÙ?ر Ù?ادر عÙ?Ù? تشغÙ?Ù? تÙ?ر, سÙ?Ù? Ù?Ù?Ù?Ù? Ù?Ù?داÙ?Ù?ا بعرض رساÙ?Ø© خطأ "
 "تخبرÙ? عÙ? اÙ?خطأ اÙ?Ø°Ù? حدث. Ù?Ù?Ù?Ù?Ù? Ø£Ù?ضا Ø¥Ù?Ù?اء Ù?ظرة عÙ?Ù? <a href=\"log.html\">سجÙ? "
@@ -113,8 +102,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 ""
 "إذا Ù?اÙ? Ù?Ù?داÙ?Ù?ا غÙ?ر Ù?ادر عÙ?Ù? Ø¥Ù?Ù?اÙ? تÙ?ر, سÙ?Ù? Ù?Ù?Ù?Ù? Ù?Ù?داÙ?Ù?ا بعرض رساÙ?Ø© خطأ "
 "تخبرÙ? عÙ? اÙ?خطأ اÙ?Ø°Ù? حدث. Ù?Ù?Ù?Ù?Ù? Ø£Ù?ضا Ø¥Ù?Ù?اء Ù?ظرة عÙ?Ù? <a href=\"log.html\">سجÙ? "
@@ -138,13 +127,14 @@ msgid ""
 "system tray or dock area. The following table shows the different states "
 "indicated by an icon in your system's notification area:"
 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 "تÙ? Ø¥Ù?Ù?اÙ? تÙ?ر. إختر <i>بدء</i> Ù?Ù? Ù?ائÙ?Ø© Ù?Ù?داÙ?Ù?ا Ù?بدء تÙ?ر."
 
 #. type: Content of: <html><body><p><table><tr><td>
@@ -159,14 +149,14 @@ 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 ""
-"تÙ?ر Ù?Ù?د اÙ?تشغÙ?Ù?. إذا أردت Ø¥Ù?Ù?اÙ? تÙ?ر, إختر <i>Ø¥Ù?Ù?اÙ?</i> Ù?Ù? Ù?ائÙ?Ø© Ù?Ù?داÙ?Ù?ا. سÙ?Ù? "
-"Ù?صدر تÙ?ر رسائÙ? Ù?عÙ?Ù?Ù?ات اÙ?Ù? <a href=\"log.html\">سجÙ? اÙ?احداث</a> أثÙ?اء تشغÙ?Ù?Ù? "
-"إذا أردت رؤÙ?Ø© Ù?اذا Ù?Ù?عÙ?."
+"تÙ?ر Ù?Ù?د اÙ?تشغÙ?Ù?. إذا أردت Ø¥Ù?Ù?اÙ? تÙ?ر, إختر <i>Ø¥Ù?Ù?اÙ?</i> Ù?Ù? Ù?ائÙ?Ø© Ù?Ù?داÙ?Ù?ا. سÙ?Ù?"
+" Ù?صدر تÙ?ر رسائÙ? Ù?عÙ?Ù?Ù?ات اÙ?Ù? <a href=\"log.html\">سجÙ? اÙ?احداث</a> أثÙ?اء "
+"تشغÙ?Ù?Ù? إذا أردت رؤÙ?Ø© Ù?اذا Ù?Ù?عÙ?."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:92
@@ -177,11 +167,13 @@ 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 ""
 "اذا خرج تÙ?ر بشÙ?Ù? غÙ?ر Ù?تÙ?Ù?ع, سÙ?Ù? Ù?Ù?Ù?Ù? Ù?Ù?داÙ?Ù?ا بتغÙ?Ù?ر Ù?Ù?Ù? Ø£Ù?Ù?Ù?Ù?تÙ? اÙ?Ù? اÙ?Ù?Ù?Ù?Ù? "
 "(بصÙ?Ø©) داÙ?Ù? Ù?ع عÙ?اÙ?Ø© X Ø­Ù?راء اÙ?Ù?Ù?Ù? Ù?إظÙ?ار رساÙ?Ø© خطأ Ù?إعÙ?اÙ?Ù? Ù?ا اÙ?خطأ اÙ?Ø°Ù? "
 "حدث. Ù?Ù?Ù?Ù?Ù? اÙ?تحÙ?Ù? Ø£Ù?ضا Ù?Ù? <a href=\"log.html\">سجÙ? اÙ?احداث</a> Ù?Ù?حصÙ?Ù? عÙ?Ù? "
 "اÙ?Ù?زÙ?د Ù?Ù? اÙ?تÙ?اصÙ?Ù? عÙ? Ø£Ù?Ø© Ù?شاÙ?Ù? Ù?اجÙ?Ù?ا تÙ?ر Ù?بÙ? خرÙ?جÙ?."
+
+
diff --git a/ar/server.po b/ar/server.po
index 24a82a0..96ef3e1 100644
--- a/ar/server.po
+++ b/ar/server.po
@@ -1,30 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-02 19:05+0200\n"
-"Last-Translator: shadi <shadi@xxxxxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -63,8 +52,8 @@ msgid ""
 "tray menu or <i>Preferences</i> from your system menubar on Macintosh "
 "systems."
 msgstr ""
-"Ø¥Ù?تح <i>صÙ?دÙ?Ù? Ø­Ù?ار اÙ?تÙ?Ù?Ù?Ù?</i> عÙ? طرÙ?Ù? إختÙ?ار <i>إعدادات</i> Ù?Ù? Ù?ائÙ?Ø© اÙ?شرÙ?Ø· "
-"Ø£Ù? <i>تÙ?ضÙ?Ù?ات</i> Ù?Ù? شرÙ?Ø· اÙ?Ù?ائÙ?Ø© Ù?Ù?ظاÙ?Ù? اÙ?خاص Ù?Ù? Ø£Ù?ظÙ?Ø© Ù?اÙ?Ù?تÙ?Ø´."
+"Ø¥Ù?تح <i>صÙ?دÙ?Ù? Ø­Ù?ار اÙ?تÙ?Ù?Ù?Ù?</i> عÙ? طرÙ?Ù? إختÙ?ار <i>إعدادات</i> Ù?Ù? Ù?ائÙ?Ø© اÙ?شرÙ?Ø·"
+" Ø£Ù? <i>تÙ?ضÙ?Ù?ات</i> Ù?Ù? شرÙ?Ø· اÙ?Ù?ائÙ?Ø© Ù?Ù?ظاÙ?Ù? اÙ?خاص Ù?Ù? Ø£Ù?ظÙ?Ø© Ù?اÙ?Ù?تÙ?Ø´."
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:35
@@ -78,12 +67,12 @@ 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 ""
 "Ù?رر اذا Ù?Ù?ت ترÙ?د تشغÙ?Ù? Ù?رحÙ?Ù? تÙ?ر عادÙ? Ø£Ù? Ù?رحÙ? <i>جسر</i> (Tor 0.2.0.8-alpha "
-"Ø£Ù? أحدث). Ù?رحÙ?ات اÙ?جسر تساعد Ù?ستخدÙ?Ù? تÙ?ر اÙ?Ù?راÙ?بÙ?Ù? اÙ?Ø°Ù?Ù? Ù?Ù?عÙ?ا Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù? "
-"شبÙ?Ø© تÙ?ر Ù?باشرة.  ضع عÙ?اÙ?Ø© Ù?Ù? اÙ?صÙ?دÙ?Ù? اÙ?Ù?سÙ?Ù?Ù? <i>حرÙ?Ø© Ù?رÙ?ر Ù?رحÙ? Ù?شبÙ?Ø© "
+"Ø£Ù? أحدث). Ù?رحÙ?ات اÙ?جسر تساعد Ù?ستخدÙ?Ù? تÙ?ر اÙ?Ù?راÙ?بÙ?Ù? اÙ?Ø°Ù?Ù? Ù?Ù?عÙ?ا Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù?"
+" شبÙ?Ø© تÙ?ر Ù?باشرة.  ضع عÙ?اÙ?Ø© Ù?Ù? اÙ?صÙ?دÙ?Ù? اÙ?Ù?سÙ?Ù?Ù? <i>حرÙ?Ø© Ù?رÙ?ر Ù?رحÙ? Ù?شبÙ?Ø© "
 "تÙ?ر</i> اذا أردت تشغÙ?Ù? Ù?رحÙ? تÙ?ر عادÙ? Ø£Ù? <i>Ù?ساعدة Ù?ستخدÙ?Ù?Ù? Ù?راÙ?بÙ?Ù? Ù?Ù?Ù?صÙ?Ù? "
 "اÙ?Ù? شبÙ?Ø© تÙ?ر</i> اذا اردت تشغÙ?Ù? Ù?رحÙ?Ù? جسر."
 
@@ -110,15 +99,15 @@ msgid ""
 "and fingerprint."
 msgstr ""
 "<b>Ù?عÙ?Ù?Ù?ات اÙ?اتصاÙ?</b>: عÙ?Ù?اÙ? اÙ?برÙ?د اÙ?اÙ?Ù?ترÙ?Ù?Ù? اÙ?خاص بÙ?. سÙ?Ù? Ù?تÙ? استخداÙ? "
-"Ù?ذا اÙ?عÙ?Ù?اÙ? Ù?Ù?Ø· Ù?Ù?اتصاÙ? بÙ? Ù?Ù? حاÙ? Ù?اÙ? Ù?Ù?اÙ? تحدÙ?Ø« Ø£Ù?Ù?Ù? Ù?Ù?Ù? Ù?تÙ?ر اÙ? حدث خطأ Ù?ا "
-"Ù?تعÙ?Ù? باÙ?Ù?رحÙ?Ù? اÙ?خاص بÙ?. Ù?Ù?Ù?Ù?Ù? اÙ?ضا Ø´Ù?Ù? Ù?Ù?Ù?Ø© Ù?Ù?تاح اÙ?خصÙ?صÙ?Ø© اÙ?جÙ?دة جدا "
+"Ù?ذا اÙ?عÙ?Ù?اÙ? Ù?Ù?Ø· Ù?Ù?اتصاÙ? بÙ? Ù?Ù? حاÙ? Ù?اÙ? Ù?Ù?اÙ? تحدÙ?Ø« Ø£Ù?Ù?Ù? Ù?Ù?Ù? Ù?تÙ?ر اÙ? حدث خطأ Ù?ا"
+" Ù?تعÙ?Ù? باÙ?Ù?رحÙ?Ù? اÙ?خاص بÙ?. Ù?Ù?Ù?Ù?Ù? اÙ?ضا Ø´Ù?Ù? Ù?Ù?Ù?Ø© Ù?Ù?تاح اÙ?خصÙ?صÙ?Ø© اÙ?جÙ?دة جدا "
 "(PGP) Ø£Ù? حارس خصÙ?صÙ?Ø© جÙ?Ù? (GPG) اÙ?خاص بÙ? Ù?اÙ?بصÙ?Ø©."
 
 #. 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 ""
 "<b>Ù?Ù?Ù?Ø° اÙ?Ù?رحÙ?</b>: اÙ?Ù?Ù?Ù?Ø° اÙ?Ø°Ù? Ù?Ù? Ø®Ù?اÙ?Ù? سÙ?Ù? Ù?Ù?Ù?Ù? اÙ?Ù?رحÙ? اÙ?خاص بÙ? باÙ?استÙ?اع "
 "Ù?حرÙ?Ø© اÙ?Ù?رÙ?ر Ù?Ù? اÙ?عÙ?Ù?اء Ø£Ù? غÙ?رÙ? Ù?Ù? Ù?رحÙ?Ù?ات تÙ?ر."
@@ -127,15 +116,15 @@ msgstr ""
 #: 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 ""
 "إذا Ù?Ù?ت ترÙ?د تثبÙ?ت Ù?سخة Ù?طابÙ?Ø© Ù?دÙ?Ù?Ù? تÙ?ر Ù?Ù?Ù?رحÙ?Ù?ات Ù?Ù?آخرÙ?Ù? عÙ?Ù? اÙ?شبÙ?Ø© Ù?Ù?Ù?Ù?Ù? "
-"Ù?ضع عÙ?اÙ?Ø© Ù?Ù? اÙ?صÙ?دÙ?Ù? اÙ?Ù?سÙ?Ù? <i>Ù?سخة Ù?طابÙ?Ø© Ù?دÙ?Ù?Ù? Ù?رحÙ?Ù?</i>.  إذا Ù?Ù? Ù?Ù?Ù? Ù?دÙ?Ù? "
-"اÙ?Ù?Ø«Ù?ر Ù?Ù? عرض اÙ?Ù?طاÙ? اÙ?ترددÙ?Ø? أزÙ? اÙ?عÙ?اÙ?Ø© Ù?Ù? Ù?ذا اÙ?صÙ?دÙ?Ù?. اذا Ù?ررت تثبÙ?ت "
+"Ù?ضع عÙ?اÙ?Ø© Ù?Ù? اÙ?صÙ?دÙ?Ù? اÙ?Ù?سÙ?Ù? <i>Ù?سخة Ù?طابÙ?Ø© Ù?دÙ?Ù?Ù? Ù?رحÙ?Ù?</i>.  إذا Ù?Ù? Ù?Ù?Ù? Ù?دÙ?Ù?"
+" اÙ?Ù?Ø«Ù?ر Ù?Ù? عرض اÙ?Ù?طاÙ? اÙ?ترددÙ?Ø? أزÙ? اÙ?عÙ?اÙ?Ø© Ù?Ù? Ù?ذا اÙ?صÙ?دÙ?Ù?. اذا Ù?ررت تثبÙ?ت "
 "Ù?سخة Ù?طابÙ?Ø© Ù?دÙ?Ù?Ù? اÙ?Ù?رحÙ?Ù?, تأÙ?د بأÙ? <i>Ù?Ù?Ù?Ø° اÙ?دÙ?Ù?Ù?</i> Ù?ختÙ?Ù? عÙ? <i>Ù?Ù?Ù?Ø° "
 "اÙ?Ù?رحÙ?Ù?</i> اÙ?Ø°Ù? ادخÙ?تÙ? Ù?Ù? اÙ?اعÙ?Ù?. Ù?رحÙ?ات اÙ?جسر <i>Ù?جب اÙ? تÙ?Ù?Ù?</i> Ù?سخة "
 "Ù?طابÙ?Ø© Ù?دÙ?Ù?Ù? اÙ?Ù?رحÙ?Ù?."
@@ -155,11 +144,11 @@ 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 ""
-"تشغÙ?Ù? Ù?رحÙ? تÙ?ر Ù?Ù?Ù?Ù? Ø£Ù? Ù?ستÙ?Ù?Ù? Ù?Ù?Ù?Ø© Ù?بÙ?رة Ù?Ù? عرض اÙ?Ù?طاÙ? اÙ?ترددÙ?; Ù?Ù?ع Ø°Ù?Ù?Ø? تÙ?ر "
-"Ù?سÙ?Ø­ Ù?Ù? بتحدÙ?د Ù?Ù?دار عرض اÙ?Ù?طاÙ? اÙ?ترددÙ? اÙ?Ø°Ù? ترÙ?د اÙ? تساÙ?Ù? بÙ? Ù?Ù? شبÙ?Ø© تÙ?ر. "
+"تشغÙ?Ù? Ù?رحÙ? تÙ?ر Ù?Ù?Ù?Ù? Ø£Ù? Ù?ستÙ?Ù?Ù? Ù?Ù?Ù?Ø© Ù?بÙ?رة Ù?Ù? عرض اÙ?Ù?طاÙ? اÙ?ترددÙ?; Ù?Ù?ع Ø°Ù?Ù?Ø? تÙ?ر"
+" Ù?سÙ?Ø­ Ù?Ù? بتحدÙ?د Ù?Ù?دار عرض اÙ?Ù?طاÙ? اÙ?ترددÙ? اÙ?Ø°Ù? ترÙ?د اÙ? تساÙ?Ù? بÙ? Ù?Ù? شبÙ?Ø© تÙ?ر. "
 "Ù?Ù?Ù?Ù?Ù? تشغÙ?Ù? Ù?رحÙ?, Ù?Ù? Ø­Ù?Ù? Ù?ا تزاÙ? تحتÙ?ظ بإتصاÙ? اÙ?شبÙ?Ø© خاصتÙ? اÙ?تÙ? Ù?Ù?Ù?Ù? "
 "استخداÙ?Ù?ا Ù?استخداÙ?Ù? اÙ?خاص."
 
@@ -182,11 +171,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 ""
@@ -203,8 +192,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 ""
@@ -217,16 +206,16 @@ 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>."
 msgstr ""
 "Ù?Ù? اÙ?Ù?Ù?Ù? تذÙ?ر اÙ? تÙ?ر Ù?Ù?Ù?س عرض اÙ?Ù?طاÙ? اÙ?ترددÙ? <b>باÙ?باÙ?تات</b>, Ù?Ù?Ù?س باÙ?بت. "
-"Ø£Ù?ضا, سÙ?Ù? Ù?Ù?Ù?Ù? تÙ?ر باÙ?بحث Ù?Ù?Ø· عÙ? اÙ?باÙ?تات اÙ?Ù?اردة Ù?Ù?Ù?س اÙ?باÙ?تات اÙ?صادرة. عÙ?Ù? "
-"سبÙ?Ù? اÙ?Ù?ثاÙ?, اذا عÙ?Ù? اÙ?Ù?رحÙ?Ù? اÙ?خاص بÙ? Ù?Ù?سخة Ù?طابÙ?Ø© Ù?دÙ?Ù?Ù?, Ù?د تÙ?Ù?Ù? بإرساÙ? "
+"Ø£Ù?ضا, سÙ?Ù? Ù?Ù?Ù?Ù? تÙ?ر باÙ?بحث Ù?Ù?Ø· عÙ? اÙ?باÙ?تات اÙ?Ù?اردة Ù?Ù?Ù?س اÙ?باÙ?تات اÙ?صادرة. عÙ?Ù?"
+" سبÙ?Ù? اÙ?Ù?ثاÙ?, اذا عÙ?Ù? اÙ?Ù?رحÙ?Ù? اÙ?خاص بÙ? Ù?Ù?سخة Ù?طابÙ?Ø© Ù?دÙ?Ù?Ù?, Ù?د تÙ?Ù?Ù? بإرساÙ? "
 "باÙ?تات صادرة Ø£Ù?ثر Ù?Ù? اÙ?Ù?اردة. اذا Ù?جدت اÙ? Ù?Ø°Ù? Ù?Ù? اÙ?حاÙ?Ø© Ù?Ø£Ù?Ù? تضع عبئا Ù?بÙ?را "
 "جدا عÙ?Ù? عرض اÙ?Ù?طاÙ? اÙ?ترددÙ? اÙ?خاص بÙ?, Ù?جب عÙ?Ù?Ù? Ø£Ù? تÙ?ظر بعÙ?Ù? اÙ?اعتباراÙ?Ù?  "
 "إزاÙ?Ø© عÙ?اÙ?Ø© اÙ?تحدÙ?د Ù?Ù? صÙ?دÙ?Ù? اÙ?اختÙ?ار اÙ?Ù?سÙ?Ù? <i>Ù?سخة Ù?طابÙ?Ø© Ù?دÙ?Ù?Ù? Ù?رحÙ?Ù?</i>."
@@ -278,8 +267,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 ""
 "Ù?Ù?تأÙ?د Ù?Ù? اÙ?تÙ?اÙ?Ù?, Ù?عÙ?Ù? اÙ?جدÙ?Ù? اÙ?تاÙ?Ù? عÙ?Ù? سرد أرÙ?اÙ? Ù?Ù?Ù?Ø° Ù?عÙ?Ù? Ù?Ù?Ø«Ù?Ø© Ù?Ù? Ù?Ù? "
 "صÙ?ادÙ?Ù? إختÙ?ار سÙ?اسة اÙ?Ù?خرج. عÙ?Ù?د <b>اÙ?Ù?صÙ?</b> Ù?صÙ? اÙ?Ù?Ù?ارد اÙ?تÙ? سÙ?Ù? Ù?سÙ?Ø­ "
@@ -358,7 +347,8 @@ msgstr "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888"
 
 #. 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 "تطبÙ?Ù?ات اÙ?تراسÙ? اÙ?Ù?Ù?رÙ? Ù?Ø«Ù? MSN Messenger, AIM, ICQ, Ù? Jabber"
 
 #. type: Content of: <html><body><table><tr><td>
@@ -403,8 +393,8 @@ msgid ""
 msgstr ""
 "إذا Ù?Ù?ت Ù?ا ترÙ?د اÙ?سÙ?اح Ù?Ù?ستخدÙ?Ù? تÙ?ر اÙ?آخرÙ?Ù? Ù?Ù? إجراء اتصاÙ?ات خارج شبÙ?Ø© تÙ?ر "
 "Ù?Ù? اÙ?Ù?رحÙ?Ù? اÙ?خاص بÙ?, Ù?Ù?Ù?Ù?Ù? إزاÙ?Ø© اÙ?تحدÙ?د عÙ? جÙ?Ù?ع صÙ?ادÙ?Ù? اÙ?اختÙ?ار. حتÙ? اذا "
-"Ù?Ù?ت  بإزاÙ?Ø© اÙ?تحدÙ?د عÙ? جÙ?Ù?ع صÙ?ادÙ?Ù? اÙ?اختÙ?ار, سÙ?Ù? Ù?بÙ?Ù? اÙ?Ù?رحÙ?Ù? اÙ?خاص بÙ? Ù?Ù?Ù?دا "
-"Ù?شبÙ?Ø© تÙ?ر. سÙ?Ù? Ù?Ù?Ù?Ù? اÙ?Ù?رحÙ?Ù? اÙ?خاص بÙ? باÙ?سÙ?اح Ù?Ù?ستخدÙ?Ù? تÙ?ر اÙ?آخرÙ?Ù? باÙ?اتصاÙ? "
+"Ù?Ù?ت  بإزاÙ?Ø© اÙ?تحدÙ?د عÙ? جÙ?Ù?ع صÙ?ادÙ?Ù? اÙ?اختÙ?ار, سÙ?Ù? Ù?بÙ?Ù? اÙ?Ù?رحÙ?Ù? اÙ?خاص بÙ? Ù?Ù?Ù?دا"
+" Ù?شبÙ?Ø© تÙ?ر. سÙ?Ù? Ù?Ù?Ù?Ù? اÙ?Ù?رحÙ?Ù? اÙ?خاص بÙ? باÙ?سÙ?اح Ù?Ù?ستخدÙ?Ù? تÙ?ر اÙ?آخرÙ?Ù? باÙ?اتصاÙ? "
 "بشبÙ?Ø© تÙ?ر Ù?سÙ?Ù? Ù?ساعد حرÙ?Ø© Ù?رÙ?ر اÙ?Ù?رحÙ?Ù? بÙ?Ù? Ù?رحÙ?Ù?ات تÙ?ر اÙ?أخرÙ?. "
 
 #. type: Content of: <html><body><p>
@@ -415,8 +405,8 @@ msgid ""
 "only used by Tor clients to connect to the Tor network."
 msgstr ""
 "اذا إخترت تشغÙ?Ù? Ù?رحÙ? جسر, Ù?Ø¥Ù? عÙ?اÙ?Ø© <i>سÙ?اسات اÙ?Ù?خرج</i> سÙ?Ù? تصبح رÙ?ادÙ?Ø© "
-"اÙ?Ù?Ù?Ù?, Ø­Ù?Ø« اÙ? Ù?رحÙ?ات اÙ?جسر Ù?ا تسÙ?Ø­ بإتصاÙ?ات اÙ?Ù?خرج. تستخدÙ? اÙ?جسÙ?ر Ù?Ù?Ø· Ù?Ù? Ù?بÙ? "
-"عÙ?Ù?اء تÙ?ر Ù?Ù?اتصاÙ? بشبÙ?Ø© تÙ?ر."
+"اÙ?Ù?Ù?Ù?, Ø­Ù?Ø« اÙ? Ù?رحÙ?ات اÙ?جسر Ù?ا تسÙ?Ø­ بإتصاÙ?ات اÙ?Ù?خرج. تستخدÙ? اÙ?جسÙ?ر Ù?Ù?Ø· Ù?Ù? Ù?بÙ?"
+" عÙ?Ù?اء تÙ?ر Ù?Ù?اتصاÙ? بشبÙ?Ø© تÙ?ر."
 
 #. type: Content of: <html><body>
 #: en/server.html:188
@@ -432,14 +422,14 @@ 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 ""
-"اÙ?عدÙ?د Ù?Ù? اÙ?Ù?ستخدÙ?Ù?Ù? اÙ?Ù?Ù?زÙ?Ù?Ù?Ù? Ù?تصÙ?Ù?Ù? باÙ?Ø¥Ù?ترÙ?ت عبر <i>اÙ?راÙ?تر</i> اÙ?Ø°Ù? Ù?سÙ?Ø­ "
-"Ù?عدة أجÙ?زة Ù?Ù?بÙ?Ù?تر عÙ?Ù? شبÙ?Ø© اÙ?اتصاÙ? اÙ?Ù?Ø­Ù?Ù?Ø© باÙ?Ù?شارÙ?Ø© Ù?Ù? Ù?Ù?س اتصاÙ? "
+"اÙ?عدÙ?د Ù?Ù? اÙ?Ù?ستخدÙ?Ù?Ù? اÙ?Ù?Ù?زÙ?Ù?Ù?Ù? Ù?تصÙ?Ù?Ù? باÙ?Ø¥Ù?ترÙ?ت عبر <i>اÙ?راÙ?تر</i> اÙ?Ø°Ù? Ù?سÙ?Ø­"
+" Ù?عدة أجÙ?زة Ù?Ù?بÙ?Ù?تر عÙ?Ù? شبÙ?Ø© اÙ?اتصاÙ? اÙ?Ù?Ø­Ù?Ù?Ø© باÙ?Ù?شارÙ?Ø© Ù?Ù? Ù?Ù?س اتصاÙ? "
 "اÙ?Ø¥Ù?ترÙ?ت.  بعض اÙ?Ù?ستخدÙ?Ù?Ù? Ù?د Ù?Ù?Ù?Ù?Ù?Ù? Ø£Ù?ضا Ø®Ù?Ù? Ø­Ù?اÙ?Ø© <i>جدار اÙ?Ø­Ù?اÙ?Ø©</i> اÙ?Ø°Ù? "
 "Ù?حظر اÙ?اتصاÙ?ات اÙ?Ù?اردة Ø¥Ù?Ù? جÙ?ازÙ? اÙ?Ù?Ù?بÙ?Ù?تر Ù?Ù? أجÙ?زة اÙ?Ù?Ù?بÙ?Ù?تر اÙ?أخرÙ? عÙ?Ù? "
 "شبÙ?Ø© اÙ?Ø¥Ù?ترÙ?ت.  اذا اردت تشغÙ?Ù? Ù?رحÙ?Ù? تÙ?ر, Ù?ع Ø°Ù?Ù?, Ù?جب اÙ? Ù?Ù?Ù?Ù? Ù?دÙ? عÙ?Ù?اء "
@@ -458,16 +448,16 @@ msgstr ""
 "Ù?جعÙ? اÙ?Ù?رحÙ?Ù? اÙ?خاص بÙ? Ù?ابÙ? Ù?Ù?Ù?صÙ?Ù? Ù?Ù? Ù?بÙ? اÙ?عاÙ?Ø©, Ù?جب عÙ?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? "
 "(اÙ?راÙ?تر) Ø£Ù? جدار اÙ?Ø­Ù?اÙ?Ø© اÙ?خاص بÙ? Ù?عرÙ?Ø© Ø£Ù? اÙ?Ù?Ù?اÙ?Ø° اÙ?تÙ? Ù?سÙ?Ø­ بÙ?ا Ù?Ù? Ø®Ù?اÙ? "
 "جÙ?ازÙ? اÙ?Ù?Ù?بÙ?Ù?تر عÙ? طرÙ?Ù? ضبط Ù?ا Ù?عرÙ? <i>بإعادة تÙ?جÙ?Ù? اÙ?Ù?Ù?Ù?Ø°</i>. إعادة تÙ?جÙ?Ù? "
-"اÙ?Ù?Ù?Ù?Ø° Ù?عÙ?Ù? عÙ?Ù? تÙ?Ù?Ù?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? (اÙ?راÙ?تر) اÙ? جدار اÙ?Ø­Ù?اÙ?Ø© \"Ù?إعادة تÙ?جÙ?Ù?\" "
-"جÙ?Ù?ع اÙ?اتصاÙ?ات Ù?Ù?Ù?اÙ?Ø° Ù?عÙ?Ù?Ø© عÙ?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? (اÙ?راÙ?تر) اÙ? جدار اÙ?Ø­Ù?اÙ?Ø© اÙ?خاص "
-"بÙ? اÙ?Ù? Ù?Ù?اÙ?Ø° Ù?Ø­Ù?Ù?Ø© عÙ?Ù? جÙ?ازÙ? اÙ?Ù?Ù?بÙ?Ù?تر."
+"اÙ?Ù?Ù?Ù?Ø° Ù?عÙ?Ù? عÙ?Ù? تÙ?Ù?Ù?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? (اÙ?راÙ?تر) اÙ? جدار اÙ?Ø­Ù?اÙ?Ø© \"Ù?إعادة "
+"تÙ?جÙ?Ù?\" جÙ?Ù?ع اÙ?اتصاÙ?ات Ù?Ù?Ù?اÙ?Ø° Ù?عÙ?Ù?Ø© عÙ?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? (اÙ?راÙ?تر) اÙ? جدار "
+"اÙ?Ø­Ù?اÙ?Ø© اÙ?خاص بÙ? اÙ?Ù? Ù?Ù?اÙ?Ø° Ù?Ø­Ù?Ù?Ø© عÙ?Ù? جÙ?ازÙ? اÙ?Ù?Ù?بÙ?Ù?تر."
 
 #. type: Content of: <html><body><p>
 #: 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."
@@ -489,25 +479,26 @@ 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/\";>http://192.168.0.1</a> or <a "
-"href=\"http://192.168.1.1/\";>http://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/\";>http://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
 "اذا Ù?جد زر <i>اÙ?إختبار</i> اÙ? Ù?Ù?داÙ?Ù?ا غÙ?ر Ù?ادر عÙ?Ù? ضبط إعادة تÙ?جÙ?Ù? اÙ?Ù?Ù?Ù?Ø° "
-"Ù?Ù?, Ù?د تحتاج Ø¥Ù?Ù? تÙ?Ù?Ù?Ù? Ù?Ø°Ù? اÙ?Ù?Ù?زة عÙ?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? (اÙ?راÙ?تر) اÙ?خاص بÙ? Ø£Ù? ضبط "
-"إعادة تÙ?جÙ?Ù? اÙ?Ù?Ù?Ù?Ø° Ù?دÙ?Ù?ا. بعض أجÙ?زة شبÙ?Ø© اÙ?اتصاÙ? Ù?دÙ?Ù?ا Ù?Ù?زة تدعÙ? "
+"Ù?Ù?, Ù?د تحتاج Ø¥Ù?Ù? تÙ?Ù?Ù?Ù? Ù?Ø°Ù? اÙ?Ù?Ù?زة عÙ?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? (اÙ?راÙ?تر) اÙ?خاص بÙ? Ø£Ù? ضبط"
+" إعادة تÙ?جÙ?Ù? اÙ?Ù?Ù?Ù?Ø° Ù?دÙ?Ù?ا. بعض أجÙ?زة شبÙ?Ø© اÙ?اتصاÙ? Ù?دÙ?Ù?ا Ù?Ù?زة تدعÙ? "
 "<i>Universal Plug-and-Play</i> (UPnP). إذا Ù?اÙ? Ù?Ù?Ù?Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù? Ù?اجÙ?Ø© جÙ?از "
 "اÙ?تÙ?جÙ?Ù? (اÙ?راÙ?تر) اÙ?إدارÙ?, عÙ?Ù?Ù? Ø£Ù? تبحث عÙ? Ø®Ù?ار Ù?تÙ?Ù?Ù?Ù? Ù?Ù?زة (UPnP). اÙ?Ù?اجÙ?Ø© "
 "اÙ?ادارÙ?Ø© Ù?Ù?عظÙ? أجÙ?زة اÙ?تÙ?جÙ?Ù? (اÙ?راÙ?تر) Ù?Ù?Ù?Ù? اÙ?Ù?صÙ?Ù? اÙ?Ù?Ù?ا عÙ? طرÙ?Ù? Ù?تح <a "
 "href=\"http://192.168.0.1/\";>http://192.168.0.1</a> Ø£Ù? <a "
-"href=\"http://192.168.1.1/\";>http://192.168.1.1</a> Ù?Ù? Ù?تصÙ?Ù?Ø­ اÙ?Ù?Ù?ب اÙ?خاص بÙ?. "
-"عÙ?Ù?Ù? اÙ?رجÙ?ع اÙ?Ù? دÙ?Ù?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? (اÙ?راÙ?تر) اÙ?خاص بÙ? Ù?Ù?Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات."
+"href=\"http://192.168.1.1/\";>http://192.168.1.1</a> Ù?Ù? Ù?تصÙ?Ù?Ø­ اÙ?Ù?Ù?ب اÙ?خاص "
+"بÙ?. عÙ?Ù?Ù? اÙ?رجÙ?ع اÙ?Ù? دÙ?Ù?Ù? جÙ?از اÙ?تÙ?جÙ?Ù? (اÙ?راÙ?تر) اÙ?خاص بÙ? Ù?Ù?Ù?زÙ?د Ù?Ù? "
+"اÙ?Ù?عÙ?Ù?Ù?ات."
 
 #. 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\";> "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" 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 "
@@ -515,12 +506,14 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
-"اذا إحتجت اÙ?Ù? ضبط إعادة تÙ?جÙ?Ù? اÙ?Ù?Ù?Ù?Ø° Ù?دÙ?Ù?ا, Ù?Ø¥Ù? اÙ?Ù?Ù?Ù?ع <a href=\"http://www.p";
-"ortforward.com/english/routers/port_forwarding/routerindex.htm\"> "
-"portforward.com</a> Ù?دÙ?Ù? تعÙ?Ù?Ù?ات عÙ? Ù?Ù?Ù?Ù?Ø© ضبط إعادة تÙ?جÙ?Ù? اÙ?Ù?Ù?Ù?Ø° Ù?Ø£Ù?Ù?اع "
+"اذا إحتجت اÙ?Ù? ضبط إعادة تÙ?جÙ?Ù? اÙ?Ù?Ù?Ù?Ø° Ù?دÙ?Ù?ا, Ù?Ø¥Ù? اÙ?Ù?Ù?Ù?ع <a "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" portforward.com</a> Ù?دÙ?Ù? تعÙ?Ù?Ù?ات عÙ? Ù?Ù?Ù?Ù?Ø© ضبط إعادة تÙ?جÙ?Ù? اÙ?Ù?Ù?Ù?Ø° Ù?Ø£Ù?Ù?اع "
 "عدÙ?دة Ù?Ù? أجÙ?زة اÙ?تÙ?جÙ?Ù? (اÙ?راÙ?ترات) Ù?جدراÙ? اÙ?Ø­Ù?اÙ?Ø©. Ù?حد أدÙ?Ù?, سÙ?Ù? تحتاج اÙ?Ù? "
 "إعادة تÙ?جÙ?Ù? <i>Ù?Ù?Ù?Ø° اÙ?Ù?رحÙ?Ù?</i> اÙ?خاص بÙ?, Ù?اÙ?Ø°Ù? اÙ?تراضÙ?اتÙ? اÙ?Ù? اÙ?Ù?Ù?Ù?Ø° 443 "
 "عÙ?Ù? Ù?Ù?Ù?دÙ?ز Ù? 9001 عÙ?Ù? جÙ?Ù?ع Ø£Ù?ظÙ?Ø© اÙ?تشغÙ?Ù? اÙ?أخرÙ?. اذا Ù?Ù?ت اÙ?ضا بتحدÙ?د صÙ?دÙ?Ù? "
 "اÙ?إختÙ?ار اÙ?Ù?سÙ?Ù?Ù? <i>Ù?سخة Ù?طابÙ?Ø© Ù?دÙ?Ù?Ù? اÙ?Ù?رحÙ?Ù?</i>, Ù?Ø¥Ù?Ù? سÙ?Ù? تحتاج اÙ?ضا اÙ?Ù? "
 "إعادة تÙ?جÙ?Ù? <i>Ù?Ù?Ù?Ø° اÙ?دÙ?Ù?Ù?</i> اÙ?خاص بÙ?. Ù?تÙ? ضبط <i>Ù?Ù?Ù?Ø° اÙ?دÙ?Ù?Ù?</i> اÙ?Ù? "
 "اÙ?Ù?Ù?Ù?Ø° 9030 اÙ?تراضÙ?ا عÙ?Ù? جÙ?Ù?ع Ø£Ù?ظÙ?Ø© اÙ?تشغÙ?Ù?."
+
+
diff --git a/ar/services.po b/ar/services.po
index b63f2a8..86fd499 100644
--- a/ar/services.po
+++ b/ar/services.po
@@ -1,30 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-02 19:20+0200\n"
-"Last-Translator: shadi <shadi@xxxxxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -105,15 +94,14 @@ msgid ""
 "Configure your hidden service, so that Tor relays requests coming from Tor "
 "users to your local server."
 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 ""
 "Ù?Ù?اÙ? برÙ?اÙ?ج تعÙ?Ù?Ù?Ù? جÙ?د عÙ?Ù? Ù?Ù?Ù?ع تÙ?ر (https://www.torproject.org/docs/tor-";
 "hidden-service.html) اÙ?Ø°Ù? Ù?صÙ? Ù?Ø°Ù? اÙ?خطÙ?ات بتÙ?صÙ?Ù? Ø£Ù?ثر."
@@ -141,25 +129,25 @@ 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."
@@ -181,12 +169,13 @@ msgid ""
 "specify any target, Tor will redirect requests to the port specified in "
 "\"Virtual Port\" on localhost."
 msgstr ""
-"اÙ?Ù?دÙ? (إختÙ?ارÙ?): عادة, ترÙ?د اÙ? Ù?Ù?Ù?Ù? تÙ?ر بترحÙ?Ù? Ø·Ù?بات اÙ?اتصاÙ? Ù?Ù?Ù?ستضÙ?Ù? اÙ?Ù?Ø­Ù?Ù? "
-"عÙ?Ù? Ù?Ù?Ù?Ø° Ù?ختÙ?Ù? عÙ? اÙ?Ø°Ù? Ù?Ù?ت بتحدÙ?دÙ? Ù?Ù? \"اÙ?Ù?Ù?Ù?Ø° اÙ?ظاÙ?رÙ?\". Ù?Ø°Ù?Ù?Ø? Ù?Ù?Ù?Ù?Ù? تحدÙ?د "
-"Ù?دÙ? Ù?تأÙ?Ù? Ù?Ù? اÙ?عÙ?Ù?اÙ? اÙ?Ù?عÙ?Ù? Ù?اÙ?Ù?Ù?Ù?Ø° اÙ?Ø°Ù? Ù?تÙ? تÙ?جÙ?Ù? اÙ?Ø·Ù?بات Ø¥Ù?Ù? اÙ?خدÙ?Ø© اÙ?Ø®Ù?Ù?Ø© "
-"اÙ?خاصة بÙ? اÙ?Ù?Ù?, عÙ?Ù? سبÙ?Ù? اÙ?Ù?ثاÙ?, اÙ?Ù? اÙ?Ù?ستضÙ?Ù? اÙ?Ù?Ø­Ù?Ù?:5222 (Ø£Ù? عÙ?Ù? Ø£Ù? Ù?Ù?Ù?Ø° "
-"Ù?ستÙ?ع اÙ?Ù?Ù? اÙ?خادÙ? اÙ?خاص بÙ?). اذا Ù?Ù? تÙ?Ù? بتحدÙ?د Ø£Ù? Ù?دÙ?, سÙ?Ù? Ù?Ù?Ù?Ù? تÙ?ر بإعادة "
-"تÙ?جÙ?Ù? اÙ?Ø·Ù?بات اÙ?Ù? اÙ?Ù?Ù?Ù?Ø° اÙ?Ù?حدد Ù?Ù? \"اÙ?Ù?Ù?Ù?Ø° اÙ?ظاÙ?رÙ?\" عÙ?Ù? اÙ?Ù?ستضÙ?Ù? اÙ?Ù?Ø­Ù?Ù?."
+"اÙ?Ù?دÙ? (إختÙ?ارÙ?): عادة, ترÙ?د اÙ? Ù?Ù?Ù?Ù? تÙ?ر بترحÙ?Ù? Ø·Ù?بات اÙ?اتصاÙ? Ù?Ù?Ù?ستضÙ?Ù? اÙ?Ù?Ø­Ù?Ù?"
+" عÙ?Ù? Ù?Ù?Ù?Ø° Ù?ختÙ?Ù? عÙ? اÙ?Ø°Ù? Ù?Ù?ت بتحدÙ?دÙ? Ù?Ù? \"اÙ?Ù?Ù?Ù?Ø° اÙ?ظاÙ?رÙ?\". Ù?Ø°Ù?Ù?Ø? Ù?Ù?Ù?Ù?Ù? تحدÙ?د"
+" Ù?دÙ? Ù?تأÙ?Ù? Ù?Ù? اÙ?عÙ?Ù?اÙ? اÙ?Ù?عÙ?Ù? Ù?اÙ?Ù?Ù?Ù?Ø° اÙ?Ø°Ù? Ù?تÙ? تÙ?جÙ?Ù? اÙ?Ø·Ù?بات Ø¥Ù?Ù? اÙ?خدÙ?Ø© "
+"اÙ?Ø®Ù?Ù?Ø© اÙ?خاصة بÙ? اÙ?Ù?Ù?, عÙ?Ù? سبÙ?Ù? اÙ?Ù?ثاÙ?, اÙ?Ù? اÙ?Ù?ستضÙ?Ù? اÙ?Ù?Ø­Ù?Ù?:5222 (Ø£Ù? عÙ?Ù? Ø£Ù? "
+"Ù?Ù?Ù?Ø° Ù?ستÙ?ع اÙ?Ù?Ù? اÙ?خادÙ? اÙ?خاص بÙ?). اذا Ù?Ù? تÙ?Ù? بتحدÙ?د Ø£Ù? Ù?دÙ?, سÙ?Ù? Ù?Ù?Ù?Ù? تÙ?ر "
+"بإعادة تÙ?جÙ?Ù? اÙ?Ø·Ù?بات اÙ?Ù? اÙ?Ù?Ù?Ù?Ø° اÙ?Ù?حدد Ù?Ù? \"اÙ?Ù?Ù?Ù?Ø° اÙ?ظاÙ?رÙ?\" عÙ?Ù? اÙ?Ù?ستضÙ?Ù? "
+"اÙ?Ù?Ø­Ù?Ù?."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:81
@@ -206,22 +195,22 @@ msgid ""
 msgstr ""
 "دÙ?Ù?Ù? اÙ?خدÙ?Ø© (Ù?Ø·Ù?Ù?ب): Ù?حتاج تÙ?ر Ø¥Ù?Ù? تخزÙ?Ù? بعض Ù?Ù?Ù?ات اÙ?خدÙ?Ø© اÙ?Ø®Ù?Ù?Ø© اÙ?Ù?حددة Ù?Ù? "
 "دÙ?Ù?Ù? Ù?Ù?Ù?صÙ?, عÙ?Ù? سبÙ?Ù? اÙ?Ù?ثاÙ?: Ù?Ù?تاح خاص Ù? Ù?Ù?Ù? إسÙ? Ù?ستضÙ?Ù? Ù?حتÙ?Ù? عÙ?Ù? عÙ?Ù?اÙ? "
-"اÙ?Ù?Ù?Ù?Ù?. Ù?Ù?بغÙ? Ù?Ù?ذا اÙ?دÙ?Ù?Ù? Ø£Ù? Ù?Ù?Ù?Ù? Ù?ختÙ?Ù?ا عÙ? دÙ?Ù?Ù? Ù?حتÙ?Ù? عÙ?Ù? اÙ?Ù?حتÙ?Ù? اÙ?Ø°Ù? Ù?Ù?Ù?ر "
-"اÙ?خدÙ?Ø©. اÙ?Ù?Ù?اÙ? اÙ?Ø£Ù?Ø«Ù? Ù?دÙ?Ù?Ù? اÙ?خدÙ?Ø© Ù?Ù?Ù?Ù? Ø£Ù? Ù?Ù?Ù?Ù? دÙ?Ù?Ù? Ù?رعÙ? Ù?Ù? دÙ?Ù?Ù? بÙ?اÙ?ات "
-"تÙ?ر. -- Ù?احظ Ø£Ù?Ù? Ù?ا Ù?Ù?Ù?Ù?Ù? تغÙ?Ù?ر اÙ?دÙ?Ù?Ù? Ù?خدÙ?Ø© Ù?Ù?د اÙ?تشغÙ?Ù? (Ù?Ù? تÙ?Ù?Ù? Ù?Ù?اÙ? Ù?ائدة "
-"Ù?بÙ?رة Ù?Ù?سÙ?اح Ù?Ù?ذا, Ù?Ø£Ù?Ù? Ù?Ù?س Ù?Ù? اÙ?Ù?Ù?ترض اÙ? Ù?Ù?Ù?Ù? Ú¤Ù?داÙ?Ù?ا بÙ?Ù?Ù? اÙ?دÙ?ائÙ? عÙ?Ù? "
+"اÙ?Ù?Ù?Ù?Ù?. Ù?Ù?بغÙ? Ù?Ù?ذا اÙ?دÙ?Ù?Ù? Ø£Ù? Ù?Ù?Ù?Ù? Ù?ختÙ?Ù?ا عÙ? دÙ?Ù?Ù? Ù?حتÙ?Ù? عÙ?Ù? اÙ?Ù?حتÙ?Ù? اÙ?Ø°Ù? Ù?Ù?Ù?ر"
+" اÙ?خدÙ?Ø©. اÙ?Ù?Ù?اÙ? اÙ?Ø£Ù?Ø«Ù? Ù?دÙ?Ù?Ù? اÙ?خدÙ?Ø© Ù?Ù?Ù?Ù? Ø£Ù? Ù?Ù?Ù?Ù? دÙ?Ù?Ù? Ù?رعÙ? Ù?Ù? دÙ?Ù?Ù? بÙ?اÙ?ات "
+"تÙ?ر. -- Ù?احظ Ø£Ù?Ù? Ù?ا Ù?Ù?Ù?Ù?Ù? تغÙ?Ù?ر اÙ?دÙ?Ù?Ù? Ù?خدÙ?Ø© Ù?Ù?د اÙ?تشغÙ?Ù? (Ù?Ù? تÙ?Ù?Ù? Ù?Ù?اÙ? Ù?ائدة"
+" Ù?بÙ?رة Ù?Ù?سÙ?اح Ù?Ù?ذا, Ù?Ø£Ù?Ù? Ù?Ù?س Ù?Ù? اÙ?Ù?Ù?ترض اÙ? Ù?Ù?Ù?Ù? Ú¤Ù?داÙ?Ù?ا بÙ?Ù?Ù? اÙ?دÙ?ائÙ? عÙ?Ù? "
 "اÙ?Ù?رص اÙ?صÙ?ب اÙ?خاص بÙ?!). اذا اردت Ù?Ù?Ù? خدÙ?Ø© Ø®Ù?Ù?Ø© اÙ?Ù? دÙ?Ù?Ù? آخر, Ù?رجÙ? اÙ?Ù?تابعة "
-"عÙ?Ù? اÙ?Ù?Ø­Ù? اÙ?تاÙ?Ù?: إبدأ عÙ? طرÙ?Ù? تعطÙ?Ù? اÙ?خدÙ?Ø© Ù?Ù? Ù?Ù?داÙ?Ù?ا Ù?Ø­Ù?ظ اÙ?تÙ?Ù?Ù?Ù?. Ø«Ù? Ø£Ù?Ù?Ù? "
-"اÙ?دÙ?Ù?Ù? عÙ?Ù? اÙ?Ù?رص اÙ?صÙ?ب Ø¥Ù?Ù? Ù?Ù?اÙ? جدÙ?د. أخÙ?را, Ù?Ù? بتغÙ?Ù?ر اÙ?دÙ?Ù?Ù? Ù?Ù? Ù?Ù?داÙ?Ù?ا "
+"عÙ?Ù? اÙ?Ù?Ø­Ù? اÙ?تاÙ?Ù?: إبدأ عÙ? طرÙ?Ù? تعطÙ?Ù? اÙ?خدÙ?Ø© Ù?Ù? Ù?Ù?داÙ?Ù?ا Ù?Ø­Ù?ظ اÙ?تÙ?Ù?Ù?Ù?. Ø«Ù? Ø£Ù?Ù?Ù?"
+" اÙ?دÙ?Ù?Ù? عÙ?Ù? اÙ?Ù?رص اÙ?صÙ?ب Ø¥Ù?Ù? Ù?Ù?اÙ? جدÙ?د. أخÙ?را, Ù?Ù? بتغÙ?Ù?ر اÙ?دÙ?Ù?Ù? Ù?Ù? Ù?Ù?داÙ?Ù?ا "
 "Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?ع اÙ?جدÙ?د, Ù?Ù?Ù?Ù? اÙ?خدÙ?Ø© Ù?رة أخرÙ?Ø? Ù?إحÙ?ظ اÙ?تÙ?Ù?Ù?Ù? اÙ?جدÙ?د."
 
 #. type: Content of: <html><body><p><ul><li>
 #: 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 ""
 "Ù?Ù?Ù?Ù?Ù?: إذا Ù?اÙ? صÙ?دÙ?Ù? اÙ?اختÙ?ار Ù?ذا Ù?عطÙ?Ù?اØ? Ù?Ù? Ù?Ù?Ù?Ù? Ù?Ù?داÙ?Ù?ا بتÙ?Ù?Ù?Ù? اÙ?خدÙ?Ø© "
 "اÙ?Ø®Ù?Ù?Ø© اÙ?Ù?عطÙ? Ù?Ù? تÙ?ر. Ù?Ù?Ù?Ù? اÙ? Ù?Ù?Ù?Ù? Ù?ذا Ù?Ù?Ù?دا Ù?Ø­Ù?ظ تÙ?Ù?Ù?Ù? خدÙ?Ø© غÙ?ر Ù?ستخدÙ?Ø© "
@@ -246,8 +235,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 ""
 "إزاÙ?Ø© خدÙ?Ø©: Ù?زÙ?Ù? بشÙ?Ù? دائÙ? تÙ?Ù?Ù?Ù? خدÙ?Ø© Ø®Ù?Ù?Ø©. (إذا Ù?Ù?ت ترÙ?د إزاÙ?Ø© خدÙ?Ø© Ù?ؤÙ?تاØ? "
 "Ù?Ù? بإزاÙ?Ø© اÙ?تحدÙ?د Ù?Ù? صÙ?دÙ?Ù? اختÙ?ار اÙ?تÙ?Ù?Ù?Ù?)."
@@ -258,8 +247,8 @@ msgid ""
 "Copy to clipboard: Copies the onion address to the clipboard, so that you "
 "can tell it to whoever shall be able to use your service."
 msgstr ""
-"اÙ?Ù?سخ اÙ?Ù? اÙ?حاÙ?ظة: Ù?سخ عÙ?Ù?اÙ? اÙ?Ù?Ù?Ù?Ù? Ø¥Ù?Ù? اÙ?حاÙ?ظةØ? بحÙ?Ø« Ù?Ù?Ù?Ù?Ù? اعÙ?اÙ?Ù? Ù?Ù?Ù? سÙ?Ù?Ù?Ù? "
-"Ù?ادرا عÙ?Ù? استخداÙ? اÙ?خدÙ?Ø© اÙ?خاصة بÙ?."
+"اÙ?Ù?سخ اÙ?Ù? اÙ?حاÙ?ظة: Ù?سخ عÙ?Ù?اÙ? اÙ?Ù?Ù?Ù?Ù? Ø¥Ù?Ù? اÙ?حاÙ?ظةØ? بحÙ?Ø« Ù?Ù?Ù?Ù?Ù? اعÙ?اÙ?Ù? Ù?Ù?Ù? سÙ?Ù?Ù?Ù?"
+" Ù?ادرا عÙ?Ù? استخداÙ? اÙ?خدÙ?Ø© اÙ?خاصة بÙ?."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:114
@@ -279,8 +268,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 ""
 "تÙ?ر Ù?سÙ?Ø­ بتÙ?Ù?Ù?Ù? إعدادات Ø£Ù?ثر تحدÙ?دا Ù?خدÙ?ات Ø®Ù?Ù?Ø©Ø? عÙ?Ù? سبÙ?Ù? اÙ?Ù?ثاÙ?: اÙ?إجبار "
@@ -292,9 +281,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 ""
 "Ù?Ù?ع Ø°Ù?Ù?Ø? Ù?ررÙ?ا تبسÙ?Ø· اÙ?Ø£Ù?Ù?ر Ù?Ù? Ù?Ù?داÙ?Ù?ا Ù?تÙ?Ù?Ù?ر اÙ?إعدادات اÙ?Ø£Ù?ثر Ø´Ù?Ù?عا Ù?Ù?Ø·. "
 "اذا أردت تÙ?Ù?Ù?Ù? إعدادات Ù?تÙ?دÙ?Ø©, Ù?Ø£Ù?ت بحاجة Ù?Ù?Ù?Ù?اÙ? بذÙ?Ù? Ù?Ù? Ù?Ù?Ù? تÙ?رÙ? (torrc) "
@@ -324,3 +313,5 @@ msgstr ""
 "خدÙ?Ø© Ø®Ù?Ù?Ø© أخرÙ?, اÙ?تب عÙ?Ù?اÙ? اÙ?Ù?Ù?Ù?Ù? Ù?Ù?خدÙ?Ø© Ù?Ù? اÙ?Ù?تصÙ?Ù?Ø­ اÙ?خاص بÙ? (Ø£Ù? تطبÙ?Ù? "
 "اÙ?عÙ?Ù?Ù? اÙ?Ù?Ù?اسب إذا Ù?Ù? تÙ?Ù? خدÙ?Ø© Ù?Ù?ب), Ù?Ù?Ù?Ù?Ù? تÙ?ر باÙ?بÙ?Ù?Ø© عÙ?Ù?. Ù?Ù?ست Ù?Ù?اÙ? حاجة "
 "Ù?تÙ?Ù?Ù?Ù? تÙ?ر عÙ?Ù? Ù?جÙ? اÙ?تحدÙ?د Ù?Ø°Ù?Ù?. "
+
+
diff --git a/ar/troubleshooting.po b/ar/troubleshooting.po
index d4af559..04b6e5e 100644
--- a/ar/troubleshooting.po
+++ b/ar/troubleshooting.po
@@ -1,30 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: 2010-08-28 15:40+0200\n"
-"Last-Translator: shadi <shadi@xxxxxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 # type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -54,34 +43,35 @@ 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 ""
 "اÙ?سبب اÙ?Ø£Ù?ثر احتÙ?اÙ?ا Ø£Ù? Ù?Ù?داÙ?Ù?ا Ù?ا Ù?ستطÙ?ع تشغÙ?Ù? تÙ?رÙ?Ù? Ù?Ø£Ù? Ù?Ù?داÙ?Ù?ا Ù?بحث عÙ? "
-"تثبÙ?ت تÙ?ر اÙ?خاص بÙ? Ù?Ù? اÙ?دÙ?Ù?Ù? اÙ?خاطئ. Ù?Ù?Ù?Ù?Ù? إخبار Ù?Ù?داÙ?Ù?ا عÙ? Ù?Ù?Ù?ع تÙ?ر عÙ? طرÙ?Ù? "
-"تحدÙ?Ø« Ø®Ù?ار <i>تÙ?ر اÙ?تÙ?Ù?Ù?Ø°Ù?</i> Ù?Ù? <a href=\"config.html#general\">إعدادات "
+"تثبÙ?ت تÙ?ر اÙ?خاص بÙ? Ù?Ù? اÙ?دÙ?Ù?Ù? اÙ?خاطئ. Ù?Ù?Ù?Ù?Ù? إخبار Ù?Ù?داÙ?Ù?ا عÙ? Ù?Ù?Ù?ع تÙ?ر عÙ? طرÙ?Ù?"
+" تحدÙ?Ø« Ø®Ù?ار <i>تÙ?ر اÙ?تÙ?Ù?Ù?Ø°Ù?</i> Ù?Ù? <a href=\"config.html#general\">إعدادات "
 "اÙ?تÙ?Ù?Ù?Ù? اÙ?عاÙ?Ø©</a>."
 
 # 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 ""
-"إذا Ù?Ù? Ù?ساعد Ø°Ù?Ù?, تحÙ?Ù? Ù?Ù? <a href=\"log.html\">سجÙ? اÙ?رساÙ?Ø©</a> اÙ?خاص بÙ? Ù?Ù?عرÙ?Ø© "
-"اذا Ù?اÙ? تÙ?ر بطباعة Ø£Ù?Ø© Ù?عÙ?Ù?Ù?ات Ø­Ù?Ù? اÙ?أخطاء اÙ?تÙ? حصÙ?ت أثÙ?اء Ù?حاÙ?Ù?Ø© اÙ?تشغÙ?Ù?."
+"إذا Ù?Ù? Ù?ساعد Ø°Ù?Ù?, تحÙ?Ù? Ù?Ù? <a href=\"log.html\">سجÙ? اÙ?رساÙ?Ø©</a> اÙ?خاص بÙ? "
+"Ù?Ù?عرÙ?Ø© اذا Ù?اÙ? تÙ?ر بطباعة Ø£Ù?Ø© Ù?عÙ?Ù?Ù?ات Ø­Ù?Ù? اÙ?أخطاء اÙ?تÙ? حصÙ?ت أثÙ?اء Ù?حاÙ?Ù?Ø© "
+"اÙ?تشغÙ?Ù?."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:43
@@ -95,8 +85,10 @@ 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>."
-msgstr "Ù?Ù?Ù?Ù? Ù?Ù?داÙ?Ù?ا بإدارة تÙ?ر عÙ? طرÙ?Ù? اÙ?اتصاÙ? Ù?عÙ? عبر <i>Ù?Ù?Ù?Ø° اÙ?تحÙ?Ù?</i>Ù?تÙ?ر."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgstr ""
+"Ù?Ù?Ù?Ù? Ù?Ù?داÙ?Ù?ا بإدارة تÙ?ر عÙ? طرÙ?Ù? اÙ?اتصاÙ? Ù?عÙ? عبر <i>Ù?Ù?Ù?Ø° اÙ?تحÙ?Ù?</i>Ù?تÙ?ر."
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:49
@@ -117,9 +109,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 ""
 "إذا Ù?اÙ? تÙ?ر Ù?ستÙ?ع عÙ?Ù? Ù?Ù?Ù?Ø° Ù?ختÙ?Ù? عÙ? اÙ?Ø°Ù? تÙ?Ù?Ù?عÙ? Ù?Ù?داÙ?Ù?ا, سÙ?Ù? Ù?Ù?Ù?Ù? Ù?Ù?داÙ?Ù?ا "
 "غÙ?ر Ù?ادر عÙ?Ù? اÙ?اتصاÙ? بتÙ?ر. Ù?ادرا Ù?ا تحتاج Ø¥Ù?Ù? تغÙ?Ù?ر Ù?ذا اÙ?إعداد, Ù?Ù?Ù? إذا "
@@ -171,16 +163,16 @@ msgid ""
 "Tor Browser Bundle. In that case, you'll need to close the old Vidalia and "
 "Tor before you can run this one."
 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 ""
 "Ù?Ø´Ù? Ù?Ù?داÙ?Ù?ا, Ù?Ù?Ù?Ù? ترÙ? تÙ?ر Ù?Ù?د اÙ?تشغÙ?Ù? Ù?ع آخر Ù?Ù?Ù?Ø© Ù?رÙ?ر عشÙ?ائÙ?Ø© Ù?عرÙ?Ù?Ø©. بعد "
 "إعادة تشغÙ?Ù? Ù?Ù?داÙ?Ù?ا, Ù?Ù?Ù?Ù? بتÙ?Ù?Ù?د Ù?Ù?Ù?Ø© Ù?رÙ?ر عشÙ?ائÙ?Ø© جدÙ?دة, Ù?Ù?Ù? Ù?Ù? Ù?تÙ?Ù?Ù? "
@@ -206,8 +198,8 @@ msgid ""
 "restart Tor and all will work again."
 msgstr ""
 "اذا Ù?Ù?ت Ù?ا ترÙ? زر <i>إعادة اÙ?ضبط</i>, Ø£Ù? إذا Ù?اÙ? Ù?Ù?داÙ?Ù?ا غÙ?ر Ù?ادر عÙ?Ù? إعادة "
-"تشغÙ?Ù? تÙ?ر Ù?Ù?, Ù?ا Ù?زاÙ? Ù?Ù?Ù?Ù?Ù? Ø­Ù? اÙ?Ù?Ø´Ù?Ù?Ø© Ù?دÙ?Ù?ا. ببساطة إذÙ?ب Ø¥Ù?Ù? عÙ?Ù?Ù?تÙ? Ø£Ù? Ù?دÙ?ر "
-"اÙ?Ù?Ù?اÙ?, Ù?Ù?Ù? بإÙ?Ù?اء عÙ?Ù?Ù?Ø© تÙ?ر. Ø«Ù? استخدÙ? Ù?Ù?داÙ?Ù?ا Ù?إعادة تشغÙ?Ù? تÙ?ر Ù?سÙ?Ù? Ù?عÙ?Ù? "
+"تشغÙ?Ù? تÙ?ر Ù?Ù?, Ù?ا Ù?زاÙ? Ù?Ù?Ù?Ù?Ù? Ø­Ù? اÙ?Ù?Ø´Ù?Ù?Ø© Ù?دÙ?Ù?ا. ببساطة إذÙ?ب Ø¥Ù?Ù? عÙ?Ù?Ù?تÙ? Ø£Ù? Ù?دÙ?ر"
+" اÙ?Ù?Ù?اÙ?, Ù?Ù?Ù? بإÙ?Ù?اء عÙ?Ù?Ù?Ø© تÙ?ر. Ø«Ù? استخدÙ? Ù?Ù?داÙ?Ù?ا Ù?إعادة تشغÙ?Ù? تÙ?ر Ù?سÙ?Ù? Ù?عÙ?Ù? "
 "اÙ?جÙ?Ù?ع Ù?رة أخرÙ?."
 
 # type: Content of: <html><body><ul><li><p>
@@ -215,11 +207,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 ""
 "Ù?Ù?د Ù?Ù?ت بضبط تÙ?ر سابÙ?ا Ù?Ù?عÙ?Ù? Ù?خدÙ?Ø©. عÙ?د ضبط تÙ?ر Ù?Ù?عÙ?Ù? Ù?خدÙ?Ø©, Ù?بدأ باÙ?تشغÙ?Ù? "
 "عÙ?د تشغÙ?Ù? اÙ?Ù?ظاÙ?. إذا Ù?Ù?ت بتÙ?Ù?Ù?Ù? تÙ?ر Ù?Ù?بدء Ù?خدÙ?Ø© Ù?Ù? Ø®Ù?اÙ? Ù?Ù?داÙ?Ù?ا, Ù?تÙ? ضبط "
@@ -233,12 +225,13 @@ 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\";> "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
 "تحتاج اÙ?Ù? إعادة تÙ?Ù?Ù?Ù? تÙ?ر حتÙ? Ù?ا Ù?Ù?Ù?Ù? خدÙ?Ø©. Ø£Ù?ظر صÙ?حة Ù?Ù?Ù?Ù? (wiki) Ø­Ù?Ù? تشغÙ?Ù? "
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTServ";
-"ice\"> تÙ?ر Ù?خدÙ?Ø©</a> Ù?Ù?Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات Ø­Ù?Ù? Ù?Ù?Ù?Ù?Ø© إزاÙ?Ø© خدÙ?Ø© تÙ?ر."
+"<a "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" تÙ?ر Ù?خدÙ?Ø©</a> Ù?Ù?Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات Ø­Ù?Ù? Ù?Ù?Ù?Ù?Ø© إزاÙ?Ø© خدÙ?Ø© تÙ?ر."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:122
@@ -253,26 +246,24 @@ 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 ""
 "إذا خرج تÙ?ر Ù?باشرة بعد Ù?حاÙ?Ù?Ø© بدء تشغÙ?Ù?, Ù?Ù? اÙ?Ù?رجح Ø£Ù? Ù?Ù?Ù?Ù? Ù?دÙ?Ù? عÙ?Ù?Ù?Ø© تÙ?ر "
-"أخرÙ? Ù?Ù?د اÙ?تشغÙ?Ù?. تحÙ?Ù? Ù?Ù? <a href=\"log.html\">سجÙ? اÙ?رساÙ?Ø©</a>Ù?ترÙ? اذا Ù?اÙ? Ø£Ù? "
-"Ù?Ù? اÙ?رسائÙ? اÙ?Ù?Ù?Ù?Ù?Ø© اÙ?سابÙ?Ø© Ù?Ù? اÙ?Ù?ائÙ?Ø© بارزة باÙ?Ù?Ù?Ù? اÙ?أصÙ?ر Ù?تحتÙ?Ù? عÙ?Ù? رساÙ?Ø© "
-"Ù?شابÙ?Ø© Ù?Ù?تاÙ?Ù?:"
+"أخرÙ? Ù?Ù?د اÙ?تشغÙ?Ù?. تحÙ?Ù? Ù?Ù? <a href=\"log.html\">سجÙ? اÙ?رساÙ?Ø©</a>Ù?ترÙ? اذا Ù?اÙ? "
+"Ø£Ù? Ù?Ù? اÙ?رسائÙ? اÙ?Ù?Ù?Ù?Ù?Ø© اÙ?سابÙ?Ø© Ù?Ù? اÙ?Ù?ائÙ?Ø© بارزة باÙ?Ù?Ù?Ù? اÙ?أصÙ?ر Ù?تحتÙ?Ù? عÙ?Ù? "
+"رساÙ?Ø© Ù?شابÙ?Ø© Ù?Ù?تاÙ?Ù?:"
 
 # 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 ""
-"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"
 
 # type: Content of: <html><body><p>
@@ -293,13 +284,13 @@ 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 ""
 "اذا تÙ? تشغÙ?Ù? تÙ?ر بÙ?جاح Ù?Ù?ترة Ù?صÙ?رة (Ù?Ù?ذا, Ø£Ù?ثر Ù?Ù? بضع Ø«Ù?اÙ?Ù?), عÙ?دÙ?ا Ù?Ù?بغÙ? "
-"عÙ?Ù?Ù? اÙ?تحÙ?Ù? Ù?Ù? <a href=\"log.html\">سجÙ? اÙ?رساÙ?Ø©</a> Ù?Ù?حصÙ?Ù? عÙ?Ù? Ù?عÙ?Ù?Ù?ات Ø­Ù?Ù? Ø£Ù?Ø© "
-"أخطاء إختبرÙ?ا تÙ?ر Ù?بÙ? خرÙ?جÙ?. Ù?Ø«Ù? Ù?Ø°Ù? اÙ?أخطاء سÙ?Ù? تÙ?Ù?Ù? بارزة Ø¥Ù?Ù?ا باÙ?Ù?Ù?Ù? "
+"عÙ?Ù?Ù? اÙ?تحÙ?Ù? Ù?Ù? <a href=\"log.html\">سجÙ? اÙ?رساÙ?Ø©</a> Ù?Ù?حصÙ?Ù? عÙ?Ù? Ù?عÙ?Ù?Ù?ات Ø­Ù?Ù? "
+"Ø£Ù?Ø© أخطاء إختبرÙ?ا تÙ?ر Ù?بÙ? خرÙ?جÙ?. Ù?Ø«Ù? Ù?Ø°Ù? اÙ?أخطاء سÙ?Ù? تÙ?Ù?Ù? بارزة Ø¥Ù?Ù?ا باÙ?Ù?Ù?Ù? "
 "اÙ?أحÙ?ر Ø£Ù? اÙ?أصÙ?ر."
 
 # type: Content of: <html><body>
@@ -322,3 +313,5 @@ msgstr ""
 "اذا Ù?Ù? Ù?ستطع Ù?Ù?داÙ?Ù?ا Ø¥Ù?Ù?اÙ? تÙ?ر, Ù?جب عÙ?Ù?Ù? اÙ?تحÙ?Ù? Ù?Ù? <a href=\"log.html\">سجÙ? "
 "اÙ?رساÙ?Ø©</a> اÙ?خاص بÙ? Ù?Ù?عرÙ?Ø© اذا Ù?اÙ? تÙ?ر أبÙ?غ عÙ? Ø£Ù? أخطاء أثÙ?اء Ù?حاÙ?Ù?تÙ? "
 "اÙ?خرÙ?ج."
+
+
diff --git a/ca/index.po b/ca/index.po
index 45d25be..ec2403a 100644
--- a/ca/index.po
+++ b/ca/index.po
@@ -1,33 +1,24 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# Il_Tifossi <lluita_i_no_dorm@xxxxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-03-22 16:42+0000\n"
+"Last-Translator: Il_Tifossi <lluita_i_no_dorm@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"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/index.html:16
 msgid "Vidalia Help"
-msgstr ""
+msgstr "Ajut de Vidalia"
 
 #. type: Content of: <html><body><p>
 #: en/index.html:20
@@ -35,6 +26,9 @@ 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 ""
+"Seleccioneu el tema de l'ajuda a l'arbre de l'esquerra o feu clic al botó de"
+" cerca sobre la llista de temes per a explorar als temes d'ajuda "
+"disponibles."
 
 #. type: Content of: <html><body><p>
 #: en/index.html:25
@@ -42,11 +36,13 @@ msgid ""
 "You can use the <i>Find</i> button on the toolbar above to search within a "
 "particular help topic."
 msgstr ""
+"Podeu utilitzar el botó de cerca de la barra d'eines superior per a cercar "
+"un tema concret."
 
 #. 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 ""
+msgstr "El botó d'inici us durà a la pàgina inicial."
 
 #. type: Content of: <html><body><p>
 #: en/index.html:34
@@ -54,3 +50,7 @@ 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 ""
+"Vegeu els enllaços d'ajuda per a descobrir on podeu trobar ajut addicional i"
+" informació sobre Vidalia i Tor."
+
+
diff --git a/ca/links.po b/ca/links.po
index c9d047b..3368e8c 100644
--- a/ca/links.po
+++ b/ca/links.po
@@ -1,4 +1,6 @@
 # 
+# Translators:
+# Il_Tifossi <lluita_i_no_dorm@xxxxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
@@ -78,3 +80,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/cy/links.po b/cy/links.po
index 9ffa6a7..379ad73 100644
--- a/cy/links.po
+++ b/cy/links.po
@@ -1,11 +1,13 @@
 # 
+# Translators:
+# cymro <markives@xxxxxxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-05-14 22:22+0000\n"
+"Last-Translator: cymro <markives@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,22 +18,22 @@ msgstr ""
 #. type: Content of: <html><body><h1>
 #: links.html:16
 msgid "Helpful Links"
-msgstr ""
+msgstr "Cysylltiadau Defnyddiol"
 
 #. type: Content of: <html><body><h3>
 #: links.html:19
 msgid "Vidalia"
-msgstr ""
+msgstr "Vidalia"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
-msgstr ""
+msgstr "&nbsp;&nbsp;&nbsp;"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:23 links.html:43
 msgid "Homepage"
-msgstr ""
+msgstr "Hafan"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:25
@@ -39,31 +41,33 @@ msgid ""
 "<a href=\"https://www.torproject.org/vidalia/\";> "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
+"<a href=\"https://www.torproject.org/vidalia/\";> "
+"https://www.torproject.org/vidalia/</a>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:31 links.html:58
 msgid "Wiki and Bugtracker"
-msgstr ""
+msgstr "Wiki a Bugtracker"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:33
 msgid "<a href=\"http://trac.torproject.org/\";> http://trac.torproject.org/</a>"
-msgstr ""
+msgstr "<a href=\"http://trac.torproject.org/\";> http://trac.torproject.org/</a>"
 
 #. type: Content of: <html><body><h3>
 #: links.html:39
 msgid "Tor"
-msgstr ""
+msgstr "Tor"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:45
 msgid "<a href=\"https://www.torproject.org/\";>https://www.torproject.org/</a>"
-msgstr ""
+msgstr "<a href=\"https://www.torproject.org/\";>https://www.torproject.org/</a>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:50
 msgid "FAQ"
-msgstr ""
+msgstr "Cwestiynau Cyffredin"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:52
@@ -71,8 +75,13 @@ msgid ""
 "<a href=\"https://www.torproject.org/docs/faq.html\";> "
 "https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
+"<a href=\"https://www.torproject.org/docs/faq.html\";> "
+"https://www.torproject.org/docs/faq.html</a>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
+"<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
+
+
diff --git a/cy/netview.po b/cy/netview.po
index fe61943..1f3cf4d 100644
--- a/cy/netview.po
+++ b/cy/netview.po
@@ -1,4 +1,5 @@
 # 
+# Translators:
 # cymro <markives@xxxxxxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
diff --git a/da/config.po b/da/config.po
index a44674f..7b6fcc6 100644
--- a/da/config.po
+++ b/da/config.po
@@ -1,11 +1,13 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-22 16:41+0000\n"
-"Last-Translator: aputsiaq <aputtu@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-04-12 15:33+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -315,3 +317,5 @@ 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 ""
+
+
diff --git a/da/index.po b/da/index.po
index 45d25be..96ea6e3 100644
--- a/da/index.po
+++ b/da/index.po
@@ -1,33 +1,24 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# Aputsiaq Janussen <aputtu@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-03-22 16:42+0000\n"
+"Last-Translator: aputsiaq <aputtu@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"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/index.html:16
 msgid "Vidalia Help"
-msgstr ""
+msgstr "Vidalia hjælp"
 
 #. type: Content of: <html><body><p>
 #: en/index.html:20
@@ -35,6 +26,8 @@ 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 ""
+"Vælg et hjælpe-emne fra træet til venstre eller klik på Søgeknappen ovenfor "
+"listen af emner for at gennemsøge alle tilgængelige hjælpe-emner."
 
 #. type: Content of: <html><body><p>
 #: en/index.html:25
@@ -42,11 +35,14 @@ msgid ""
 "You can use the <i>Find</i> button on the toolbar above to search within a "
 "particular help topic."
 msgstr ""
+"Du kan benytte <i>Find</i>-knappen på værktøjsbjælken ovenfor for at søge "
+"inden for et særligt hjælpe-emne."
 
 #. 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 ""
+"Knappen <i>Hjem</i> ovenfor vil bringe dig tilbage til denne startside."
 
 #. type: Content of: <html><body><p>
 #: en/index.html:34
@@ -54,3 +50,7 @@ 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 ""
+"Se emnet <a href=\"links.html\">Nyttige henvisninger</a> for nogle steder du"
+" kan besøge og finde yderligere hjælp og information om Vidalia og Tor."
+
+
diff --git a/da/log.po b/da/log.po
index b5d3761..1823cdc 100644
--- a/da/log.po
+++ b/da/log.po
@@ -1,62 +1,66 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# Aputsiaq Janussen <aputtu@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-03-22 16:43+0000\n"
+"Last-Translator: aputsiaq <aputtu@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"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/log.html:16
 msgid "Message Log"
-msgstr ""
+msgstr "Beskedlog"
 
 #. 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\"/>"
-msgstr ""
+"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 ""
+"Beskedloggen lader dig se statusinformation for en kørende Tor-proces.  <a "
+"name=\"basic\"/> Hver besked har en <i>alvorlighedsgrad</> knyttet til sig, "
+"rangerende fra <b>Fejl</b> (mest alvorlig) til <b>Fejlsøg</b> (mest "
+"detaljerede). Se sektionen med hjælp vedrørende <a "
+"href=\"#severities\">alvorlighedsgrader for beskeder</a> for mere "
+"information.   <a name=\"severities\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/log.html:28
 msgid "Message Severities"
-msgstr ""
+msgstr "Alvorlighedsgrader for beskeder"
 
 #. type: Content of: <html><body><p>
 #: 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 ""
+"En beskeds alvorlighedsgrad fortæller dig hvor vigtig beskeden er. En besked"
+" med højere alvorlighedsgrad indikerer som regel at der er gået noget galt "
+"med Tor. Beskeder med lavere alvorlighedsgrader fremkommer ofte under normal"
+" Tor-anvendelse og behøver som regel ikke at  blive logregistreret."
 
 #. 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 ""
+"De mulige alvorlighedsgrader for beskeder, fra mest alvorlig til mindst "
+"alvorlig, er:"
 
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:41
@@ -65,36 +69,49 @@ msgid ""
 "Tor cannot proceed. These messages will be highlighted in <i>red</i> in the "
 "message log."
 msgstr ""
+"<b>Fejl</b>: Beskeder som fremkommer når noget er gået rigtig galt og hvor "
+"Tor ikke kan fortsætte. Disse beskeder vil blive fremhævet med <i>rødt</i> i"
+" beskedloggen."
 
 #. 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 ""
+"<b>Advarsel</b>: Beskeder som kun fremkommer når noget er gået galt med Tor,"
+" men som ikke er er fatalt og hvor Tor vil fortsætte med at køre. Disse "
+"beskeder vil blive fremhævet med <i>gult</i>."
 
 #. 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 ""
+"<b>Bemærk</b>: Beskeder som fremkommer mindre hyppigt under normal Tor-brug "
+"og som ikke betragtes som fejl, men som du måske stadig er interesseret i."
 
 #. 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 ""
+"<b>Info</b>: Beskeder som fremkommer hyppigt under normal Tor-brug og som "
+"regel ikke har interesse for størstedelen af brugerne."
 
 #. 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 ""
+"<b>Fejlsøg</b>: Ekstremt detaljerede beskeder som udviklere primært har "
+"interesse i. Du bør generelt ikke logge fejlsøgningsbeskeder medmindre du "
+"ved hvad du foretager dig."
 
 #. type: Content of: <html><body><p>
 #: en/log.html:66
@@ -102,43 +119,51 @@ msgid ""
 "Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i> "
 "messages."
 msgstr ""
+"De fleste bruger bør kun logge beskeder af typen <i>Fejl</i>, "
+"<i>Advarsel</i> og <b>Bemærk</i>."
 
 #. 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 ""
+"For at vælge hvilke alvorlighedsgrader for beskeder som du vil se, gør "
+"følgende:"
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:73 en/log.html:92
 msgid "Open the message log from the Vidalia tray menu."
-msgstr ""
+msgstr "Ã?bn beskedloggen fra Vidalia-bakkemenuen."
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:74 en/log.html:93
 msgid "Click on <i>Settings</i> at the top of the message log window."
-msgstr ""
+msgstr "Klik på <i>Indstillinger</i> i toppen af beskedlog-vinduet."
 
 #. 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 ""
+"Markér alvorlighedsgrader for beskeder som du vil se fra Beskedfilter-"
+"gruppen til venstre og fravælg alvorlighedsgrader for beskeder som du ønsker"
+" at skjule."
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:79
 msgid "Click <i>Save Settings</i> to apply your new message filter."
-msgstr ""
+msgstr "Klik <i>Gem indstillinger</i> for at anvende dit nye beskedfilter."
 
 #. type: Content of: <html><body>
 #: en/log.html:84
 msgid "<a name=\"logfile\"/>"
-msgstr ""
+msgstr "<a name=\"logfile\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/log.html:85
 msgid "Logging to a File"
-msgstr ""
+msgstr "Logregistrerer til en fil"
 
 #. type: Content of: <html><body><p>
 #: en/log.html:87
@@ -146,11 +171,15 @@ msgid ""
 "Vidalia can also write log messages to a file, as well as logging them in "
 "the message log window. To enable logging to a file, follow these steps:"
 msgstr ""
+"Vidalia kan også skrive logbeskeder til en fil, samt logge dem i beskedlog-"
+"vinduet. For at aktivere logregistrering til en fil, så følg disse trin:"
 
 #. 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 ""
+"Markér boksen mærket med <i>Gem automatisk nye logbeskeder til en fil</i>."
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:96
@@ -159,8 +188,13 @@ msgid ""
 "either type the path and filename into the text box, or click <i>Browse</i> "
 "to navigate to a location for your log file."
 msgstr ""
+"Hvis du vil den fil som beskederne bliver skrevet til, så kan du enten "
+"indtast stien og filnavnet i tekstboksen, eller klikke <i>Gennemse</i> for "
+"at navigere til en placering for din logfil."
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
-msgstr ""
+msgstr "Klik <i>Gem indstillinger</i> for at gemme din logdestination."
+
+
diff --git a/de/bridges.po b/de/bridges.po
index a3181cb..22900e2 100644
--- a/de/bridges.po
+++ b/de/bridges.po
@@ -1,93 +1,101 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed by
-#   the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified, propagated, or
-#   distributed except according to the terms described in the LICENSE
-#   file.
-# 
-#, fuzzy
+# Translators:
+#   <gregweb@xxxxxx>, 2011.
+# Sacro <Razor30@xxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-06-28 08:06+0000\n"
+"Last-Translator: gregweb <gregweb@xxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/bridges.html:16
 msgid "Bridge Relays"
-msgstr ""
+msgstr "Bridge Relais"
 
 #. type: Content of: <html><body>
 #: en/bridges.html:19
 msgid "<a name=\"about\"/>"
-msgstr ""
+msgstr "<a name=\"Ã?ber\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/bridges.html:20
 msgid "What are bridge relays?"
-msgstr ""
+msgstr "Was sind Bridge Relais?"
 
 #. type: Content of: <html><body><p>
 #: 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 ""
+"Einige Internetdienstanbieter (Provider) versuchen Nutzer davon abzuhalten, "
+"sich mit dem Tor-Netzwerk zu verbinden, indem sie die Verbindung zu "
+"bekannten Tor Relais blocken. Bridge Relais (auch \"Bridges\" genannt, engl."
+" für Brücken), sind Relais, die diesen zensierten Nutzern helfen, Zugang zum"
+" Tor-Netzwerk zu erhalten. Anders als andere Tor-Relais, sind Bridge Relais "
+"nicht im Hauptverzeichnis aufgelistet. Selbst wenn euer Provider alle "
+"bekannten Tor Relais filtert, ist er wahrscheinlich nicht in der Lage alle "
+"Bridges zu blockieren, da es keine vollständige, öffentlich zugängliche, "
+"Liste aller Bridges gibt."
 
 #. type: Content of: <html><body>
 #: en/bridges.html:31
 msgid "<a name=\"finding\"/>"
-msgstr ""
+msgstr "<a name=\"Finden\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/bridges.html:32
 msgid "How do I find a bridge relay?"
-msgstr ""
+msgstr "Wie finde ich ein Bridge Relais"
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:34
 msgid "There are two main ways to learn about a bridge address:"
-msgstr ""
+msgstr "Es gibt zwei Wege Bridge Relais zu finden:"
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/bridges.html:36
 msgid "Get some friends to run private bridges for you"
-msgstr ""
+msgstr "Einige Freunde fragen, ob sie Private Bridges für dich erstellen"
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/bridges.html:37
 msgid "Use some of the public bridges"
-msgstr ""
+msgstr "Einige der Ã?ffentlichen Bridges zu benutzen"
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:42
 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 ""
+"Zur Nutzung privater Bridges, bitte deine Freunde Vidalia und Tor in einem "
+"unzensierten Bereich des Internets auszuführen, und klicke dann auf <i>Help "
+"censored users</i> in Vidalias <a href=\"server.html\">Relay settings "
+"page</a>. Jetzt sollten sie dir die <i>Bridge address</i> unten auf ihrer "
+"Relais Seite Privat zusenden. Anders als ein Ausgangs Relais zu betreiben, "
+"leitet ein Bridge Relais nur Daten von und zum Tor Netzwerk, daher sollte es"
+" Betreiber keinem Missbrauch aussetzen. "
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:52
@@ -101,6 +109,14 @@ msgid ""
 "attacker to learn lots of bridge addresses, you must send this request from "
 "a Gmail account."
 msgstr ""
+"Du kannst Ã?ffentliche Bridge Adressen finden, indem du "
+"<b>https://bridges.torproject.org</b> besuchst. Die Ergebnisse dieser Seite "
+"ändern sich alle paar Tage, daher solltest du, falls du mehr Bridge Adressen"
+" brauchst, die Seite öfters wieder besuchen. Die andere Möglichkeit an "
+"Bridge Adressen zu kommen, ist eine E-Mail an <b>bridges@xxxxxxxxxxxxxx</b> "
+"mit dem Text <b>get bridges</b> zu senden. Allerdings muss diese E-Mail von "
+"einem Gmail account gesendet werden, damit es schwieriger für Angreifer ist,"
+" viele Bridge Adressen herauszufinden."
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:63
@@ -108,3 +124,7 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+"Mehr als eine Bridge Adresse zu benutzen, macht Tor stabiler, sollten andere"
+" Bridges unerreichbar werden."
+
+
diff --git a/de/config.po b/de/config.po
index 645b291..e469bad 100644
--- a/de/config.po
+++ b/de/config.po
@@ -1,29 +1,20 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# Nils  <gibsorter@xxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2010-10-15 09:27+0200\n"
-"Last-Translator: phil <phil@xxxxxxxxxxxxxxxxx>\n"
+"PO-Revision-Date: 2011-03-22 16:45+0000\n"
+"Last-Translator: NilsP <gibsorter@xxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -37,10 +28,10 @@ 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 erm&ouml;glicht es Ihnen die wichtigsten Einstellungen von Vidalia "
-"und Tor zu konfigurieren. Au&szlig;erdem k&ouml;nnen Sie mit Vidalia einen "
-"<a href=\"server.html\">Tor-Server</a> einrichten und betreiben und dadurch "
-"dem Tor-Netzwerk zu weiterem Wachtum verhelfen."
+"Vidalia erm&ouml;glicht es Ihnen die am gebr&auml;chlisten Einstellungen von"
+" Vidalia und Tor vorzunehmen. Au&szlig;erdem k&ouml;nnen Sie mit Vidalia "
+"einen <a href=\"server.html\">Tor-Server</a> einrichten und betreiben und "
+"dadurchdem Tor-Netzwerk zu weiterem Wachtums verhelfen."
 
 #. type: Content of: <html><body>
 #: en/config.html:26
@@ -54,7 +45,8 @@ msgstr "Allgemeine Einstellungen"
 
 #. 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 ""
 "Die Seite <i>Allgemein</i> enth&auml;lt die am meisten gebrauchten "
 "Einstellungen."
@@ -62,16 +54,16 @@ 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 ""
 "<b>Pfad zur Tor-Anwendung</b>: Dies ist die ausf&uuml;hrbare Tor-Datei, die "
 "Vidalia startet, wenn Sie <i>Start</i> aus dem Tray-Men&uuml; "
 "ausw&auml;hlen. Falls Sie mehrere Versionen von Tor installiert haben, "
-"k&ouml;nnen Sie durch Klicken auf die <i>W&auml;hlen</i>-Schaltfl&auml;che "
+"k&ouml;nnen Sie durch Klicken auf die <i>W&auml;hlen</i> Schaltfl&auml;che "
 "die Tor-Version ausw&auml;hlen, die Vidalia benutzen soll."
 
 #. type: Content of: <html><body><ul><li>
@@ -81,10 +73,9 @@ msgid ""
 "automatically start Tor when Vidalia starts. You can also configure Vidalia "
 "to run when your system starts (<i>Windows only</i>)."
 msgstr ""
-"<b>Start-Einstellungen</b>: Durch diese Einstellung wird Tor automatisch "
-"zusammen mit Vidalia gestartet. Sie k&ouml;nnen Vidalia auch so "
-"konfigurieren, dass es beim Systemstart ausge&uuml;hrt wird (<i>nur unter "
-"Windows</i>)."
+"<b>Start Einstellungen</b>: Durch diese Einstellung wird Tor automatisch "
+"zusammen mit Vidalia gestartet. Sie k&ouml;nnen Vidalia auch konfigurieren, "
+"dass es beim Systemstart ausge&uuml;hrt wird (<i>nur unter Windows</i>)."
 
 #. type: Content of: <html><body>
 #: en/config.html:46
@@ -99,10 +90,10 @@ msgstr "Netzwerk Einstellungen"
 #. 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 ""
-"Auf der Seite für <i>Netzwerk</i> Einstellungen, k&ouml;nnen Sie "
+"Auf der Seite f&uuml;r <i>Netzwerk</i> Einstellungen, k&ouml;nnen Sie "
 "beeinflussen wie Tor sich mit dem Tor Netzwerk verbindet. "
 
 #. type: Content of: <html><body><ul><li>
@@ -116,15 +107,15 @@ 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>Ich benutze einen Proxy für meine Internet Verbindung</b>: Wenn  für "
-"Ihren Zugriff aufs Internet ein HTTP Proxy notwendig ist, können sie Tor so "
-"einstellen, dass die Verzeichnissanfragen und die weitergeleiteten "
-"Torverbindungen durch Ihren Proxy geschickt werden. Sie müssen mindestens "
-"die Addresse oder den Hostnamen Ihres Proxys angeben, sowie den Port auf dem "
-"Ihr Proxy auf Verbindungen wartet. Falls Sie sich bei Ihrem Proxy "
-"authentifizieren müssen, k&ouml;nnen sie auch den <i>Benutzernamen</i> und "
-"das <i>Passwort</i> hierfür angeben, anderenfalls können sie diese Felder "
-"leer lassen."
+"<b>Ich benutze einen Proxy f&uuml;r meine Internet Verbindung</b>: Wenn  "
+"f&uuml;r Ihren Zugriff aufs Internet ein HTTP Proxy notwendig ist, "
+"k&ouml;nnen sie Tor so einstellen, dass die Verzeichnissanfragen und die "
+"weitergeleiteten Torverbindungen durch Ihren Proxy geschickt werden. Sie "
+"m&uuml;ssen mindestens die Addresse oder den Hostnamen Ihres Proxys angeben,"
+" sowie den Port auf dem Ihr Proxy auf Verbindungen wartet. Falls Sie sich "
+"bei Ihrem Proxy authentifizieren m&uuml;ssen, k&ouml;nnen sie auch den "
+"<i>Benutzernamen</i> und das <i>Passwort</i> hierf&uuml;r angeben, "
+"anderenfalls k&ouml;nnen sie diese Felder leer lassen."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:62
@@ -133,15 +124,16 @@ 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>Meine Firewall lässt nur Verbindungen auf bestimmten Ports zu</b>: Wenn "
-"eine restriktive Firewall oder ein Proxy, die m&auml;glichen Ports auf denen "
-"sie Verbindungen eröffnen k&ouml;nnen beschr&auml;nkt, k&ouml;nnen Sie Tor "
-"so einstellen, dass nur Verbindungen zu Relays aufgebaut werden, mit denen "
-"Sie sich auch Verbinden k&ouml;nnen. Geben sie einfach die funktionierenden "
-"Ports ein, durch Kommas getrennt. (<i>Beispiel: 80,443,8080 </i>)"
+"<b>Meine Firewall l&auml;sst nur Verbindungen auf bestimmten Ports zu</b>: "
+"Wenn eine restriktive Firewall oder ein Proxy, die m&auml;glichen Ports auf "
+"denen sie Verbindungen er&ouml;ffnen k&ouml;nnen beschr&auml;nkt, "
+"k&ouml;nnen Sie Tor so einstellen, dass nur Verbindungen zu Relays aufgebaut"
+" werden, mit denen Sie sich auch Verbinden k&ouml;nnen. Geben sie einfach "
+"die funktionierenden Ports ein, durch Kommas getrennt. (<i>Beispiel: "
+"80,443,8080 </i>)"
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:69
@@ -150,69 +142,93 @@ 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."
-msgstr ""
+"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>Mein ISP sperrt Verbindungen zum Tor Netzwerk</b>: Wenn Ihr ISP (Internet"
+" Service Provider) Verbindungen zum Tor-Netzwerk sperrt, kann Tor versuchen "
+"die Sperrung zu umgehen, indem es seine Verzeichnisverbindungen "
+"verschl&uuml;sselt und durch nicht &ouml;ffentliche Server, auch "
+"<i>bridges</i> (Tor 0.2.0.3-alpha oder neuer) genannt, eine Verbindung zum "
+"Tor-Netzwerk aufbaut. Bridge Relays sind Server, die nicht im Tor-"
+"Verzeichnis aufgef&uuml;hrt sind. Sie k&ouml;nnen solche Server "
+"hinzuf&uuml;gen, indem Sie eine Adresse und Port oder eine Adresse, Port und"
+" Fingerprint angeben."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:77
 msgid "Below are examples of valid bridge address formats:"
 msgstr ""
+"Nachfolgend finden Sie Beispiele f&uuml;r g&uuml;ltige Adressformate der "
+"Server (bridges):"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:80
 msgid "128.213.48.13:8080"
-msgstr ""
+msgstr "128.213.48.13:8080"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:83
 msgid "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
-msgstr ""
+msgstr "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:86
 msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
-msgstr ""
+msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:89
 msgid ""
 "Even if you do not know any bridge relay addresses, checking this checkbox "
 "may still be helpful. Tor will encrypt its directory requests, which can "
-"defeat blocking mechanisms that try to filter Tor's requests for information "
-"about other relays. If connections to normal Tor relays are also blocked, "
-"then you will need to learn a bridge relay address somehow and add it "
-"here. See the help topic on <a href=\"bridges.html#finding\">finding bridge "
+"defeat blocking mechanisms that try to filter Tor's requests for information"
+" about other relays. If connections to normal Tor relays are also blocked, "
+"then you will need to learn a bridge relay address somehow and add it here. "
+"See the help topic on <a href=\"bridges.html#finding\">finding bridge "
 "relays</a> for more information on how to learn new bridge relay addresses "
 "and fingerprints."
 msgstr ""
+"Gerade wenn Sie &uuml;ber keine Adresse eines Bridge Relays verf&uuml;gen "
+"kann es hilfreich sein diese Einstellung zu aktivieren. Tor wird seine "
+"Verzeichnisanfragen verschl&uuml;sseln, wodurch Sperrmechanismen umgangen "
+"werden k&ouml;nnen, die Tors Anfragen nach Informationen f&uuml;r andere "
+"Relays herausfiltern w&uuml;rden. Wenn Verbindungen zu normalen Tor Servern "
+"ebenfalls gesperrt werden, dann m&uuml;ssen Sie die Adresse eines anderen "
+"Relaysausfindig machen und diese hier eintragen. Sehen Sie dazu den "
+"Hilfeeintrag unter <a href=\"bridges.html#finding\">Einen Relay-Server "
+"finden</a> wie Sie die Adresse eines Relays finden k&ouml;nnen.and "
+"fingerprints."
 
 #. type: Content of: <html><body>
 #: en/config.html:100
 msgid "<a name=\"relay\"/>"
-msgstr ""
+msgstr "<a name=\"relay\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:101
 msgid "Relay Settings"
-msgstr ""
+msgstr "Relay Einstellungen"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:103
 msgid ""
-"<i> See <a href=\"server.html\">this help topic</a> for detailed information "
-"about setting up and managing a Tor relay.  </i>"
+"<i> See <a href=\"server.html\">this help topic</a> for detailed information"
+" about setting up and managing a Tor relay.  </i>"
 msgstr ""
+"<i> Siehe <a href=\"server.html\">Diesen Hilfeeintrag</a> f&uuml;r "
+"detaillierte Informationen &uuml;ber das Einrichten und Verwalten eines Tor-"
+"Servers.  </i>"
 
 #. type: Content of: <html><body>
 #: en/config.html:109
 msgid "<a name=\"appearance\"/>"
-msgstr ""
+msgstr "<a name=\"appearance\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:110
 msgid "Appearance Settings"
-msgstr ""
+msgstr "Design Einstellungen"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:112
@@ -220,17 +236,26 @@ msgid ""
 "The settings on the <i>Appearance</i> page allow you to customize the look "
 "and feel of Vidalia."
 msgstr ""
+"Die Design Einstellungen erlauben Ihnen das Anpassen des Look &amp; Feel von"
+" Vidalia."
 
 #. 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."
-msgstr ""
+"<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>Sprache</b>: Vidalias Benutzeroberfl&auml;che wurde von freiwilligen "
+"Helfern in viele Sprachen &uuml;bersetzt. Wenn Vidalia das erste Mal "
+"startet, versucht es zu ermitteln, welche Sprache ihr Computer benutzt. "
+"Liegt Vidalia damit falsch oder bevorzugen Sie eine andere Sprache, so "
+"k&ouml;nnen Sie aus der Auswahlliste eine andere Sprache ausw&auml;hlen. Sie"
+" m&uuml;ssen Vidalia neu starten, nachdem Sie die Spracheeinstellung "
+"ge&auml;ndert haben."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:124
@@ -239,16 +264,20 @@ msgid ""
 "default interface style. If you dislike the default, you can choose "
 "whichever interface style you prefer from the dropdown box."
 msgstr ""
+"<b>Aussehen</b>: In den meisten F&auml;llen wird Vidalia sein "
+"Erscheinungsbild an das ihres Betriebssystems anpassen. Gef&auml;llt Ihnen "
+"diese Einstellung nicht, so &ouml;nnen Sie eine beliebige aus der "
+"Auswahlliste w&auml;hlen."
 
 #. type: Content of: <html><body>
 #: en/config.html:131
 msgid "<a name=\"advanced\"/>"
-msgstr ""
+msgstr "<a name=\"advanced\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:132
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Fortgeschrittene Einstellungen"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:134
@@ -256,15 +285,22 @@ msgid ""
 "The settings on the <i>Advanced</i> page should generally only be modified "
 "by more experienced users."
 msgstr ""
+"Die Fortgeschrittenen Einstellungen sollten generell nur von erfahrenen "
+"Benutzern ver&auml;ndert werden."
 
 #. 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>Kontroll-Port</b>: Vidalia kommuniziert mit Tor &uuml;ber den <i"
+">Kontroll-Port</i>.Dies braucht nicht ge&auml;ndert zu werden, es sei denn, "
+"es besteht ein Konflikt mit einem anderen Dienst auf ihrem Computer oder "
+"wenn Sie verwenden Vidalia zur Kontrolle und &Uuml;berwachung eines Tor-"
+"Prozesses auf einem anderen Computer."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:144
@@ -273,6 +309,10 @@ msgid ""
 "limit the applications on your machine that can connect to and reconfigure "
 "your Tor installation. The available authentication methods are:"
 msgstr ""
+"<b>Authentifikation</b>: Mittels der Authentifizierung k&ouml;nnen Sie den "
+"Zugriff von Anwendungen, z.B. zum &Auml;ndern der Konfiguration, auf ihre "
+"Tor-Installation beschr&auml;nken. Die folgenden Authentifizierungsmethoden "
+"sind verf&uuml;gbar:"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:150
@@ -281,6 +321,9 @@ msgid ""
 "<b>strongly</b> discouraged. Any application or user on your computer can "
 "reconfigure your Tor installation."
 msgstr ""
+"<b>Keine</b> -- Es wird keine Authentifizierung ben&ouml;tigt. Vom Verwenden"
+" dieser Option wird <b>dringend abgeraten</b>. Jeder Benutzer oder jede "
+"Anwendung kann die Konfiguration ihrer Tor-Installation ver&auml;ndern."
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:155
@@ -288,18 +331,29 @@ 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>Passwort</b> <i>(Standard)</i> -- Ist diese Methode gew&auml;hlt, so "
+"k&ouml;nnen Sie ein Passwort angeben, das bei jedem Zugriff auf den "
+"Kontroll-Port, durch Benutzer oder Anwendungen, abgefragt wird. Wenn Tor von"
+" Vidalia gestartet wird k&ouml;nnen Sie Vidalia dazu veranlassen, bei jedem "
+"Start ein zuf&auml;lliges Passwort zu generieren. Aktivieren Sie dazu "
+"<i>zuf&auml;llig erzeugen</i>."
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:162
 msgid ""
-"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file "
-"(or, <i>cookie</i>) containing random bytes to its data directory when it "
+"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file"
+" (or, <i>cookie</i>) containing random bytes to its data directory when it "
 "starts. Any user or application that tries to connect to Tor's control port "
 "must be able to provide the contents of this cookie."
 msgstr ""
+"<b>Cookie</b> -- Wenn die Authentifizierung durch Cookies gew&auml;hlt ist "
+"wird Tor eine Datei (<i>Cookie</i>) mit zuf&auml;lligem Inhalt in seinem "
+"Datenordner erstellen. Jeder Benutzer oder jede Anwendung, die sich mit dem "
+"Kontroll-Port verbinden m&ouml;chte, muss die Daten dieses Cookies vorweisen"
+" k&ouml;nnen."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:170
@@ -309,6 +363,10 @@ msgid ""
 "file. If you leave this field blank, Tor will uses its own default torrc "
 "location."
 msgstr ""
+"<b>Tor-Konfigurationsdatei</b> <i>(optional)</i>: Sie k&ouml;nnen diese "
+"Option nutzen, wenn Tor mit einer bestimmten Konfigurationsdatei "
+"<i>torrc</i> gestartet werden soll. Wenn Sie dieses Eingabefeld leer lassen "
+"wird Tor eine Konfigurationsdatei aus dem Standardpfad laden."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:175
@@ -318,29 +376,43 @@ 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>Datenverzeichnis</b> <i>(optional)</i>: Sie k&ouml;nnen einen Ordner "
+"angeben, in dem Tor seine Daten, wie tempor&auml;re Informationen &uuml;ber "
+"Server, Schl&uuml;ssel- und Konfigurationsdateien, speichern soll. Wenn Sie "
+"dieses Eingabefeld leer lassen wird Tor den Standardpfad verwenden."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:181
 msgid ""
-"<b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter "
-"a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it "
-"starts.  If you enter a value for <b>Run as Group</b>, Tor will "
+"<b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter"
+" a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it"
+" starts.  If you enter a value for <b>Run as Group</b>, Tor will "
 "<i>setgid</i> to this group when it starts."
 msgstr ""
+"<b>Berechtigungen</b> <i>(optional, nicht verf&uuml;gbar unter Windows)</i>:"
+" Wenn Sie einen Wert f&uuml;r <b>Als Benutzer ausf&uuml;hren</b> angeben, "
+"wird Tor <i>setuid</i> f&uuml;r diesen Benutzer auf den Prozess anwenden. "
+"Wenn Sie einen Wert f&uuml;r <b>Ausf&uuml;hren als Gruppe</b> angeben, wird "
+"Tor <i>setgid</i> f&uuml;r diese Gruppe auf den Prozess anwenden."
 
 #. type: Content of: <html><body>
 #: en/config.html:189
 msgid "<a name=\"services\"/>"
-msgstr ""
+msgstr "<a name=\"services\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:190
 msgid "Hidden Service Settings"
-msgstr ""
+msgstr "Versteckte Dienste Einstellungen"
 
 #. 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 ""
+"Mittels versteckter Dienste k&ouml;nnen Sie jegliche Art von TCP-basierten "
+"Diensten, z.B. einen HTTP-Dienst, f&uuml;r andere anbieten, ohne ihre IP-"
+"Adresse offenlegen zu m&uuml;ssen."
+
+
diff --git a/de/index.po b/de/index.po
index 8c031bf..a9a4b37 100644
--- a/de/index.po
+++ b/de/index.po
@@ -1,27 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-06-26 14:49-0600\n"
-"Last-Translator: Runa Sandvik <runa.sandvik@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -51,8 +43,8 @@ msgstr ""
 #: en/index.html:30
 msgid "The <i>Home</i> button above will bring you back to this home page."
 msgstr ""
-"Die Schaltfl&auml;che <i>Startseite</i> wird Sie zu dieser Seite zur&uuml;ck "
-"f&uuml;hren."
+"Die Schaltfl&auml;che <i>Startseite</i> wird Sie zu dieser Seite zur&uuml;ck"
+" f&uuml;hren."
 
 #. type: Content of: <html><body><p>
 #: en/index.html:34
@@ -62,3 +54,5 @@ msgid ""
 msgstr ""
 "Auf der Seite <a href=\"links.html\">N&uuml;tzliche Links</a> finden Sie "
 "weiterf&uuml;hrende Hilfe und Informationen zu Vidalia und Tor."
+
+
diff --git a/de/links.po b/de/links.po
index 553bffb..64dce55 100644
--- a/de/links.po
+++ b/de/links.po
@@ -1,50 +1,44 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# cosimacosa <leccefv@xxxxxxxxx>, 2011.
+#   <fliegenfalle@xxxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 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-26 14:52-0600\n"
-"Last-Translator: Runa Sandvik <runa.sandvik@xxxxxxxxx>\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
+"POT-Creation-Date: 2011-05-05 20:21+0200\n"
+"PO-Revision-Date: 2011-06-13 10:23+0000\n"
+"Last-Translator: Fliegenfalle <fliegenfalle@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Language: de\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 "N&uuml;tzliche Links"
+msgstr "Nützliche Links"
 
 #. type: Content of: <html><body><h3>
-#: en/links.html:19
+#: links.html:19
 msgid "Vidalia"
 msgstr "Vidalia"
 
 #. 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;"
 
 #. 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 ""
+msgstr "Startseite"
 
 #. type: Content of: <html><body><table><tr><td>
-#: en/links.html:25
+#: links.html:25
 msgid ""
 "<a href=\"https://www.torproject.org/vidalia/\";> "
 "https://www.torproject.org/vidalia/</a>"
@@ -53,71 +47,44 @@ msgstr ""
 "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\";> "
-"http://trac.vidalia-project.net/wiki</a>"
-msgstr ""
-"<a href=\"http://trac.vidalia-project.net/wiki\";> 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 "Fehlerdatenbank"
+#: links.html:31 links.html:58
+msgid "Wiki and Bugtracker"
+msgstr "Wiki und Bugtracker"
 
 #. type: Content of: <html><body><table><tr><td>
-#: en/links.html:41
-msgid ""
-"<a href=\"http://trac.vidalia-project.net/report\";> "
-"http://trac.vidalia-project.net/report</a>"
-msgstr ""
-"<a href=\"http://trac.vidalia-project.net/report\";> http://trac.vidalia-";
-"project.net/report</a>"
+#: links.html:33
+msgid "<a href=\"http://trac.torproject.org/\";> http://trac.torproject.org/</a>"
+msgstr "<a href=\"http://trac.torproject.org/\";>http://trac.torproject.org/</a>"
 
 #. type: Content of: <html><body><h3>
-#: en/links.html:47
+#: links.html:39
 msgid "Tor"
 msgstr "Tor"
 
 #. type: Content of: <html><body><table><tr><td>
-#: en/links.html:53
+#: links.html:45
 msgid "<a href=\"https://www.torproject.org/\";>https://www.torproject.org/</a>"
 msgstr "<a href=\"https://www.torproject.org/\";>https://www.torproject.org/</a>"
 
 #. type: Content of: <html><body><table><tr><td>
-#: en/links.html:58
+#: links.html:50
 msgid "FAQ"
-msgstr "FAQ (H&auml;ufig gestellte Fragen)"
+msgstr "FAQ"
 
 #. 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\";> "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a href=\"https://www.torproject.org/docs/faq.html\";> "
+"https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ\";>  "
-"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>"
+"<a "
+"href=\"https://www.torproject.org/docs/faq.html\";>https://www.torproject.org/docs/";
+" faq.html</a>"
 
 #. type: Content of: <html><body><table><tr><td>
-#: en/links.html:68
-msgid ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\";> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+#: links.html:60
+msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
-"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter\";> "
-"https://wiki.torproject.org/noreply/TheOnionRouter</a>"
+"<a href=\"https://trac.torproject.org/\";>https:// trac.torproject.org/</a>"
+
 
-#. type: Content of: <html><body><table><tr><td>
-#: en/links.html:76
-msgid ""
-"<a href=\"https://bugs.torproject.org/flyspray/\";> "
-"https://bugs.torproject.org/flyspray</a>"
-msgstr ""
-"<a href=\"https://bugs.torproject.org/flyspray/\";> "
-"https://bugs.torproject.org/flyspray</a>"
diff --git a/de/log.po b/de/log.po
index 7e226bc..8a93cd2 100644
--- a/de/log.po
+++ b/de/log.po
@@ -1,62 +1,62 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+#   <5g2kmwj8d5@xxxxxxxxxxxxxxxxx>, 2011.
+#   <lutetia@xxxxxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-06-30 19:50+0000\n"
+"Last-Translator: parla <lutetia@xxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/log.html:16
 msgid "Message Log"
-msgstr ""
+msgstr "Logbuch"
 
 #. 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\"/>"
-msgstr ""
+"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 ""
+"Im Logbuch kannst du Status-Meldungen zu laufenden Prozessen einsehen. <a "
+"name=\"basic\"/> Jeder Eintrag wird eingestuft. Dies reicht von erläuternd, "
+"also wenig wichtig <b>(Debug)</b>, bis hin zu schwerwiegend <b>(Fehler)</b>."
+" Siehe hierzu die Hilfe <a href=\"#Einstufung\">Einstufung von "
+"Nachrichten</a>. <a name=\"Einstufung\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/log.html:28
 msgid "Message Severities"
-msgstr ""
+msgstr "Einstufung von Nachrichten"
 
 #. type: Content of: <html><body><p>
 #: 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 ""
+"Die Einstufung von Logbucheinträgen zeigt an, wie wichtig eine Nachricht für die Funktionalität der Anwendung ist. Je höher die Gewichtung, desto mehr kann man davon ausgehen, dass etwas nicht funktioniert. Die erläuternden \n"
+"Nachrichten erscheinen bei normalem Betrieb am häufigsten und müssen nicht weiter beachtet werden."
 
 #. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
-msgstr ""
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
+msgstr "Die Einstufungen von sehr schwerwiegend bis wenig wichtig:"
 
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:41
@@ -65,36 +65,48 @@ msgid ""
 "Tor cannot proceed. These messages will be highlighted in <i>red</i> in the "
 "message log."
 msgstr ""
+"<b>Fehler</b>: Diese Nachrichten erscheinen, wenn etwas so schief läuft, "
+"dass Tor nicht forfahren kann. Sie sind im Logbuch <i>rot<i> markiert."
 
 #. 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 ""
+"<b>Warnung</b>: Diese Nachrichten erscheinen nur, wenn eine Störung "
+"eintritt, mit der Tor jedoch noch fortfahren kann. Sie sind im Logbuch "
+"<i>gelb<i> markiert."
 
 #. 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 ""
+"<b>Hinweis</b>: Dies sind Nachrichten die unregelmä�ig während des Betriebs "
+"erscheinen und keinen Fehler darstellen, jedoch beachtet werden sollten."
 
 #. 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 ""
+"<b>Info</b>: Einträge die häufig während des Betriebs erscheinen und in der "
+"Regel für die meisten Nutzer nicht von Interesse sind."
 
 #. 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 ""
+"<b>Debug</b>: Eher erläuternde Einträge, die in erster Linie interessant für"
+" Entwickler sind. Man sollte diese Nachrichten nicht weiterverwenden, wenn "
+"man sich nicht über die Auswirkung im Klaren ist."
 
 #. type: Content of: <html><body><p>
 #: en/log.html:66
@@ -102,43 +114,54 @@ msgid ""
 "Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i> "
 "messages."
 msgstr ""
+"Für die meisten Anwender reicht es aus, sich nur um die \n"
+"Nachrichten <i>Fehler</i>, <i>Warnung</i> und <i>Hinweis</i> zu kümmern."
 
 #. 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 ""
+"Um einzustellen welche Nachrichten angezeigt werden soll, verfahre "
+"folgendermaÃ?en:"
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:73 en/log.html:92
 msgid "Open the message log from the Vidalia tray menu."
 msgstr ""
+"Ã?ffne mit dem Vidalia-Symbol aus dem Info-Bereich der Taskliste das Vidalia-"
+"Kontrollpanel und anschlieÃ?end das Logbuch. "
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:74 en/log.html:93
 msgid "Click on <i>Settings</i> at the top of the message log window."
 msgstr ""
+"Klicke in der oberen Menüleiste des Logbuchs auf <i>Einstellungen<i>. "
 
 #. 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 ""
+"Setze im Nachritenfilter links unten Häkchen für Nachrichten die angezeigt "
+"werden sollen, oder entferne diese."
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:79
 msgid "Click <i>Save Settings</i> to apply your new message filter."
 msgstr ""
+"Klicke auf <i>Speichere Einstellungen<i>, um die �nderungen zu übernehmen."
 
 #. type: Content of: <html><body>
 #: en/log.html:84
 msgid "<a name=\"logfile\"/>"
-msgstr ""
+msgstr "<a name=\"logfile\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/log.html:85
 msgid "Logging to a File"
-msgstr ""
+msgstr "Logeinträge speichern"
 
 #. type: Content of: <html><body><p>
 #: en/log.html:87
@@ -146,11 +169,17 @@ msgid ""
 "Vidalia can also write log messages to a file, as well as logging them in "
 "the message log window. To enable logging to a file, follow these steps:"
 msgstr ""
+"So wie die Einträge im Nachrichtenfenster angezeigt werden, kann Vidalia "
+"diese auch in einer Text-Datei speichern. Um dies zu ermöglichen verfahre "
+"folgendermaÃ?en:    "
 
 #. 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 ""
+"Setze im Logbuch für die Option <i>Alle neue Nachrichten automatisch in "
+"einer Datei speichern<i> das Häkchen.  "
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:96
@@ -159,8 +188,14 @@ msgid ""
 "either type the path and filename into the text box, or click <i>Browse</i> "
 "to navigate to a location for your log file."
 msgstr ""
+"Wenn du den Namen oder auch den Pfad der zu verwendenen Datei anpassen "
+"willst, ändere dies im Fenster der Pfadeinstellung. Um zu einem neuen "
+"Verzeichnis zu navigieren klicke auf <i>Ã?ffnen<i>.    "
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+"Klicke auf <i>Einstellungen speichern</i> um die �nderungen zu übernehmen."
+
+
diff --git a/de/netview.po b/de/netview.po
index cabc87b..fff9075 100644
--- a/de/netview.po
+++ b/de/netview.po
@@ -1,27 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-06-26 15:09-0600\n"
-"Last-Translator: Runa Sandvik <runa.sandvik@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -78,13 +70,13 @@ msgstr "Netzwerk-Karte"
 #: 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 ""
 "Die Netzwerk-Karte besteht aus einer Weltkarte, auf der durch rote Punkte "
-"die geographischen Standorte der Server im Tor-Netzwerk gekennzeichnet sind. "
-"Anhand der gr&uuml;nen Linien zwischen den Servern werden die von Ihrem "
+"die geographischen Standorte der Server im Tor-Netzwerk gekennzeichnet sind."
+" Anhand der gr&uuml;nen Linien zwischen den Servern werden die von Ihrem "
 "Tor-Client hergestellten Verbindungen im Tor-Netzwerk gekennzeichnet."
 
 #. type: Content of: <html><body><p>
@@ -116,12 +108,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 ""
 "In der Mitte unterhalb der Netzwerk-Karte finden Sie eine Liste mit Ihren "
@@ -194,8 +186,8 @@ msgstr ""
 #: en/netview.html:110
 msgid "The relay is online and has shown a throughput &gt;= 400 KB/s."
 msgstr ""
-"Der Server ist online und hat einen ermittelten Datendurchsatz von &gt;= 400 "
-"KB/s."
+"Der Server ist online und hat einen ermittelten Datendurchsatz von &gt;= 400"
+" KB/s."
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:116
@@ -224,16 +216,16 @@ msgstr "Server-Details"
 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 ""
 "Die Server-Details auf der rechten Seite des Fensters zeigen weitere "
 "Informationen zu den Servern an, die momentan in der <a href=\\\"#serverlist"
-"\\\">Server-Liste</a> ausgew&auml;hlt wurden. Wenn Sie einen Kanal oder einen "
-"Datenstrom aus der entsprechenden Liste ausgew&auml;hlt haben, werden Ihnen "
-"in detailierte Informationen &uuml;ber jeden Server angezeigt, der Ihren "
-"Datenverkehr weiter leitet."
+"\\\">Server-Liste</a> ausgew&auml;hlt wurden. Wenn Sie einen Kanal oder "
+"einen Datenstrom aus der entsprechenden Liste ausgew&auml;hlt haben, werden "
+"Ihnen in detailierte Informationen &uuml;ber jeden Server angezeigt, der "
+"Ihren Datenverkehr weiter leitet."
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:132
@@ -315,3 +307,5 @@ msgstr "<b>Zuletzt aktualisiert</b>"
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr "Zeitpunkt an dem die Serverinformationen zuletzt aktualisiert wurden."
+
+
diff --git a/de/server.po b/de/server.po
index b5990dc..9159c5c 100644
--- a/de/server.po
+++ b/de/server.po
@@ -1,32 +1,28 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+#   <5g2kmwj8d5@xxxxxxxxxxxxxxxxx>, 2011.
+#   <benni@xxxxxxxxxxxxxxxx>, 2011.
+#   <lutetia@xxxxxxxxxxxx>, 2011.
+#   <ricod1996@xxxxxxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-06-27 08:55-0600\n"
-"Last-Translator: b4ry0n <florianraemisch@xxxxxx>\n"
+"PO-Revision-Date: 2011-08-09 16:08+0000\n"
+"Last-Translator: ricod1996 <ricod1996@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/server.html:16
 msgid "Setting Up a Tor Relay"
-msgstr ""
+msgstr "Einrichten einer Tor-Weiterleitung (Network Relay)"
 
 #. type: Content of: <html><body>
 #: en/server.html:19
@@ -35,10 +31,10 @@ msgid ""
 "of their spare bandwidth by running a Tor relay. Vidalia helps you do your "
 "part by making it easy to set up a relay of your own.  <a name=\"basic\"/>"
 msgstr ""
-"Das Tornetzwerk wurde von Freiwilligen aus aller Welt aufgebaur, die einen "
-"Teil ihrer Bandbreite zur Verfügung stellen, um einen Tor Knoten zu "
-"betreien. Vidalia hilft dir, indem es es dir erleichtert selbst einen Knoten "
-"aufzusetzen."
+"Das Tornetzwerk wird von Freiwilligen aus aller Welt bereit gestellt, die "
+"einen Teil ihrer Bandbreite für Weiterleitungen verfügbar machen. Vidalia "
+"ermöglicht auf einfache Weise eine eigene Weiterleitung einzurichten und "
+"damit einen Beitrag zu leisten."
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:24
@@ -51,8 +47,8 @@ msgid ""
 "If you decide you want to help the Tor network grow by running a relay, you "
 "can follow these steps to get started:"
 msgstr ""
-"Wenn du dich dazu entschlieÃ?t dem Tor Netzwerk beim wachsen zu helfen, dann "
-"befolge einfach diese Schritte um loszulegen:"
+"Wenn du dich dazu entschlieÃ?t zum Wachstum des Tornetzwerkes beizutragen "
+"folge einfach diesen Schritten:"
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:31
@@ -61,14 +57,16 @@ msgid ""
 "tray menu or <i>Preferences</i> from your system menubar on Macintosh "
 "systems."
 msgstr ""
-"Ã?ffne das <i>Konfigurationsfenster</i> durch einen Klick auf <i>Optionen</i> "
-"im Taskmenü oder <i>Einstellungen</i> in der Menüleiste auf Macintosh "
-"Systemen"
+"Mit Rechts-Klick auf das Vidalia-Symbol im Infobereich der Taskleiste wähle "
+"<i>Einstellungen</i> aus oder bei Macintosh-Systemen klicke auf "
+"<i>Einstellungen</i> in der System-Menübar. "
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:35
 msgid "Select the <i>Relay</i> configuration page."
 msgstr ""
+"Wähle in der oberen Symbolleiste des Einstellungsfensters <i>Beteiligung<i>."
+" "
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:37
@@ -77,14 +75,18 @@ 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 ""
+"Es kann eine normale Weiterleitung eingerichtet werden oder (ab Alpha-"
+"Version 0.2.0.8) eine Weiterleitungsbrücke (Bridge Relay). Brücken helfen "
+"Nutzern, die zensiert werden einen direkten Zugang zum Tor-Netzwerk zu "
+"bekommen. Wähle eine der Optionen. "
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:44
 msgid "Enter the following information:"
-msgstr ""
+msgstr "Gebe die folgenden Informationen ein:"
 
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:46
@@ -92,6 +94,8 @@ msgid ""
 "<b>Nickname</b>: The name which your relay will be known as on the Tor "
 "network. An example of a relay nickname is \"MyVidaliaRelay\"."
 msgstr ""
+"<b>Spitzname</b>: Dieser Name erscheint im Tornetzwerk, z.B. "
+"\"MyVidaliaRelay\". Ohne Ã?nderung ist \"Unnamed\" vorgegeben. "
 
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:50
@@ -101,43 +105,59 @@ msgid ""
 "goes wrong with your relay. You might also include your PGP or GPG key ID "
 "and fingerprint."
 msgstr ""
+"<b>Kontakinformation</b>: Deine E-Mailadresse. Diese Adresse wird verwendet,"
+" um dich über wichtige Sicherheitsupdates oder zu Problemen mit der "
+"Weiterleitung zu informieren. Du kannst zusätzlich auch deinen PGP- oder "
+"GPG- ID-Schlüssel und Fingerprint angeben.  "
 
 #. 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 ""
+"<b>Verteiler-Port</b>: Der Port auf dem deine Weiterleitung den Datenverkehr"
+" von Clients oder anderen Weiterleitungen entgegen nimmt."
 
 #. 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."
-msgstr ""
+"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 ""
+"Wenn du das Verzeichnis der Weiterleitungen für andere Netzwerkteilnehmer "
+"spielgeln willst, setze bei dieser Option einen Haken. Falls du nur über "
+"wenig Bandbreite verfügst, kannst du die Spiegelung deaktiviert lassen. Der"
+"  <i>Verzeichnis-Port<i> und der <i>Verteiler-Port<i> dürfen <i>nicht<i> "
+"dieselben sein. Weiterleitungsbrücken erfordern immer die Spiegelung des "
+"Weiterleitungsverzeichnisses."
 
 #. type: Content of: <html><body>
 #: en/server.html:71
 msgid "<a name=\"bandwidth\"/>"
-msgstr ""
+msgstr "<a name=\"Bandbreite\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:72
 msgid "Bandwidth Limits"
-msgstr ""
+msgstr "Bandbreitenbegrenzung"
 
 #. type: Content of: <html><body><p>
 #: en/server.html:74
 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 ""
+"Eine Tor-Weiterleitung zu betreiben kann eine Menge Bandbreite beanspruchen."
+" Jedoch kannst du selbst einstellen wieviel Bandbreite du dem Tor-Netzwerk "
+"zur Verfügung stellen willst. Damit ist es möglich deine Netzwerkverbindung "
+"für deine eigenen Anforderungen nutzbar zu halten."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:80
@@ -146,21 +166,24 @@ msgid ""
 "connection speed. If you select <i>Custom</i>, you will be able to specify "
 "your own limits."
 msgstr ""
+"Im Register Bandbreitenbegrenzung findest du im Dropdown-Menü Vorgaben zu "
+"möglichen Verbindungsgeschwindigkeiten. Wenn du <i>Benutzerdefiniert<i> "
+"wählst, kannst du die Begrenzung individuell einstellen. "
 
 #. type: Content of: <html><body><h4>
 #: en/server.html:84
 msgid "Custom Limits"
-msgstr ""
+msgstr "Benutzerdefinierte Begrenzung"
 
 #. type: Content of: <html><body><p>
 #: 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 ""
@@ -169,8 +192,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 ""
@@ -178,9 +201,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>."
@@ -189,12 +212,12 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/server.html:111
 msgid "<a name=\"exitpolicy\"/>"
-msgstr ""
+msgstr "<a name=\"exitpolicy\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:112
 msgid "Exit Policies"
-msgstr ""
+msgstr "Exti-Regeln"
 
 #. type: Content of: <html><body><p>
 #: en/server.html:114
@@ -222,114 +245,121 @@ 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 ""
+"Zur Vollständigkeit, listet die folgende Tabelle die spezifischen Port-"
+"Nummern von den einzelnen Exit-Regel-Checkboxen auf. Die Spalte "
+"<b>Beschreibung</b> beschreibt die Ressourcen, die Tor-Clients nutzen "
+"dürfen, um durch deine Weiterleitung eine Verbindung aufzubauen, wenn die "
+"zugehörige Checkbox aktiviert ist."
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:138
 msgid "<b>Checkbox</b>"
-msgstr ""
+msgstr "<b>Checkbox</b>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:139
 msgid "<b>Ports</b>"
-msgstr ""
+msgstr "<b>Ports</b>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:140
 msgid "<b>Description</b>"
-msgstr ""
+msgstr "<b>Beschreibung</b>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:143
 msgid "Websites"
-msgstr ""
+msgstr "Webseiten"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:144
 msgid "80"
-msgstr ""
+msgstr "80"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:145
 msgid "Normal, unencrypted Web browsing"
-msgstr ""
+msgstr "Normal, unverschlüsseltes Web-Browsing"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:148
 msgid "Secure Websites (SSL)"
-msgstr ""
+msgstr "Sichere Websites (SSL)"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:149
 msgid "443"
-msgstr ""
+msgstr "443"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:150
 msgid "Encrypted Web browsing"
-msgstr ""
+msgstr "Verschlüsseltes Web-Browsing"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:153
 msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
+msgstr "E-Mail abrufen (POP, IMAP)"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:154
 msgid "110, 143, 993, 995"
-msgstr ""
+msgstr "110, 143, 993, 995"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:155
 msgid "Downloading email (does not permit sending email)"
-msgstr ""
+msgstr "Herunterladen von E-Mails (das Senden von E-Mails ist nicht erlaubt)"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:158
 msgid "Instant Messaging (IM)"
-msgstr ""
+msgstr "Instant Messaging (IM)"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:159
 msgid "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888"
-msgstr ""
+msgstr "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
-msgstr ""
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgstr "Sofortnachrichtendienste wie MSN Messenger, AIM, ICQ und Jabber."
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:163
 msgid "Internet Relay Chat (IRC)"
-msgstr ""
+msgstr "Internet Relay Chat (IRC)"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:164
 msgid "6660-6669, 6697, 7000-7001"
-msgstr ""
+msgstr "6660-6669, 6697, 7000-7001"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:165
 msgid "IRC clients and servers"
-msgstr ""
+msgstr "IRC-Clients und -Server"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:168
 msgid "Misc. Other Services"
-msgstr ""
+msgstr "Verschiedenes. Andere Dienste"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:169
 msgid "*"
-msgstr ""
+msgstr "*"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:170
 msgid "All other applications that aren't covered by the previous checkboxes"
 msgstr ""
+"All Anwendungen, die nicht durch die vorherigen Punkte gedeckt wurden."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:175
@@ -340,6 +370,12 @@ msgid ""
 "network.  Your relay will allow other Tor users to connect to the Tor "
 "network and will help relay traffic between other Tor relays."
 msgstr ""
+"Wenn du nicht willst, dass andere Tor-Nutzer eine Verbindung zum Internet "
+"über deine Weiterleitung aufnehmen, kannst du alle Checkboxen deaktivieren. "
+"Selbst wenn du alle deaktivierst, ist deine Weiterleitung für andere Nutzer "
+"nützlich. Deine Weiterleitung ermöglicht dann anderen Nutzern, sich zum "
+"Netzwerk von Tor zu verbinden und hilft bei der Weiterleitung von Traffic "
+"auf andere Tor-Brücken."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:182
@@ -348,26 +384,30 @@ msgid ""
 "grayed out, since bridge relays do not allow exit connections. Bridges are "
 "only used by Tor clients to connect to the Tor network."
 msgstr ""
+"Wenn du eine Brücken-Weiterleitung betreiben willst, wird der Tab <i>Exit-"
+"Regeln</i> ausgeblendet werden, da diese Verbindungen keine Exit-"
+"Verbindungen zulassen. Brücken werden nur von Tor-Clients verwendet, um sich"
+" zum Tor-Netzwerk zu verbinden."
 
 #. type: Content of: <html><body>
 #: en/server.html:188
 msgid "<a name=\"upnp\"/>"
-msgstr ""
+msgstr "<a name=\"upnp\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:189
 msgid "Port Forwarding"
-msgstr ""
+msgstr "Port Weiterleitung"
 
 #. type: Content of: <html><body><p>
 #: 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>
@@ -384,8 +424,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."
@@ -401,16 +441,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/\";>http://192.168.0.1</a> or <a "
-"href=\"http://192.168.1.1/\";>http://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/\";>http://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\";> "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" 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 "
@@ -418,3 +458,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/de/services.po b/de/services.po
index 115e970..134488c 100644
--- a/de/services.po
+++ b/de/services.po
@@ -1,32 +1,25 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# bastik <bastik.tor@xxxxxxxxxxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-06-28 10:09-0600\n"
-"Last-Translator: Michael Gomboc <michael.gomboc@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-04-16 20:48+0000\n"
+"Last-Translator: bastik <bastik.tor@xxxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/services.html:16
 msgid "Hidden Services"
-msgstr ""
+msgstr "Versteckte Dienste"
 
 #. type: Content of: <html><body>
 #: en/services.html:19
@@ -42,8 +35,8 @@ msgstr ""
 "Einstellungen deines versteckten Dienstes beeintr&auml;chtigen. Also "
 "verlasse dich nicht darauf, besser gesagt gib uns nicht die Schuld wenn "
 "etwas schief geht. Wenn du Fehler findest oder wenn du Kommentare zu dieser "
-"neuen Option hast, bitte lasse es uns wissen! Wir brauchen dein Feed-back. "
-"  <a name=\"&Uuml;ber\"/>"
+"neuen Option hast, bitte lasse es uns wissen! Wir brauchen dein Feed-back."
+"   <a name=\"about\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:26
@@ -101,9 +94,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>
@@ -127,19 +119,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."
@@ -178,9 +170,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>
@@ -201,8 +193,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>
@@ -230,8 +222,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 ""
 
@@ -240,9 +232,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>
@@ -263,3 +255,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/de/troubleshooting.po b/de/troubleshooting.po
index b495396..65dc84b 100644
--- a/de/troubleshooting.po
+++ b/de/troubleshooting.po
@@ -1,33 +1,25 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+#   <gregweb@xxxxxx>, 2011.
+#   <lutetia@xxxxxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-06-30 06:05+0000\n"
+"Last-Translator: parla <lutetia@xxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 # type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
 msgid "Troubleshooting"
-msgstr ""
+msgstr "Fehlerbehebung"
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:19
@@ -37,51 +29,69 @@ msgid ""
 "having, check out our website at <i>www.vidalia-project.net</i> for more "
 "support and information.  <a name=\"start\"/>"
 msgstr ""
+"Nachfolgend sind einige allgemeine Probleme bzw. häufige Fragen von "
+"Anwendern aufgelistet. Wenn du zu deinem speziellen Thema keinen Beitrag "
+"findest, besuche unsere Webseite <i>www.vidalia-project.net</i> für "
+"weiterführende Information. <a name=\"start\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:25
 msgid "I Can't Start Tor"
-msgstr ""
+msgstr "Ich kann Tor nicht starten."
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:27
 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 ""
+"Einer der häufigsten Gründe warum Vidalia Tor nicht starten kann ist, dass "
+"Vidalia nach der ausführbaren Datei <i>Tor.exe</i> in einem falschen "
+"Verzeichnis sucht. Im Vidalia Controll-Panel, unter <a "
+"href=\"config.html#general\">Einstellungen, Register Allgemein</a> kannst du"
+" den Pfad zur Datei <i>Tor.exe</i> anpassen.   "
 
 # 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 ""
+"Ein anderer Grund kann sein, dass die Datei Tor.exe bereits ausgeführt wird."
+" Kontrolliere dies in der Liste der laufenden Prozesse und beende diesen. "
+"Versuche dann Tor erneut auszuführen. "
 
 # 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 ""
+"Falls dies nicht die Ursachen sind, prüfe im <a "
+"href=\"log.html\">Logbuch</a> von Vidalia ob, Tor Einträge zum fehlerhaften "
+"Startvorgang erzeugt hat."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:43
 msgid "<a name=\"connect\"/>"
-msgstr ""
+msgstr "<a name=\"Verbindung\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:44
 msgid "Vidalia Can't Connect to Tor"
-msgstr ""
+msgstr "Vidalia kann sich nicht mit Tor verbinden"
 
 # 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 ""
+"Für die Steuerung der Toranwendung dient Vidalia ein <i>Kontroll-Port</i> "
+"als Kommunikationsweg."
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:49
@@ -91,6 +101,9 @@ msgid ""
 "your <a href=\"log.html\">message log</a> to see if Tor reported any errors "
 "while it started."
 msgstr ""
+"Ein weiterer, häufiger Grund, warum Vidalia sich nicht mit dem Tor-Netzwerk "
+"verbindet ist, dass die Toranwendung zwar startet jedoch auf einen Fehler "
+"stö�t und sofort abbricht. "
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:55
@@ -98,20 +111,26 @@ 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 ""
+"Wenn die Toranwendung über einen anderen Port empfängt als dies Vidalia "
+"voraussetzt, dann kann Vidalia keine Verbindung zur Anwendung aufnehmen. Du "
+"mu�t diese Einstellung in den seltensten Fällen ändern. Falls jedoch ein "
+"Dienst auf deinem System mit Tors Kontroll-Port in Konflikt kommt, ist ein "
+"neuer Port anzugeben. Du kannst dies in Vidalias Kontroll-Panel unter <a "
+"href=\"config.html#advanced\">Einstellungen, Fortgeschritten</a> anpassen."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:63
 msgid "<a name=\"password\"/>"
-msgstr ""
+msgstr "<a name=\"Passwort\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:64
 msgid "Why is Vidalia asking me for a \"control password\"?"
-msgstr ""
+msgstr "Warum fragt mich Vidalia nach einem \"Kontroll-Passwort\"?"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:66
@@ -123,6 +142,13 @@ msgid ""
 "applications from also connecting to the control port and potentially "
 "compromising your anonymity."
 msgstr ""
+"Vidalia kommuniziert mit der Tor-Software über den sogenannten Kontroll-Port"
+" von Tor. Der Kontroll-Port ermöglicht Vidalia unter anderem Status-"
+"Aktualisierungen von Tor zu erhalten, eine neue Identität anzufordern, Tors "
+"Einstellungen zu konfigurieren etc. Jedes Mal, wenn Vidalia Tor startet, "
+"setzt Vidalia ein zufälliges Passwort. Dies soll verhindern, dass andere "
+"Anwendungen, die deine Anonymität gefährden, sich ebenfalls mit dem "
+"Kontroll-Port verbinden. "
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:75
@@ -131,6 +157,9 @@ msgid ""
 "happens in the background. There are three common situations, though, where "
 "Vidalia may prompt you for a password:"
 msgstr ""
+"Für gewöhnlich läuft dieser Prozess der Passwort-Generierung im Hintergrund "
+"ab. Es gibt jedoch drei mögliche Fälle in denen Vidalia nach einem Passwort "
+"fragen könnte: "
 
 # type: Content of: <html><body><ul><li>
 #: en/troubleshooting.html:82
@@ -140,14 +169,22 @@ msgid ""
 "Tor Browser Bundle. In that case, you'll need to close the old Vidalia and "
 "Tor before you can run this one."
 msgstr ""
+"Du hast das Vidalia-Bundle installiert, Vidalia und Tor sind auf deinem "
+"Rechner bereits funktionsfähig. Falls du nun das Tor-Browser-Bundle "
+"installieren willst, müsstest du zuvor die alte Vidalia- und Tor-Anwendung "
+"schlieÃ?en."
 
 # 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 ""
+"Andernfalls würde Vidalia unkontrolliert abbrechen und die Tor-Anwendung "
+"samt dem letzten Zufalls-Passwort weiterlaufen lassen. Wenn du dann Vidalia "
+"wieder startest generiert es eine neues Passwort, kann jedoch nicht mehr mit"
+" Tor kommunizieren, da Tor noch das alte Passwort weiterverwendet."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:94
@@ -156,6 +193,9 @@ msgid ""
 "button, you can click the button and Vidalia will restart Tor with a new "
 "random control password."
 msgstr ""
+"Wenn der Dialog, der zur Eingabe eines Kontroll-Passwortes auffordert einen "
+"<i>Neustart</i> -Schalter zeigt, dann klicke darauf und Vidalia wird Tor "
+"regulär ohne Passwort-Konflikt neu starten."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:99
@@ -165,55 +205,76 @@ msgid ""
 "process or task manager, and terminate the Tor process. Then use Vidalia to "
 "restart Tor and all will work again."
 msgstr ""
+"Falls kein <i>Neustart</i> -Schalter angezeigt wird, oder Vidalia nicht neu "
+"starten kann, ist es auch möglich das Problem manuell zu lösen. Beende im "
+"Prozess- bzw. Taskmanger die Tor-Anwendung. Dann starte Vidalia, um "
+"gleichzeitig Tor neu zu starten und die Anwendungen werden wieder laufen."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:106
 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 ""
+"Du hast die Tor-Anwendung als Dienst eingerichtet, der startet sobald dein "
+"System hochfährt. Wenn Tor als Dienst von Vidalia eingerichtet ist, wurde "
+"ein zufälliges Passwort erzeugt und von Tor gespeichert. Wenn du dein System"
+" erneut hochfährst startet Tor mit dem gespeicherten Passwort.  Nun startest"
+" du Vidalia, das jetzt versucht die laufende Tor-Anwendung zu steuern. "
+"Vidalia generiert ein zufälliges Passwort, welches jedoch vom gespeicherten "
+"Passwort der Tor-Anwendung abweicht. "
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:114
 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\";> "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
+"Die Tor-Anwendung sollte nicht als Dienst eingerichtet werden. Siehe hierzu "
+"die Tor-Wiki-Seite <a "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>Tor"
+" als Dienst</a> für weitere Hinweise, wie der Dienst entfernt werden kann."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:122
 msgid "<a name=\"torexited\"/>"
-msgstr ""
+msgstr "<a name=\"Abbruch Tor\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:123
 msgid "Tor Exited Unexpectedly"
-msgstr ""
+msgstr "Unerwarteter Abbruch von Tor"
 
 # 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 ""
+"Wenn Tor sofort nach dem Start abbricht, wird in den meisten Fällen noch "
+"eine Tor-Anwendung ausgeführt. �berprüfe im <a href=\"log.html\">Logbuch</a>"
+" des Kontroll-Panles von Vidalia, ob einer der letzten Einträge gelb "
+"markiert ist und in etwa lautet:"
 
 # 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 ""
+"connection_create_listener(): Keine Verbindung zu 127.0.0.1:9050: \n"
+"Addresse noch im Gebrauch. â?? \n"
+"Läuft Tor bereits?â?? \n"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:135
@@ -224,25 +285,34 @@ msgid ""
 "operating systems, the <i>ps</i> command can help you find the other Tor "
 "process."
 msgstr ""
+"Wenn du eine Meldung wie oben bekommst, muÃ?t du einen anderen Prozess einer "
+"Tor-Anwendung beenden bevor du eine neue Ausführung von Tor mit Vidalia "
+"auslöst. Auf Windows findest du die <i>tor.exe</i> -Anwendung im "
+"Taskmanager, Register Prozesse. Auf den meisten anderen Betriebssystemen "
+"kann der Befehl <i>ps</i helfen, den Tor-Prozess zu finden."
 
 # type: Content of: <html><body><p>
 #: 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 ""
+"Wenn Tor für längere Zeit funktionsfähig lief (länger als ein paar "
+"Sekunden), dann überprüfe im <a href=\"log.html\">Logbuch</a> des Kontroll-"
+"Panels von Vidalia, ob es Fehlermeldungen zum Beenden von Tor gibt. Diese "
+"Einträge werden rot oder gelb gekennzeichnet sein."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:147
 msgid "<a name=\"stop\"/>"
-msgstr ""
+msgstr "<a name=\"beenden\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:148
 msgid "Vidalia Can't Stop Tor"
-msgstr ""
+msgstr "Vidalia kann Tor nicht beenden"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:150
@@ -251,3 +321,8 @@ msgid ""
 "href=\"log.html\">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+"Wenn Vidalia die Tor-Anwendung nicht beenden kann, prüfe im <a "
+"href=\"log.html\">Logbuch</a> des Kontroll-Panels von Vidalia, welche "
+"Einträge Tor zu Fehlern beim Beenden erzeugt hat."
+
+
diff --git a/es/bridges.po b/es/bridges.po
index 84c2ae3..fc9f21e 100644
--- a/es/bridges.po
+++ b/es/bridges.po
@@ -1,12 +1,14 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Castilian) <None>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -125,3 +127,5 @@ msgstr ""
 "Configurando  más que una direccion de puente asegura que tu connexión de "
 "Tor sea mas estabile, por si acaso que algunos de los puentes sean fuera del"
 " alcance."
+
+
diff --git a/es/config.po b/es/config.po
index a3cf8de..76ff01f 100644
--- a/es/config.po
+++ b/es/config.po
@@ -1,34 +1,25 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# Ernesto Bernal <ernesto_pow@xxxxxxxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2010-09-30 04:37+0200\n"
-"Last-Translator: Ricardo A. <ra.hermosillac@xxxxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: es\n"
+"PO-Revision-Date: 2011-10-10 13:16+0000\n"
+"Last-Translator: ernestob <ernesto_pow@xxxxxxxxxxx>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/config.html:16
 msgid "Configuring Vidalia and Tor"
-msgstr "Configurando Vidalia. y Tor"
+msgstr "Configurando Vidalia y Tor"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:20
@@ -37,12 +28,11 @@ 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 te permite configurar algunos de los aspectos de Vidalia y Tor que "
-"son modificados con mas frequencia.  Tambien te deja instalar y manejar un "
-"<a href=\"server.html\"> relevo de Tor</a> para que puedas ayudar a la red Tor "
-"crecer."
+"Vidalia le permite configurar algunos de los aspectos de Vidalia y Tor que "
+"son modificados con mas frecuencia.  También te deja instalar y manejar un "
+"<a href=\"server.html\">servidor de  Tor</a> para que puedas ayudar a la red"
+" Tor crecer."
 
-# Estas etiquetas no se traducen
 #. type: Content of: <html><body>
 #: en/config.html:26
 msgid "<a name=\"general\"/>"
@@ -51,22 +41,30 @@ msgstr "<a name=\"general\"/>"
 #. type: Content of: <html><body><h3>
 #: en/config.html:27
 msgid "General Settings"
-msgstr "Configuraciones Generales"
+msgstr "Configuraciones generales"
 
 #. 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 ""
+"Las configuraciones en la página <i>General</i> son las que más se "
+"modifican."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:32
 msgid ""
-"<b>Tor Executable</b>: This is the Tor executable that Vidalia will run when "
-"you select <i>Start</i> from the tray menu. If you have multiple versions of "
-"Tor installed, you can tell Vidalia which version you would like to run by "
-"clicking the <i>Browse</i> button and navigating to the particular Tor "
+"<b>Tor Executable</b>: This is the Tor executable that Vidalia will run when"
+" you select <i>Start</i> from the tray menu. If you have multiple versions "
+"of Tor installed, you can tell Vidalia which version you would like to run "
+"by clicking the <i>Browse</i> button and navigating to the particular Tor "
 "installation you want."
 msgstr ""
+"<b>Ejecutable Tor</b>: Este es el ejecutable Tor que Vidalia ejecutará "
+"cuando seleccione <i>Empezar</i> en el menú del servidor. Si tiene varias "
+"versiones de Tor instaladas, se le permitirá elegir la versión deseada en "
+"Vidalia haciendo clic en el botón <i>Buscar</i> para encontrar la "
+"instalación de Tor que desee."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:39
@@ -75,23 +73,29 @@ msgid ""
 "automatically start Tor when Vidalia starts. You can also configure Vidalia "
 "to run when your system starts (<i>Windows only</i>)."
 msgstr ""
+"<b>Opciones de inicio</b>: esta configuración le permite ejecutar Tor "
+"automáticamente cuando empieza a utilizar Vidalia. También puede configurar "
+"Vidalia para que se ejecute cuando su sistema se inicia  (<i>solo en "
+"sistemas Windows</i>)."
 
 #. type: Content of: <html><body>
 #: en/config.html:46
 msgid "<a name=\"network\"/>"
-msgstr ""
+msgstr "<a name=\"network\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:47
 msgid "Network Settings"
-msgstr ""
+msgstr "Configuraciones de red"
 
 #. 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 ""
+" La página de configuraciones de <i>Red</i> le permitirá cambiar la forma en"
+" que Tor se conecta a la red de Tor."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:53
@@ -104,6 +108,14 @@ 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>Utilizo un proxy para acceder a internet</b>: si su conexión de internet "
+"precisa de un proxy HTTP, puede configurar Tor para que envíe todas las "
+"peticiones de su directorio y las conexiones del servidor de Tor a través de"
+" su proxy. Debe especificar al menos el nombre del servidor local o la "
+"dirección de su proxy, y el puerto del puerto de escucha de su proxy. Si su "
+"proxy necesita autenticación, puede introducir el <i>Nombre de usuario</i> y"
+" <i>contraseña</i> que utiliza en su proxy. En cualquier caso, puede optar "
+"por no rellenar esos campos."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:62
@@ -112,8 +124,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>
@@ -123,8 +135,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>
@@ -152,10 +164,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 ""
@@ -173,8 +185,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>
@@ -197,12 +209,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>
@@ -233,8 +245,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 ""
@@ -261,15 +273,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 ""
@@ -295,9 +307,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 ""
 
@@ -314,6 +326,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/es/links.po b/es/links.po
index 52774cb..1ddedd9 100644
--- a/es/links.po
+++ b/es/links.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -76,3 +77,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/es/netview.po b/es/netview.po
index ab341fe..0eecaac 100644
--- a/es/netview.po
+++ b/es/netview.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/es/running.po b/es/running.po
index e28fa1b..edce152 100644
--- a/es/running.po
+++ b/es/running.po
@@ -1,28 +1,18 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +64,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 +90,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 +114,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 +128,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 +143,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/es/server.po b/es/server.po
index 4dc4ee9..7d445e5 100644
--- a/es/server.po
+++ b/es/server.po
@@ -1,34 +1,25 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# Ernesto Bernal <ernesto_pow@xxxxxxxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-30 23:01+0200\n"
-"Last-Translator: Ricardo A. <ra.hermosillac@xxxxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: es\n"
+"PO-Revision-Date: 2011-10-14 09:49+0000\n"
+"Last-Translator: ernestob <ernesto_pow@xxxxxxxxxxx>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/server.html:16
 msgid "Setting Up a Tor Relay"
-msgstr "Configurando un transmisor de Tor"
+msgstr "Configurando un retransmisor de Tor"
 
 #. type: Content of: <html><body>
 #: en/server.html:19
@@ -37,11 +28,15 @@ msgid ""
 "of their spare bandwidth by running a Tor relay. Vidalia helps you do your "
 "part by making it easy to set up a relay of your own.  <a name=\"basic\"/>"
 msgstr ""
+"La red de Tor está compuesta por voluntarios de todo el mundo que donan "
+"parte de su ancho de banda por medio de una retransmisión Tor. Vidalia le "
+"ayudará a colaborar facilitándole la configuración de su retransmisión. <a "
+"name=\"basic\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:24
 msgid "Basic Settings"
-msgstr ""
+msgstr "Configuración básica"
 
 #. type: Content of: <html><body><p>
 #: en/server.html:26
@@ -49,6 +44,8 @@ msgid ""
 "If you decide you want to help the Tor network grow by running a relay, you "
 "can follow these steps to get started:"
 msgstr ""
+"Si quiere colaborar con la expansión de la red Tor a través de una "
+"retransmisión, siga los siguientes pasos:"
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:31
@@ -57,11 +54,13 @@ msgid ""
 "tray menu or <i>Preferences</i> from your system menubar on Macintosh "
 "systems."
 msgstr ""
+"Abra el cuadro de diálogo de configuración pulsando <i>Configuración</i> en "
+"el menú o, si posee un sistema Macintosh, pulse en <i>Preferencias<i/>."
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:35
 msgid "Select the <i>Relay</i> configuration page."
-msgstr ""
+msgstr "Seleccione la página <i>Retransmisión<i/>"
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:37
@@ -70,14 +69,21 @@ 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 ""
+"Elija si quiere instalar una retransmisión Tor normal o una retransmisión "
+"<i>puente<i/> (Tor 0.2.0.8-alpha o superior). Las retransmisiones puente "
+"ayudan a los usuarios de Tor censurados a los que se les bloquea el acceso "
+"directo a la red Tor. Marque la casilla <i>Retransmitir tráfico para la red "
+"Tor<i/> si quiere poner en funcionamiento una retransmisión Tor normal o "
+"<i>Ayuda a los usuarios censurados a conectar con la red Tor<i/> si desea "
+"poner en funcionamiento un retransmisor puente."
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:44
 msgid "Enter the following information:"
-msgstr ""
+msgstr "Introduzca la siguiente información:"
 
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:46
@@ -85,6 +91,8 @@ msgid ""
 "<b>Nickname</b>: The name which your relay will be known as on the Tor "
 "network. An example of a relay nickname is \"MyVidaliaRelay\"."
 msgstr ""
+"<b>Nombre de usuario</b>: nombre por el que se conocerá su retransmisión en "
+"la red Tor, como, por ejemplo, \"MiRetransmisionVidalia\"."
 
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:50
@@ -94,43 +102,60 @@ msgid ""
 "goes wrong with your relay. You might also include your PGP or GPG key ID "
 "and fingerprint."
 msgstr ""
+"<b>Información de contacto</b>: tu dirección e-mail. Esta dirección solo "
+"será utilizada en caso de que haya una actualización de seguridad importante"
+" o si algo va mal con su retransmisión. También es posible incluir su clave "
+"PGP o GPG y huella dactilar."
 
 #. 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 ""
+"<b>Puerto de retransmisión</b>: es el puerto de su retransmisión donde se "
+"eschucha el tráfico de clientes de otras retransimisiones Tor."
 
 #. 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."
-msgstr ""
+"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 ""
+"Si desea hacer una réplica del directorio de Tor para redireccionar a otros "
+"usuarios de la red, debe marcar la casilla <i>Replicar el directorio de "
+"retransmisiones</i> Si no tiene mucho ancho de banda, no marque esta "
+"casilla. Si decide replicar el directorio de retransmisiones, asegúrese de "
+"que el <i>Puerto del directorio</i> es diferente al <i>Puerto de "
+"retransmisiones</i> que ha introducido arriba. Las retransmisiones puente "
+"<i>tienen</i> que replicar el directorio de retransmisión."
 
 #. type: Content of: <html><body>
 #: en/server.html:71
 msgid "<a name=\"bandwidth\"/>"
-msgstr ""
+msgstr "<a name=\"bandwidth\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:72
 msgid "Bandwidth Limits"
-msgstr ""
+msgstr "Límite del ancho de banda"
 
 #. type: Content of: <html><body><p>
 #: en/server.html:74
 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 ""
+"Poner en funcionamiento un retransmisor de Tor consume mucho ancho de banda."
+" En cualquier caso, Tor le permite limitar la cantidad de ancho de banda que"
+" desea compartir con la red Tor. De este modo, puede ejecutar un "
+"retransmisor sin comprometer su conexión."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:80
@@ -139,21 +164,24 @@ msgid ""
 "connection speed. If you select <i>Custom</i>, you will be able to specify "
 "your own limits."
 msgstr ""
+"En el cuadro desplegable, seleccione la opción que mejor le convenga a su "
+"conexión. Si selecciona <i>Personalizado</i>, podrá especificar el límite "
+"deseado."
 
 #. type: Content of: <html><body><h4>
 #: en/server.html:84
 msgid "Custom Limits"
-msgstr ""
+msgstr "Límite personalizado"
 
 #. type: Content of: <html><body><p>
 #: 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 ""
@@ -162,8 +190,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 ""
@@ -171,9 +199,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>."
@@ -182,7 +210,7 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/server.html:111
 msgid "<a name=\"exitpolicy\"/>"
-msgstr ""
+msgstr "<a name=\"exitpolicy\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:112
@@ -215,8 +243,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>
@@ -291,7 +319,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>
@@ -356,11 +385,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>
@@ -377,8 +406,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."
@@ -394,16 +423,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/\";>http://192.168.0.1</a> or <a "
-"href=\"http://192.168.1.1/\";>http://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/\";>http://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\";> "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" 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 "
@@ -411,3 +440,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/es/troubleshooting.po b/es/troubleshooting.po
index 5214888..7ff51b7 100644
--- a/es/troubleshooting.po
+++ b/es/troubleshooting.po
@@ -1,28 +1,18 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 # type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +38,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 +70,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 +89,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 +135,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 +162,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 +174,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\";> "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
 
 # type: Content of: <html><body>
@@ -200,18 +191,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 +219,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 +241,5 @@ msgid ""
 "href=\"log.html\">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/fa/bridges.po b/fa/bridges.po
index 41259a2..4657681 100644
--- a/fa/bridges.po
+++ b/fa/bridges.po
@@ -1,29 +1,20 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed by
-#   the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified, propagated, or
-#   distributed except according to the terms described in the LICENSE
-#   file.
-# 
+# Translators:
+#   <aalaeiarash@xxxxxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2010-09-10 06:02+0200\n"
-"Last-Translator: Ghazal <nevisht@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-07-16 04:10+0000\n"
+"Last-Translator: arashaalaei <aalaeiarash@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: fa\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: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/bridges.html:16
@@ -44,21 +35,21 @@ 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 ""
 "بعضÛ? از سرÙ?Û?س دÙ?Ù?دگاÙ? اÛ?Ù?ترÙ?تÛ? (ISPs) با Ù?سدÙ?د کردÙ? ارتباط با اÙ?تÙ?اÙ?-دÙ?Ù?دÙ? "
-"Ù?اÛ? Tor اÙ?داÙ? بÙ? Ù?Ù?ع دسترسÛ? کاربراÙ? بÙ? شبکÙ? Tor  Ù?Û? Ú©Ù?Ù?د. Ù¾Ù? Ù?اÛ? اÙ?تÙ?اÙ?Û? (Ù? "
-"Û?ا صÙ?رت Ú©Ù?تاÙ? شدÙ? Ø¢Ù?Ø? \"Ù¾Ù? Ù?ا\") اÙ?تÙ?اÙ? دÙ?Ù?دÙ? Ù?اÛ?Û? Ù?ستÙ?د Ú©Ù? بÙ? کاربراÙ? ساÙ?سÙ?ر "
-"شدÙ? Ú©Ù?Ú© Ù?Û? Ú©Ù?د بÙ? شبکÙ? Tor دسترسÛ? Û?ابÙ?د. برخÙ?اÙ? دÛ?گر اÙ?تÙ?اÙ? دÙ?Ù?دÙ? Ù?اÛ? TorØ? "
-"Ù¾Ù? Ù?ا در Ù?Ù?رست عÙ?Ù?Ù?Û? اÙ?تÙ?اÙ? دÙ?Ù?دÙ? Ù?اÛ? Ù?عÙ?Ù?Ù?Û? Ù?ارد Ù?شدÙ? اÙ?د. از Ø¢Ù?جاÛ?Û? Ú©Ù? Ù?Û?Ú? "
-"Ù?Ù?رست عÙ?Ù?Ù?Û? کاÙ?Ù?Û? از اÛ?Ù? Ù¾Ù? Ù?ا Ù?Ù?جÙ?د Ù?Û?ستØ? حتÛ? از ISP Ø´Ù?ا دسترسÛ? بÙ? تÙ?اÙ? "
-"اÙ?تÙ?اÙ? دÙ?Ù?دÙ? Ù?اÛ? Ø´Ù?اختÙ? شدÙ? Û? Tor را Ù?Û?Ù?تر Ù?Û? Ú©Ù?دØ? بÙ? احتÙ?اÙ? زÛ?اد Ù?ادر "
+"Ù?اÛ? تÙ?ر اÙ?داÙ? بÙ? Ù?Ù?ع دسترسÛ? کاربراÙ? بÙ? شبکÙ? تÙ?ر  Ù?Û? Ú©Ù?Ù?د. Ù¾Ù? Ù?اÛ? اÙ?تÙ?اÙ?Û? (Ù? "
+"Û?ا صÙ?رت Ú©Ù?تاÙ? شدÙ? Ø¢Ù?Ø? \"Ù¾Ù? Ù?ا\") اÙ?تÙ?اÙ? دÙ?Ù?دÙ? Ù?اÛ?Û? Ù?ستÙ?د Ú©Ù? بÙ? کاربراÙ? "
+"ساÙ?سÙ?ر شدÙ? Ú©Ù?Ú© Ù?Û? Ú©Ù?د بÙ? شبکÙ? تÙ?ر دسترسÛ? Û?ابÙ?د. برخÙ?اÙ? دÛ?گر اÙ?تÙ?اÙ? دÙ?Ù?دÙ? Ù?اÛ?"
+" تÙ?رØ? Ù¾Ù? Ù?ا در Ù?Ù?رست عÙ?Ù?Ù?Û? اÙ?تÙ?اÙ? دÙ?Ù?دÙ? Ù?اÛ? Ù?عÙ?Ù?Ù?Û? Ù?ارد Ù?شدÙ? اÙ?د. از Ø¢Ù?جاÛ?Û? "
+"Ú©Ù? Ù?Û?Ú? Ù?Ù?رست عÙ?Ù?Ù?Û? کاÙ?Ù?Û? از اÛ?Ù? Ù¾Ù? Ù?ا Ù?Ù?جÙ?د Ù?Û?ستØ? حتÛ? از ISP Ø´Ù?ا دسترسÛ? بÙ? "
+"تÙ?اÙ? اÙ?تÙ?اÙ? دÙ?Ù?دÙ? Ù?اÛ? Ø´Ù?اختÙ? شدÙ? Û? تÙ?ر را Ù?Û?Ù?تر Ù?Û? Ú©Ù?دØ? بÙ? احتÙ?اÙ? زÛ?اد Ù?ادر "
 "Ù?Ø®Ù?اÙ?د بÙ?د تÙ?اÙ?Û? Ù¾Ù? Ù?ا را Ù?سدÙ?د Ú©Ù?د."
 
 #. type: Content of: <html><body>
@@ -91,19 +82,19 @@ 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 ""
 "براÛ? استÙ?ادÙ? از Ù¾Ù? Ù?اÛ? خصÙ?صÛ? از دÙ?ستاÙ?تاÙ? بخÙ?اÙ?Û?د Vidlia Ù? Tor را در Ù?ضاÛ? "
 "ساÙ?سÙ?ر Ù?شدÙ? اÛ?Ù?ترÙ?ت Ù?صب Ù?عاÙ? Ú©Ù?Ù?د Ù? سپس رÙ?Û? <i>Help censored users</i> در "
-"صÙ?Ø­Ù? تÙ?ظÛ?Ù?ات اÙ?تÙ?اÙ? دÙ?Ù?دÙ? درVidalia <a href=\"server.html\"> Ú©Ù?Û?Ú© Ú©Ù?Ù?د. حاÙ?ا "
-"Ù?Û? تÙ?اÙ?Ù?د بÙ? Ø·Ù?ر خصÙ?صÛ? جÙ?Ù?Ù? <i>Bridge address</i> در پاÛ?Û?Ù? صÙ?Ø­Ù? اÙ?تÙ?اÙ? دÙ?Ù?دÙ? "
-"Ø®Ù?د را براÛ? Ø´Ù?ا ارساÙ? Ú©Ù?Ù?د. Ù?عاÙ? سازÛ? Ù¾Ù? اÙ?تÙ?اÙ? دÙ?Ù?دÙ?Ø? برخÙ?اÙ? Ù?عاÙ? سازÛ? "
-"اÙ?تÙ?اÙ? دÙ?Ù?دÙ? خرÙ?جØ? تÙ?Ù?ا Ø¢Ù?ار را از شبکÙ? Tor بÙ? Ù?Ù?صد Ù? باÙ?عکس Ù?Ù?تÙ?Ù? Ù?Û? Ú©Ù?د Ù? "
-"Ù?اعدتÙ? Ù?Ù?Û? باÛ?ست  باعث شکاÛ?ت از عاÙ?Ù? بÙ? دÙ?Û?Ù? Ù?Ù?ض Ù?Ù?ررات بشÙ?د."
+"صÙ?Ø­Ù? تÙ?ظÛ?Ù?ات اÙ?تÙ?اÙ? دÙ?Ù?دÙ? درVidalia <a href=\"server.html\"> Ú©Ù?Û?Ú© Ú©Ù?Ù?د. حاÙ?ا"
+" Ù?Û? تÙ?اÙ?Ù?د بÙ? Ø·Ù?ر خصÙ?صÛ? جÙ?Ù?Ù? <i>Bridge address</i> در پاÛ?Û?Ù? صÙ?Ø­Ù? اÙ?تÙ?اÙ? "
+"دÙ?Ù?دÙ? Ø®Ù?د را براÛ? Ø´Ù?ا ارساÙ? Ú©Ù?Ù?د. Ù?عاÙ? سازÛ? Ù¾Ù? اÙ?تÙ?اÙ? دÙ?Ù?دÙ?Ø? برخÙ?اÙ? Ù?عاÙ? "
+"سازÛ? اÙ?تÙ?اÙ? دÙ?Ù?دÙ? خرÙ?جØ? تÙ?Ù?ا Ø¢Ù?ار را از شبکÙ? Tor بÙ? Ù?Ù?صد Ù? باÙ?عکس Ù?Ù?تÙ?Ù? Ù?Û? "
+"Ú©Ù?د Ù? Ù?اعدتÙ? Ù?Ù?Û? باÛ?ست  باعث شکاÛ?ت از عاÙ?Ù? بÙ? دÙ?Û?Ù? Ù?Ù?ض Ù?Ù?ررات بشÙ?د."
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:52
@@ -122,8 +113,8 @@ msgstr ""
 "بÙ? آدرس Ù¾Ù? Ù?اÛ? بÛ?شترÛ? دارÛ?د بÙ?تر است بÙ? Ø·Ù?ر Ù?رتب اÛ?Ù? صÙ?Ø­Ù? را Ú?Ú© Ú©Ù?Û?د. راÙ? "
 "دÛ?گر براÛ? Û?اÙ?تÙ? Ù¾Ù? Ù?اÛ? عÙ?Ù?Ù?Û? ارساÙ? اÛ?Ù?Û?Ù? بÙ? bridges@xxxxxxxxxxxxxx است. اÛ?Ù? "
 "عبارت را(get bridges) بÙ? تÙ?Ù?اÛ?Û? در بدÙ?Ù? اÛ?Ù?Û?Ù? Ù?رار دÙ?Û?د. اگر درخÙ?است Ø®Ù?د را "
-"از طرÛ?Ù? جÛ?Ù?Û?Ù? ارساÙ? Ú©Ù?Û?دØ? بÙ? Ù?ا Ú©Ù?Ú© کردÙ? اÛ?د از اÙ?داÙ? Ù?کرÙ?ا براÛ? Ø¢Ù?Ù?ختÙ? آدرس "
-"Ù¾Ù? Ù?اÛ? بÛ?شتر جÙ?Ù?Ú¯Û?رÛ? Ú©Ù?Û?Ù?."
+"از طرÛ?Ù? جÛ?Ù?Û?Ù? ارساÙ? Ú©Ù?Û?دØ? بÙ? Ù?ا Ú©Ù?Ú© کردÙ? اÛ?د از اÙ?داÙ? Ù?کرÙ?ا براÛ? Ø¢Ù?Ù?ختÙ? آدرس"
+" Ù¾Ù? Ù?اÛ? بÛ?شتر جÙ?Ù?Ú¯Û?رÛ? Ú©Ù?Û?Ù?."
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:63
@@ -133,3 +124,5 @@ msgid ""
 msgstr ""
 "براÛ? Ù?Ù?اÙ?عÛ? Ú©Ù? بعضÛ? از Ù¾Ù? Ù?ا در دسترس Ù?Û?ستÙ?دØ? Ù?عاÙ? کردÙ? آدرس بÛ?Ø´ از Û?Ú© Ù¾Ù?Ø? "
 "ارتباط Tor  Ø´Ù?ا را تÙ?Ù?Û?ت Ù?Û? Ú©Ù?د."
+
+
diff --git a/fa/config.po b/fa/config.po
index cd202ab..bab5c7a 100644
--- a/fa/config.po
+++ b/fa/config.po
@@ -1,29 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2010-09-26 19:52+0200\n"
-"Last-Translator: Ghazal <nevisht@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-12-21 22:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: fa\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: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -38,8 +28,8 @@ msgid ""
 "href=\"server.html\">Tor relay</a> so you can help the Tor network grow."
 msgstr ""
 "Vidalia بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د Ú©Ù? راÛ?ج ترÛ?Ù? Ù?Û?Ú?Ú¯Û? Ù?اÛ? تعدÛ?Ù? شدÙ? Vidalia Ù? Tor "
-"را Ù?عاÙ? Ú©Ù?Û?د. Ù?Ù?Ú?Ù?Û?Ù? بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د  بازپخش Tor Ú©Ù? بÙ? رشد شبکÙ? Tor  Ú©Ù?Ú© "
-"Ù?Û? Ú©Ù?د را Ù?دÛ?رÛ?ت Ú©Ù?Û?د. "
+"را Ù?عاÙ? Ú©Ù?Û?د. Ù?Ù?Ú?Ù?Û?Ù? بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د  بازپخش Tor Ú©Ù? بÙ? رشد شبکÙ? Tor  Ú©Ù?Ú©"
+" Ù?Û? Ú©Ù?د را Ù?دÛ?رÛ?ت Ú©Ù?Û?د. "
 
 #. type: Content of: <html><body>
 #: en/config.html:26
@@ -53,17 +43,18 @@ 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 ""
 "Ù?ابÙ? اجرا بÙ? Ù?سÛ?Ù?Ù? Tor: Ù?Ù?گاÙ?Û? Ú©Ù? گزÛ?Ù?Ù? Start را Ù?Û? زÙ?Û?دØ? Vidalia از Ù?Û?ست "
@@ -96,8 +87,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 ""
 "تÙ?ظÛ?Ù?ات صÙ?Ø­Ù? شبکÙ? بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د Ú?Ú¯Ù?Ù?Ú¯Û? ارتباط Tor  با شبکÙ? Tor  را "
 "تغÛ?Û?ر دÙ?Û?د."
@@ -119,8 +110,8 @@ msgstr ""
 "صÙ?رت Ù?Û? باÛ?ست Ù?اÙ? Ù? آدرس سرÙ?Û?س دÙ?Ù?دÙ? Ù?Û?Ù?ترشکÙ? Ø®Ù?د را Ù? Ù?Û?ز درگاÙ?Û? را Ú©Ù? "
 "Ù?Û?Ù?ترشکÙ? Ø´Ù?ا از Ø¢Ù?جا Ú¯Ù?Ø´ بÙ? زÙ?Ú¯ ارتباط Ù?ا Ù?Û? Ø´Ù?د را Ù?شخص Ú©Ù?Û?د. اگر Ù?Û?Ù?ترشکÙ? "
 "Ø´Ù?ا Ù?Û?از بÙ? تاÛ?Û?د داردØ? Ù?Û? تÙ?اÙ?Û?د Ù?اÙ? کاربرÛ? Ù? Ú©Ù?Ù?Ù? Ù?رÙ?د Ú©Ù? براÛ? Ù?صÙ? شدÙ? بÙ? "
-"Ù?Û?Ù?ترشکÙ? استÙ?ادÙ? Ù?Û? Ú©Ù?Û?د را Ù?ارد Ú©Ù?Û?دØ? در غÛ?ر اÛ?Ù? صÙ?رت Ù?Û? تÙ?اÙ?Û?د اÛ?Ù? جاÙ?ا را "
-"خاÙ?Û? بگذارÛ?د."
+"Ù?Û?Ù?ترشکÙ? استÙ?ادÙ? Ù?Û? Ú©Ù?Û?د را Ù?ارد Ú©Ù?Û?دØ? در غÛ?ر اÛ?Ù? صÙ?رت Ù?Û? تÙ?اÙ?Û?د اÛ?Ù? جاÙ?ا را"
+" خاÙ?Û? بگذارÛ?د."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:62
@@ -129,15 +120,15 @@ 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 ""
 "Ù?اÛ?رÙ?اÙ? Ù?Ù? Ù?Ù?Ø· اÙ?کاÙ? Ù?صÙ? شدÙ? بÙ? درگاÙ? Ù?اÛ? Ù?شخصÛ? را Ù?Û? دÙ?د: اگر Ø´Ù?ا پشت "
 "Ù?اÛ?رÙ?اÙ? Û?ا Ù?Û?Ù?ترشکÙ? Ù?اÙ?عÛ? Ù?رار گرÙ?تÙ? اÛ?د Ú©Ù? اتصاÙ? Ø´Ù?ا بÙ? درگاÙ? Ù?اÛ? در دسترس "
 "را Ù?حدÙ?د Ù?Û? Ú©Ù?دØ? Ù?Û? تÙ?اÙ?Û?د Tor را تÙ?ظÛ?Ù? Ú©Ù?Û?د تا Ù?ستÙ?Û?Ù?Ù? Ù?Ù?Ø· بÙ? بازپخش Ù?اÛ? "
 "درگاÙ? Ø´Ù?ا Ù?صÙ? Ø´Ù?د Ù? در درگاÙ? Ù?اÛ?Û? Ú©Ù? از طرÛ?Ù? Ù?اÛ?رÙ?اÙ? Û?ا Ù?Û?Ù?ترشکÙ? Ø´Ù?ا Ù?جاز "
-"Ù?ستÙ?دØ? Ø´Ù?Ù?د Ú©Ù?د. کاÙ?Û? است Ù?Û?ستÛ? از درگاÙ? Ù?اÛ?Û? Ú©Ù? از طرÛ?Ù? Ù?اÛ?رÙ?اÙ? Û?ا Ù?Û?Ù?ترشکÙ? "
-"Ø´Ù?ا Ù?جاز Ù?ستÙ?د را Ù?ارد Ú©Ù?Û?د. Ù?اÙ? Ù?ا را با کاÙ?ا از Ù?Ù? جدا Ú©Ù?Û?د. (Ù?ثاÙ?: 80Ø? "
+"Ù?ستÙ?دØ? Ø´Ù?Ù?د Ú©Ù?د. کاÙ?Û? است Ù?Û?ستÛ? از درگاÙ? Ù?اÛ?Û? Ú©Ù? از طرÛ?Ù? Ù?اÛ?رÙ?اÙ? Û?ا Ù?Û?Ù?ترشکÙ?"
+" Ø´Ù?ا Ù?جاز Ù?ستÙ?د را Ù?ارد Ú©Ù?Û?د. Ù?اÙ? Ù?ا را با کاÙ?ا از Ù?Ù? جدا Ú©Ù?Û?د. (Ù?ثاÙ?: 80Ø? "
 "443Ø? 880Ø?)"
 
 #. type: Content of: <html><body><ul><li>
@@ -147,14 +138,14 @@ 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 ""
 "ISP Ù?Ù? Ù?اÙ?ع اتصاÙ? بÙ? شبکÙ? Tor Ù?Û? Ø´Ù?د: اگر ISP Ø´Ù?ا (سرÙ?Û?س دÙ?Ù?دÙ? اÛ?Ù?ترÙ?ت) "
-"اتصاÙ? بÙ? شبکÙ? Tor را Ù?سدÙ?د Ù?Û? Ú©Ù?دØ? Tor Ù?Û? تÙ?اÙ?د Ù?Û?Ù?تر را با Ù¾Ù?Ù?اÙ? کردÙ? Ù?Ù?رست "
-"اتصاÙ? Ø®Ù?د دÙ?ر بزÙ?د Ù? از راÙ? بازپخش Ù?اÛ?Û? Ú©Ù? \"Ù¾Ù?\" Ù?اÙ?Û?دÙ? Ù?Û? Ø´Ù?دØ? Ù?صÙ? Ø´Ù?د (Ù?Ù?Ø· "
-"Tor 0.2.0.3-alpha Ù? Û?ا Ù?رÚ?Ù? جدÛ?دتر).  Ù?Û? تÙ?اÙ?Û?د Ù¾Ù? Ù?اÛ? بازپخش را با تعÛ?Û?Ù? "
-"آدرس Ù? Ø´Ù?ارÙ? درگاÙ?Ø? Ù? Û?ا آدرسØ? Ø´Ù?ارÙ? درگاÙ?Ø? Ù? اÙ?گشت Ù?گارØ? اضاÙ?Ù? Ú©Ù?Û?د. "
+"اتصاÙ? بÙ? شبکÙ? Tor را Ù?سدÙ?د Ù?Û? Ú©Ù?دØ? Tor Ù?Û? تÙ?اÙ?د Ù?Û?Ù?تر را با Ù¾Ù?Ù?اÙ? کردÙ? Ù?Ù?رست"
+" اتصاÙ? Ø®Ù?د دÙ?ر بزÙ?د Ù? از راÙ? بازپخش Ù?اÛ?Û? Ú©Ù? \"Ù¾Ù?\" Ù?اÙ?Û?دÙ? Ù?Û? Ø´Ù?دØ? Ù?صÙ? Ø´Ù?د "
+"(Ù?Ù?Ø· Tor 0.2.0.3-alpha Ù? Û?ا Ù?رÚ?Ù? جدÛ?دتر).  Ù?Û? تÙ?اÙ?Û?د Ù¾Ù? Ù?اÛ? بازپخش را با "
+"تعÛ?Û?Ù? آدرس Ù? Ø´Ù?ارÙ? درگاÙ?Ø? Ù? Û?ا آدرسØ? Ø´Ù?ارÙ? درگاÙ?Ø? Ù? اÙ?گشت Ù?گارØ? اضاÙ?Ù? Ú©Ù?Û?د. "
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:77
@@ -181,15 +172,15 @@ msgstr "128.213.48.13:8080105413B1DBDAF867B22674D252DF3D9FA3671F73"
 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 Ù?Û? Ø´Ù?د را Ø®Ù?Ø«Û? Ù?Û? "
 "Ú©Ù?د."
 
@@ -206,8 +197,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 ""
 "از عبارت Ú©Ù?Ú©Û? <a href=\"server.html\"> براÛ? درÛ?اÙ?ت اطÙ?اعات دÙ?Û?Ù? دربارÙ? راÙ? "
 "اÙ?دازÛ? Ù? Ù?دÛ?رÛ?ت بازپخش Tor استÙ?ادÙ? Ú©Ù?Û?د."
@@ -234,18 +225,18 @@ 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 ""
 "زباÙ?: خط اتصاÙ? Vidalia بÙ? Ù?سÛ?Ù?Ù? Ù?ترجÙ?اÙ?Û? Ù?Ù?Û?د Ù? کارآØ? بÙ? Ú?Ù?دÛ?Ù? زباÙ? ترجÙ?Ù? "
-"شدÙ?. اÙ?Ù?Û?Ù? بار Ú©Ù? Vidalia Ù?عاÙ? Ù?Û? Ø´Ù?د تÙ?اش Ù?Û? Ú©Ù?د زباÙ? Ù?Ù?رد استÙ?ادÙ? کاÙ?Ù¾Û?Ù?تر "
-"Ø´Ù?ا را حدس بزÙ?د. اگر حدس Vidalia Ù?ادرست باشدØ? Ù? Û?ا اگر Ø´Ù?ا زباÙ? دÛ?گرÛ? را "
-"ترجÛ?Ø­ بدÙ?Û?دØ? Ù?Û? تÙ?اÙ?Û?د زباÙ? دÛ?گرÛ? را از Ù?Ù?رست Ù?Ù?Ù?Û? باز Ø´Ù?Ù?دÙ?(dropdown menu)Ø? "
-"اÙ?تخاب Ú©Ù?Û?د. پس از تغÛ?Û?ر زباÙ?Ø? Ù?Û? باÛ?ست سÛ?ستÙ? را restart Ú©Ù?Û?د تا زباÙ? "
+"شدÙ?. اÙ?Ù?Û?Ù? بار Ú©Ù? Vidalia Ù?عاÙ? Ù?Û? Ø´Ù?د تÙ?اش Ù?Û? Ú©Ù?د زباÙ? Ù?Ù?رد استÙ?ادÙ? کاÙ?Ù¾Û?Ù?تر"
+" Ø´Ù?ا را حدس بزÙ?د. اگر حدس Vidalia Ù?ادرست باشدØ? Ù? Û?ا اگر Ø´Ù?ا زباÙ? دÛ?گرÛ? را "
+"ترجÛ?Ø­ بدÙ?Û?دØ? Ù?Û? تÙ?اÙ?Û?د زباÙ? دÛ?گرÛ? را از Ù?Ù?رست Ù?Ù?Ù?Û? باز Ø´Ù?Ù?دÙ?(dropdown menu)Ø?"
+" اÙ?تخاب Ú©Ù?Û?د. پس از تغÛ?Û?ر زباÙ?Ø? Ù?Û? باÛ?ست سÛ?ستÙ? را restart Ú©Ù?Û?د تا زباÙ? "
 "اÙ?تخابÛ? Ø´Ù?ا Ù?عاÙ? Ø´Ù?د."
 
 #. type: Content of: <html><body><ul><li>
@@ -280,8 +271,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 ""
@@ -308,8 +299,8 @@ msgid ""
 "<b>strongly</b> discouraged. Any application or user on your computer can "
 "reconfigure your Tor installation."
 msgstr ""
-"Ù?Û?Ú?: Ù?Û?Ú? تاÛ?Û?دÛ? Ù?Ù?رد Ù?زÙ?Ù? Ù?Û?ست. استÙ?ادÙ? از اÛ?Ù? گزÛ?Ù?Ù? \"شدÛ?دÙ?\" Ù?Ù?ع Ù?Û? Ø´Ù?د. Ù?ر "
-"اپÙ?Û?Ú©Û?Ø´Ù? Ù? Û?ا کاربر رÙ?Û? سÛ?ستÙ? Ø´Ù?ا Ù?Û? تÙ?اÙ?د Ù?صب Tor را بازتÙ?ظÛ?Ù? Ú©Ù?د. "
+"Ù?Û?Ú?: Ù?Û?Ú? تاÛ?Û?دÛ? Ù?Ù?رد Ù?زÙ?Ù? Ù?Û?ست. استÙ?ادÙ? از اÛ?Ù? گزÛ?Ù?Ù? \"شدÛ?دÙ?\" Ù?Ù?ع Ù?Û? Ø´Ù?د. "
+"Ù?ر اپÙ?Û?Ú©Û?Ø´Ù? Ù? Û?ا کاربر رÙ?Û? سÛ?ستÙ? Ø´Ù?ا Ù?Û? تÙ?اÙ?د Ù?صب Tor را بازتÙ?ظÛ?Ù? Ú©Ù?د. "
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:155
@@ -317,8 +308,8 @@ 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 ""
 "Ú©Ù?Û?دÙ?اÚ?Ù?: (Ù¾Û?Ø´Ù?رض) -- اگر اÛ?Ù? گزÛ?Ù?Ù? اÙ?تخاب شدÙ? باشدØ? Ù?Û? تÙ?اÙ?Û?د Ú©Ù?Û?دÙ?اÚ?Ù? اÛ? "
 "را Ù?شخص Ú©Ù?Û?د Ú©Ù? Tor در Ù?ر بار Ú©Ù? کاربر Ù? Û?ا اپÙ?Û?Ú©Û?Ø´Ù?Û? بÙ? درگاÙ? Ú©Ù?ترÙ? Tor "
@@ -329,15 +320,15 @@ 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 ""
-"Ú©Ù?Ú©Û? -- اگر گزÛ?Ù?Ù? تاÛ?Û?د Ú©Ù?Ú©Û? اÙ?تخاب شدÙ? باشدØ? Tor Ù?اÛ?Ù?Û? (Û?ا \"Ú©Ù?Ú©Û?\") را Ø®Ù?اÙ?د "
-"Ù?Ù?شت  Ú©Ù? شاÙ?Ù? Ø´Ù?ار تصادÙ?Û? باÛ?ت Ù?اÛ? اطÙ?اعات Ù?Ù?رست در زÙ?اÙ? Ù?عاÙ? شدÙ?Ø´ Ù?Û? Ø´Ù?د. "
-"Ù?ر کاربر Ù? Û?ا اپÙ?Û?Ú©Û?Ø´Ù?Û? Ú©Ù? سعÛ? در اتصاÙ? بÙ? درگاÙ? Ú©Ù?ترÙ? Tor  را داشتÙ? باشدØ? "
-"Ù?Û? باÛ?ست بتÙ?اÙ?د Ù?حتÙ?Û?ات اÛ?Ù? Ú©Ù?Ú©Û? را ارائÙ? بدÙ?د."
+"Ú©Ù?Ú©Û? -- اگر گزÛ?Ù?Ù? تاÛ?Û?د Ú©Ù?Ú©Û? اÙ?تخاب شدÙ? باشدØ? Tor Ù?اÛ?Ù?Û? (Û?ا \"Ú©Ù?Ú©Û?\") را "
+"Ø®Ù?اÙ?د Ù?Ù?شت  Ú©Ù? شاÙ?Ù? Ø´Ù?ار تصادÙ?Û? باÛ?ت Ù?اÛ? اطÙ?اعات Ù?Ù?رست در زÙ?اÙ? Ù?عاÙ? شدÙ?Ø´ Ù?Û? "
+"Ø´Ù?د. Ù?ر کاربر Ù? Û?ا اپÙ?Û?Ú©Û?Ø´Ù?Û? Ú©Ù? سعÛ? در اتصاÙ? بÙ? درگاÙ? Ú©Ù?ترÙ? Tor  را داشتÙ? "
+"باشدØ? Ù?Û? باÛ?ست بتÙ?اÙ?د Ù?حتÙ?Û?ات اÛ?Ù? Ú©Ù?Ú©Û? را ارائÙ? بدÙ?د."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:170
@@ -361,21 +352,21 @@ msgstr ""
 "<b>Tor Data Directory</b> <i>(optional)</i>: Ù?Ù?رست اطÙ?اعات Tor (اختÛ?ارÛ?): "
 "Ø´Ù?ا Ù?Û? تÙ?اÙ?Û?د Ù?Ù?رستÛ? را Ú©Ù? Tor در Ù?Û?ست اطÙ?اعات Ø®Ù?د سÛ?Ù? Ù?Û? Ú©Ù?د را Ù?عÛ?Ù? Ú©Ù?Û?دØ? "
 "Ù?ظÛ?ر اطÙ?اعات ذخÛ?رÙ?-سازÛ? شدÙ? باز پخش TorØ? Ú©Ù?Û?دÙ?اÛ? بازپخش TorØ? Ù?اÛ?Ù? Ù?اÛ? "
-"تÙ?ظÛ?Ù?ات. اگر اÛ?Ù? بخش را سÙ?Û?د بگذارÛ?دØ? Tor اطÙ?اعات Ù¾Û?Ø´Ù?رض Ù?Ø­Ù? Ù?Ù?رست Ø®Ù?د را بÙ? "
-"جاÛ? Ø¢Ù? استÙ?ادÙ? Ø®Ù?اÙ?د کرد. "
+"تÙ?ظÛ?Ù?ات. اگر اÛ?Ù? بخش را سÙ?Û?د بگذارÛ?دØ? Tor اطÙ?اعات Ù¾Û?Ø´Ù?رض Ù?Ø­Ù? Ù?Ù?رست Ø®Ù?د را بÙ?"
+" جاÛ? Ø¢Ù? استÙ?ادÙ? Ø®Ù?اÙ?د کرد. "
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:181
 msgid ""
-"<b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter "
-"a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it "
-"starts.  If you enter a value for <b>Run as Group</b>, Tor will "
+"<b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter"
+" a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it"
+" starts.  If you enter a value for <b>Run as Group</b>, Tor will "
 "<i>setgid</i> to this group when it starts."
 msgstr ""
 "<b>Ù?جÙ?زÙ?ا</b> <i> (اختÛ?ارÛ?Ø? رÙ?Û? Ù?Û?Ù?دÙ?ز در دسترس Ù?Û?ست)</i>: اگر عبارت ارزشÛ? "
 "را رÙ?Û? <b> بÙ? عÙ?Ù?اÙ? کاربر بکار بÛ?Ù?داز</b> Ù¾Û?ادÙ? Ú©Ù?Û?دØ? Tor در زÙ?اÙ? استارت Ø¢Ù? "
-"را setuid Ø®Ù?اÙ?د کرد (با Ø¢Û? دÛ? کاربر Ù?عاÙ? Ø®Ù?اÙ?د کرد). Ù? اگر عبارت ارزشÛ? <b>بÙ? "
-"عÙ?Ù?اÙ? گرÙ?Ù? بکار بÛ?Ù?داز</b>Ø? در Ø¢Ù? صÙ?رت Tor Ø¢Ù? را setgid Ø®Ù?اÙ?د کردØ? Û?عÙ?Û? در "
+"را setuid Ø®Ù?اÙ?د کرد (با Ø¢Û? دÛ? کاربر Ù?عاÙ? Ø®Ù?اÙ?د کرد). Ù? اگر عبارت ارزشÛ? <b>بÙ?"
+" عÙ?Ù?اÙ? گرÙ?Ù? بکار بÛ?Ù?داز</b>Ø? در Ø¢Ù? صÙ?رت Tor Ø¢Ù? را setgid Ø®Ù?اÙ?د کردØ? Û?عÙ?Û? در "
 "Ù?Ù?Ù?ع استارت با Ø¢Û? دÛ? گرÙ?Ù? Ù?عاÙ? Ø®Ù?اÙ?د کرد. "
 
 #. type: Content of: <html><body>
@@ -391,8 +382,10 @@ msgstr "Ù?Ø­Û?Ø· سرÙ?Û?س Ù?اÛ? Ù?Ø®Ù?Û?"
 #. type: Content of: <html><body><p>
 #: en/config.html:192
 msgid ""
-"Hidden services allow you to provide any kind of TCP-based service, e.g.  an "
-"HTTP service, to others without revealing your IP address."
+"Hidden services allow you to provide any kind of TCP-based service, e.g.  an"
+" HTTP service, to others without revealing your IP address."
 msgstr ""
 "سرÙ?Û?س Ù?Ø®Ù?Û? بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د Ú©Ù? Ù?ر Ù?Ù?عÛ? از سرÙ?Û?س TCPØ? Ù?ظÛ?ر HTTP را بدÙ?Ù? "
 "آشکار کردÙ? آدرس Ø¢Û? Ù¾Û? Ø®Ù?د ارائÙ? دÙ?Û?د."
+
+
diff --git a/fa/index.po b/fa/index.po
index a1b2a45..3d3980a 100644
--- a/fa/index.po
+++ b/fa/index.po
@@ -1,34 +1,25 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+#   <kaveh.nematipour@xxxxxxxxx>, 2011.
+# perspolis <rezarms@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-09-27 02:19+0200\n"
-"Last-Translator: Ghazal <nevisht@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-07-09 18:12+0000\n"
+"Last-Translator: knematipour <kaveh.nematipour@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: fa\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: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/index.html:16
 msgid "Vidalia Help"
-msgstr "پشتÛ?باÙ?Û? Vidaial"
+msgstr "راÙ?Ù?Ù?اÛ? Ù?Û?داÙ?Û?ا"
 
 #. type: Content of: <html><body><p>
 #: en/index.html:20
@@ -36,9 +27,8 @@ 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
@@ -46,13 +36,13 @@ msgid ""
 "You can use the <i>Find</i> button on the toolbar above to search within a "
 "particular help topic."
 msgstr ""
-"Ù?Û? تÙ?اÙ?Û?د از Ú©Ù?Û?د <i>Find</i> (Ù¾Û?دا Ú©Ù?) در Ù?Ù?ار ابزار (toolbar) باÙ?ا استÙ?ادÙ? "
-"Ú©Ù?Û?د تا سرÙ?صÙ? Ù?اÛ? Û?Ú© Ù?Ù?ضÙ?ع Ù?شخص از پشتÛ?باÙ?Û? را Ù?شاÙ?دÙ? Ú©Ù?Û?د. "
+"Ù?Û? تÙ?اÙ?Û?د از دکÙ?Ù? </i> Ù¾Û?دا Ú©Ù?<i>  در Ù?Ù?ار ابزار Ù?ا براÛ? جستجÙ? در Û?Ú© عÙ?Ù?اÙ? "
+"Ú©Ù?Ú©Û? خاص استÙ?ادÙ? Ú©Ù?Û?د. "
 
 #. 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 "Ú©Ù?Û?د <i>Home</i> (خاÙ?Ù?) در باÙ?اÛ? صÙ?Ø­Ù? Ø´Ù?ا را بÙ? صÙ?Ø­Ù? Ù?خست بازÙ?Û? گرداÙ?د."
+msgstr "دکÙ?Ù? </i>خاÙ?Ù?<i> در باÙ?ا٬ Ø´Ù?ا را بÙ? صÙ?حا اصÙ?Û? بر Ù?Û? گرداÙ?د. "
 
 #. type: Content of: <html><body><p>
 #: en/index.html:34
@@ -60,6 +50,7 @@ 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 ""
-"بÙ? سرÙ?صÙ? <a href=\"links.html\">Helpful Links</a> (Ù?Û?Ù?Ú© Ù?اÛ? Ù?Ù?Û?د) Ù?راجعÙ? Ú©Ù?Û?د "
-"تا در Ù?Û?اÙ? صÙ?Ø­Ù? Ù?اÛ? ارائÙ? شدÙ? اطÙ?اعات Ù? پشتÛ?باÙ?Û? بÛ?شتر در Vidalia Ù? Tor بÙ? "
-"دست Ø¢Ù?رÛ?د."
+"براÛ? دÛ?دÙ? جا Ù?اÛ?Û? Ú©Ù? Ù?Û? تÙ?اÙ?د Ú©Ù?Ú© Ù? اطÙ?اعات بÛ?شتر در Ù?Ù?رد تر Ù? Ù?Û?داÙ?Û?ا Ù¾Û?دا Ú©Ù?Û?د <a href=\"links.html\">Ù?Û?Ù?Ú©Ù?اÛ? Ù?Ù?Û?د </a>\n"
+"را ببÛ?Ù?Û?د"
+
+
diff --git a/fa/log.po b/fa/log.po
index 02ebf3b..c225b4a 100644
--- a/fa/log.po
+++ b/fa/log.po
@@ -1,71 +1,60 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+#   <aalaeiarash@xxxxxxxxx>, 2011.
+#   <behravanhamed@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-28 07:17+0200\n"
-"Last-Translator: Ghazal <nevisht@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-07-03 22:25+0000\n"
+"Last-Translator: arashaalaei <aalaeiarash@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: fa\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: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/log.html:16
 msgid "Message Log"
-msgstr "عبارت Ù?رÙ?د بÙ? سÛ?ستÙ?"
+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 ""
-"عبارت Ù?رÙ?د بÙ? سÛ?ستÙ? بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د Ú©Ù? اطÙ?اعات استاتÙ?س دربارÙ? پرÙ?سÙ? Û?Ú© "
-"Tor Ù?عاÙ? را Ù?شاÙ?دÙ? Ú©Ù?Û?د. Ù?ر عبارتÛ? Û?Ú© <i>جدÛ?ت<i> Ù?Ù?راÙ? دارد از (جدÛ? ترÛ?Ù? "
-"Ù?شدار)<b>خطا</b> تا <b>اشکاÙ? زداÛ?Û?</b> (Ù?Ù?تگÛ?رترÛ?Ù? پرÙ?سÙ?). براÛ? اطÙ?اعات "
-"بÛ?شتر بÙ? بخش Ú©Ù?Ú© <a href=\"#severities\"> در خصÙ?ص جدÛ?ت عبارت Ù?راجعÙ? Ú©Ù?Û?د. <a "
-"name=\"severities\"/>"
+"Ù?رÙ?د بÙ? سÛ?ستÙ? Ù¾Û?اÙ? اجازÙ? Ù?Û? دÙ?د تا اطÙ?اعات Ù?ضعÛ?ت در Ù?Ù?رد تÙ?رÙ?پرÙ?سÙ? در حاÙ? اجرا را Ù?شاÙ?دÙ? Ú©Ù?Û?د. <a name=\"basic\"/>\n"
+"Ù?رپÛ?اÙ? داراÛ? <i>شدت Ù¾Û?اÙ?</i> Ù?ختص Ø®Ù?د است Ù? درجات Ø¢Ù? از <b>اشتباÙ?</b> (بسÛ?ار جدÛ?) to <b>اشکاÙ? زداÛ?Û?</b> (Ù?حتÙ?اÛ? زÛ?اد). Ù?تÙ?اÙ?ت است.بÙ? Ù?سÙ?ت Ù?رجع سرÛ? بزÙ?Û?د تا در Ù?Ù?رد <a href=\"#severities\">شدت Ù¾Û?اÙ?</a>بÛ?شتر بخÙ?اÙ?Û?د.  <a name=\"severities\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/log.html:28
 msgid "Message Severities"
-msgstr "جدÛ?ت Ù¾Û?اÙ?"
+msgstr "شدت Ù¾Û?اÙ?"
 
 #. type: Content of: <html><body><p>
 #: 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 ""
-"جدÛ?ت Û?Ú© Ù¾Û?اÙ? Ù?شاÙ? Ù?Û? دÙ?د Ú©Ù? Ù?شدار تا Ú?Ù? اÙ?دازÙ? جدÛ? است. Ù¾Û?اÙ? Ù?اÛ? با درجÙ? "
-"جدÛ?ت باÙ?اتر Ù?شاÙ? از برÙ?ز خطا در Tor دارÙ?د. عبارتÙ?اÛ? با درجÙ? جدÛ?ت پاÛ?Û?Ù? تر "
-"عÙ?Ù?Ù?Ù? در Ø·Ù?Ù? Ù?عاÙ?Û?ت Tor دÛ?دÙ? Ù?Û? Ø´Ù?Ù?د Ù?  Ù?Û?از بÙ? پاکسازÛ? Ù?دارÙ?د."
+"شدت Û?Ú© Ù¾Û?اÙ? را بÙ? Ø´Ù?ا Ù?Û? Ú¯Ù?Û?د Ú©Ù? Ú?Ú¯Ù?Ù?Ù? اÛ?Ù? Ù¾Û?اÙ? Ù?Ù?Ù? است. شدت Ù¾Û?اÙ? باÙ?اتر "
+"Ù?عÙ?Ù?Ù?ا Ù?شاÙ? Ù?Û? دÙ?د Ú©Ù? Ú?Û?زÛ? اشتباÙ? است . شدت پاÛ?Û?Ù? Ù¾Û?اÙ? غاÙ?با در Ø·Û? عÙ?Ù?Û?ات "
+"Ù?اÛ? طبÛ?عÛ? تر ظاÙ?ر Ù?Û?Ø´Ù?د Ù? Ù?عÙ?Ù?Ù?ا Ù?ازÙ? Ù?Û?ست در Ù?Ù?رد Ø¢Ù? Ù?اکÙ?Ø´Û? اÙ?جاÙ? دÙ?Û?د"
 
 #. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
-msgstr "Ù¾Û?اÙ? Ù?اÛ? Ù?شدار Ù?عÙ?Ù?Ù?Ø? با درجÙ? جدÛ?ت حداکثر تا حداÙ?Ù?Ø? از اÛ?Ù? Ù?رارÙ?د:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
+msgstr "شدت Ù¾Û?اÙ? Ø? از شدÛ?د ترÛ?Ù? بÙ? حداÙ?Ù? Ù?درت Ø? عبارتÙ?د از :"
 
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:41
@@ -74,49 +63,49 @@ msgid ""
 "Tor cannot proceed. These messages will be highlighted in <i>red</i> in the "
 "message log."
 msgstr ""
-"<b>Error</b> (خطا): Ù¾Û?اÙ? Ù?اÛ?Û? Ù?ستÙ?د Ú©Ù? Ù?Ù?تÛ? خطاÛ? بزرگÛ? رخ Ù?Û? دÙ?د Ú©Ù? Tor Ù?ادر "
-"بÙ? اداÙ?Ù? Ù?Û?ستØ? ظاÙ?ر Ù?Û? Ø´Ù?Ù?د. اÛ?Ù? Ù¾Û?اÙ? Ù?ا <i>red</i> با Ù?رÙ?ز در Ù?رÙ?دÛ? Ù¾Û?اÙ? "
-"Ù?ا Ù?شخص Ù?Û? Ø´Ù?Ù?د."
+"<b>خطا</b> : Ù¾Û?اÙ?Ù?اÛ?Û? است Ú©Ù? Ù?Ù?گاÙ?Û?Ú©Ù? Ú©Ù? Ú?Û?زÛ? بسÛ?ار اشتباÙ? است Ù? تÙ?ر Ù?Ù?Û? "
+"تÙ?اÙ?د بکار Ø®Ù?داداÙ?Ù? دÙ?د. اÛ?Ù? Ù¾Û?اÙ? Ù?ا با رÙ?Ú¯ Ù?رÙ?ز در <i>Ù?رÙ?ز</i> در Ù?رÙ?د بÙ? "
+"سÛ?ستÙ? Ù¾Û?اÙ? برجستÙ? شدÙ? است."
 
 #. 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 ""
-"<b>Warning</b> (Ù?شدار): Ù¾Û?اÙ? Ù?اÛ?Û? Ù?ستÙ?د Ú©Ù? تÙ?Ù?ا Ù?Ù?گاÙ?Û? Ú©Ù? Tor دÚ?ار اشکاÙ? Ø´Ù?د "
-"ظاÙ?ر Ù?Û? Ø´Ù?Ù?دØ? اÙ?ا خطرÙ?اک Ù?Û?ستÙ?د Ù? Tor بÙ? کار Ø®Ù?د اداÙ?Ù? Ø®Ù?اÙ?د داد. اÛ?Ù? Ù¾Û?اÙ? "
-"Ù?ا با <i>yellow</i> زرد Ù?شخص Ù?Û? Ø´Ù?Ù?د."
+"<b>Ù?شدار</b> : Ù¾Û?اÙ? Ù?شدار ظاÙ?ر Ù?Û? Ø´Ù?د  تÙ?Ù?ا زÙ?اÙ?Û? Ú©Ù? Ú?Û?زÛ? اشتباÙ? است Ø? اÙ?ا "
+"اÛ?Ù? اشتباÙ? Ø®Û?Ù?Û? جدÛ? Ù?Û?ست Ù? تÙ?ر Ù?Ù?Ù?ز در حاÙ? اجراست. اÛ?Ù? Ù¾Û?اÙ? Ù?ا با<i>رÙ?Ú¯ "
+"زرد</i> برجستÙ? شدÙ? است."
 
 #. 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 ""
-"<b>Notice</b> (تÙ?جÙ?): Ù¾Û?اÙ? Ù?اÛ?Û? Ù?ستÙ?د Ú©Ù? بÙ? Ù?درت Ù?Ù?گاÙ? Ù?عاÙ?Û?ت Ù?عÙ?Ù?Ù? Tor ظاÙ?ر "
-"Ù?Û? Ø´Ù?Ù?د Ù? خطا بÙ? Ø´Ù?ار Ù?Ù?Û? Ø¢Û?Ù?دØ? با Ù?جÙ?د اÛ?Ù? بÙ?تر است تÙ?جÙ? Ù?ازÙ? را Ù?شاÙ? "
-"دÙ?Û?د. "
+"<b>تÙ?جÙ?</b> : Ù¾Û?اÙ?Ù?اÛ?Û?Ú©Ù? اغÙ?ب در Ø­Û?Ù? عÙ?Ù?Û?ات عادÛ? تÙ?ر ظاÙ?ر Ù?Û?Ø´Ù?د Ù? اشتباÙ? "
+"بحساب Ù?Ù?Û? Ø¢Û?Ù?د Ø? اÙ?ا Ù?Ù?Ú©Ù? است براÛ? کاربر Ù?Ù?Ù?ز Ù?Ù? جاÙ?ب باشد"
 
 #. 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 ""
-"<b>Info</b>(اطÙ?اعات): Ù¾Û?اÙ? Ù?اÛ?Û? Ù?ستÙ?د Ú©Ù? Ù?کرر در Ø·Ù?Ù? Ù?عاÙ?Û?ت Ù?عÙ?Ù?Ù? Tor ظاÙ?ر "
-"Ù?Û? Ø´Ù?Ù?د Ù? غاÙ?بÙ? Ù?Û?ز Ù?Ù?Ù?Ù? بÙ? جÙ?ب  تÙ?جÙ? کاربراÙ? Ù?Ù?Û? Ø´Ù?Ù?د. "
+"<b>اطÙ?اعات</b> : Ù¾Û?اÙ?Ù?اÛ?Û? Ú©Ù? اغÙ?ب در Ø­Û?Ù? عÙ?Ù?Û?ات عادÛ? تÙ?ر ظاÙ?ر  Ù?Û? Ø´Ù?د Ù? "
+"Ù?عÙ?Ù?Ù?ا Ù?Ù?رد تÙ?جÙ? اکثر کاربراÙ? Ù?Û?ست."
 
 #. 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 ""
-"<b>Debug</b> (اشکاÙ? زداÛ?Û?): Ù¾Û?اÙ? Ù?اÛ? بسÛ?ار Ø·Ù?Û?Ù? Ú©Ù? اساسÙ? Ù?Ù?رد تÙ?جÙ? سازÙ?دگاÙ? "
-"Ù?رÙ? اÙ?زارÙ?د. اگر اطÙ?اع کاÙ?Û? Ù?دارÛ?د بÙ?تر است Ù¾Û?اÙ? را حذÙ? Ù?Ú©Ù?Û?د."
+"<b>اشکاÙ? زداÛ?Û?</b> : Ù¾Û?اÙ? Ù?اÛ?Û? بسÛ?ار پرگÙ? است Ú©Ù? بÛ?شتر Ù?Ù?ردعÙ?اÙ?Ù?  تÙ?سعÙ? "
+"دÙ?Ù?دگاÙ? برÙ?اÙ?Ù? است. بÙ? Ø·Ù?ر Ú©Ù?Û?  Ù?رÙ?د بÙ? سÛ?ستÙ? Ù¾Û?اÙ? Ù?اÛ? اشکاÙ? زداÛ?Û? تÙ?صÛ?Ù? Ù?Ù?Û?"
+" Ø´Ù?د Ø? Ù?گر اÛ?Ù?Ú©Ù? Ø´Ù?ا Ù?Û? داÙ?Û?دÚ?Ù? اÙ?جاÙ? Ù?Û? دÙ?Û?د."
 
 #. type: Content of: <html><body><p>
 #: en/log.html:66
@@ -124,42 +113,44 @@ msgid ""
 "Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i> "
 "messages."
 msgstr ""
-"براÛ? بÛ?شتر کاربراÙ?Ø? Ù?Ù?اسب تر است Ú©Ù? Ù?Ù?Ø· Ù¾Û?اÙ? Ù?اÛ? خطاØ? Ù?شدارØ? Ù? تÙ?جÙ? را حذÙ? "
-"Ú©Ù?Ù?د."
+"بسÛ?ارÛ? از کاربراÙ? تÙ?Ù?ا باÛ?د <i>خطا</i> Ø? <i>اخطار</i> Ø? Ù? Ù¾Û?اÙ? <i>تÙ?جÙ?</i> "
+"Ù?ارد Ø´Ù?Ù?د."
 
 #. type: Content of: <html><body><p>
 #: en/log.html:71
-msgid "To select which message severities you would like to see, do the following:"
-msgstr "براÛ? اÙ?تخاب جدÛ?ت Ù¾Û?اÙ?Û? Ú©Ù? Ù?اÛ?Ù?Û?د Ù?شاÙ?دÙ? Ú©Ù?Û?دØ? Ù?راحÙ? زÛ?ر را اÙ?جاÙ? دÙ?Û?د:"
+msgid ""
+"To select which message severities you would like to see, do the following:"
+msgstr ""
+"براÛ? اÙ?تخاب Ù?درت شدت Ù¾Û?اÙ?Û? Ú©Ù? Ù?اربر Ù?Û? Ø®Ù?اÙ?د Ø? Ù?Ù?ارد زÛ?ر را اÙ?جاÙ? دÙ?Û?د :"
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:73 en/log.html:92
 msgid "Open the message log from the Vidalia tray menu."
-msgstr "Ù?رÙ?دÛ? Ù¾Û?اÙ? Ù?ا را از رÙ?Û? Ù?Ù?Ù?Û? Vidalia باز Ù?Ù?اÛ?Û?د."
+msgstr "Ù?رÙ?د بÙ? سÛ?ستÙ? Ù¾Û?اÙ?  از Ù?Ù?Ù?Û? Ù?Û?داÙ?Û?ا."
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:74 en/log.html:93
 msgid "Click on <i>Settings</i> at the top of the message log window."
-msgstr "رÙ?Û? <i>Settings</i> در باÙ?اÛ? Ù¾Ù?جرÙ? Ù?رÙ?دÛ? Ù¾Û?اÙ? Ú©Ù?Û?د Ú©Ù?Û?د."
+msgstr " Ù?ارد Ù¾Ù?جرÙ? Ù¾Û?اÙ? Ø´Ù?Û?د<i>تÙ?ظÛ?Ù?ات</i>با Ú©Ù?Û?Ú© رÙ?Û?"
 
 #. 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>
 #: en/log.html:79
 msgid "Click <i>Save Settings</i> to apply your new message filter."
-msgstr "رÙ?Û? <i>Save Settings</i> Ú©Ù?Û?Ú© Ú©Ù?Û?د تا Ù¾Û?اÙ? پاÙ?اÛ?Ø´ جدÛ?د Ø´Ù?ا سÛ?Ù? Ø´Ù?د. "
+msgstr "Ú©Ù?Û?Ú© Ú©Ù?Û?د <i>ذخÛ?رÙ? تÙ?ظÛ?Ù?ات</i> براÛ? اعÙ?اÙ? Ù?Û?Ù?تر رÙ?Û?."
 
 #. type: Content of: <html><body>
 #: en/log.html:84
 msgid "<a name=\"logfile\"/>"
-msgstr "<Û?Ú© اسÙ?=\"/>"
+msgstr "<a name=\"logfile\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/log.html:85
@@ -172,16 +163,16 @@ msgid ""
 "Vidalia can also write log messages to a file, as well as logging them in "
 "the message log window. To enable logging to a file, follow these steps:"
 msgstr ""
-"Vidalia Ù?Ù?Ú?Ù?Û?Ù? Ù?Û? تÙ?اÙ?د Ù¾Û?اÙ? Ù?رÙ?د بÙ? Ù?اÛ?Ù? بÙ?Ù?Û?سدØ? Ù? Ù?Û?ز Ù?Û? تÙ?اÙ?د Ø¢Ù?Ù?ا را بÙ? "
-"Ù¾Ù?جرÙ? Ù?رÙ?دÛ? Ù¾Û?اÙ? Ù?ا Ù?ارد Ú©Ù?د. براÛ? Ù?عاÙ? کردÙ? Ù?رÙ?د بÙ? Ù?اÛ?Ù?Ø? اÛ?Ù? Ù?راحÙ? را "
-"دÙ?باÙ? Ú©Ù?Û?د:"
+"Ù?Û?داÙ?Û?ا را Ù?Ù?Ú?Ù?Û?Ù? Ù?Û? تÙ?اÙ?د Ù¾Û?اÙ? بÙ?Ù?Û?سد  Ø? Ù? Ù?Û?ز ثبت Ø¢Ù?Ù?ا را در Ù¾Ù?جرÙ? Ù¾Û?اÙ? "
+"اÙ?جاÙ? دÙ?د. براÛ? Ù?عاÙ? کردÙ? Ù?رÙ?د بÙ? Û?Ú© Ù?اÛ?Ù? Ø? اÛ?Ù? Ù?راحÙ? را دÙ?باÙ? Ú©Ù?Û?د:"
 
 #. 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 ""
-"Ú?Ú©-باکسÛ? Ú©Ù? عÙ?Ù?اÙ? <i> Ù¾Û?اÙ? Ù?رÙ?د جدÛ?د را بÙ? Ø·Ù?ر اتÙ?Ù?اتÛ?Ú© در Ù?اÛ?Ù? سÛ?Ù? Ú©Ù?</i> "
-"دارد را تÛ?Ú© بزÙ?Û?د."
+"Ú©Ù?Û?Ú© Ú©Ù?Û?د رÙ?Û?\n"
+" <i>Ù¾Û?اÙ?Ù?اÛ? جدÛ? را بطÙ?ر Ø®Ù?دکار ذخÛ?رÙ? Ú©Ù?</i>."
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:96
@@ -190,12 +181,13 @@ msgid ""
 "either type the path and filename into the text box, or click <i>Browse</i> "
 "to navigate to a location for your log file."
 msgstr ""
-"اگر Ù?اÛ?Ù?Û?د Ù?Ø­Ù? Ù?اÛ?Ù?Û? Ú©Ù? Ù¾Û?اÙ? Ù?اÛ? Ø´Ù?ا Ø¢Ù?جا Ù?Ù?شتÙ? Ù?Û? Ø´Ù?د را تغÛ?Û?ر دÙ?Û?دØ? Û?ا "
-"آدرس Ù?اÛ?Ù? Ù? اسÙ? Ù?اÛ?Ù? را در تکست-باکس بÙ?Ù?Û?سÛ?د Ù? Û?ا رÙ?Û? <i>Browse</i> (Ù?رÙ?ر) "
-"Ú©Ù?Û?Ú© Ú©Ù?Û?د Ù? بگردÛ?د تا Ù?Ø­Ù?Û? Ú©Ù? Ù?اÛ?Ù?Û?د Ù¾Û?اÙ? Ù?ا در Ø¢Ù?جا ذخÛ?رÙ? Ø´Ù?د را اÙ?تخاب "
-"Ú©Ù?Û?د. "
+"اگر Ù?Û? Ø®Ù?اÙ?Û?د Ù?اÛ?Ù?Û? Ú©Ù? Ù¾Û?اÙ? Ù?ادر Ø¢Ù? ذخÛ?رÙ? Ù?Û?Ø´Ù?د را تغÛ?Û?ر دÙ?Û?د Ø? Û?ا آدرس Ù?Ù?صد"
+" جدÛ?د را در باکس Ù?Ù?رد Ù?ظر تاÛ?Ù¾ Ú©Ù?Û?د Ù? Û?ا رÙ?Û? <i>Browse</i> Ú©Ù?Û?Ú© Ú©Ù?Û?د تا Ù?Ù?صد"
+" Ù?اÛ?Ù? را بÙ? تÙ?ر Ù?شاÙ? دÙ?Û?د"
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
-msgstr "براÛ? سÛ?Ù? کردÙ? Ù?Ø­Ù? Ù?خزÙ? Ù¾Û?اÙ?Ø? رÙ?Û? <i>Save Settings</i> Ú©Ù?Û?Ú© Ú©Ù?Û?د."
+msgstr "تا Ù?Ù?صد Ø¢Ù?Ù?ا را ذخÛ?رÙ? Ú©Ù?Û?د<i>ذخÛ?رÙ? تÙ?ظÛ?Ù?ات</i> Ú©Ù?Û?Ú© Ú©Ù?Û?د "
+
+
diff --git a/fa/netview.po b/fa/netview.po
index 59c2505..aec1a61 100644
--- a/fa/netview.po
+++ b/fa/netview.po
@@ -1,29 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-29 03:05+0200\n"
-"Last-Translator: Ghazal <nevisht@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: fa\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: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -59,9 +49,9 @@ msgid ""
 "streams may share the same circuit."
 msgstr ""
 "اگر بخÙ?اÙ?Û?د بÙ? Ø·Ù?ر Ù?اشÙ?اس از طرÛ?Ù? Tor ارتباط برÙ?رار Ú©Ù?Û?د (Ù?Ø«Ù?Ù? با Û?Ú© Ù?بساÛ?ت "
-"ارتباط برÙ?رار Ú©Ù?Û?د)Ø? Tor از اتصاÙ? Ù?اÛ? رÙ?زبÙ?دÛ? شدÙ? از طرÛ?Ù? Ø´Ù?ارÛ? از بازپخش Ù?ا "
-"در شبکÙ? Û?Ú© تÙ?Ù?Ù? اÛ?جاد Ù?Û? Ú©Ù?د Ù? Û?ا Û?Ú© <i>circuit</i> (Ù?دار). تراÙ?Û?Ú© اپÙ?Û?Ú©Û?Ø´Ù? "
-"Ø´Ù?ا در اÛ?Ù? زÙ?اÙ? بÙ? عÙ?Ù?اÙ? <i>stream</i> (جرÛ?اÙ?) از Ù?سÛ?ر Ù?دار ارساÙ? Ù?Û? Ø´Ù?د. "
+"ارتباط برÙ?رار Ú©Ù?Û?د)Ø? Tor از اتصاÙ? Ù?اÛ? رÙ?زبÙ?دÛ? شدÙ? از طرÛ?Ù? Ø´Ù?ارÛ? از بازپخش Ù?ا"
+" در شبکÙ? Û?Ú© تÙ?Ù?Ù? اÛ?جاد Ù?Û? Ú©Ù?د Ù? Û?ا Û?Ú© <i>circuit</i> (Ù?دار). تراÙ?Û?Ú© اپÙ?Û?Ú©Û?Ø´Ù?"
+" Ø´Ù?ا در اÛ?Ù? زÙ?اÙ? بÙ? عÙ?Ù?اÙ? <i>stream</i> (جرÛ?اÙ?) از Ù?سÛ?ر Ù?دار ارساÙ? Ù?Û? Ø´Ù?د. "
 "براÛ? تاثÛ?ر بÛ?شترØ? Ú?Ù?دÛ?Ù? جرÛ?اÙ? Ù?Û? تÙ?اÙ?Ù?د از Û?Ú© Ù?دار Ù?احد عبÙ?ر Ú©Ù?Ù?د. "
 
 #. type: Content of: <html><body>
@@ -78,8 +68,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 ""
 "Ù?Ù?Ø´Ù? شبکÙ? شاÙ?Ù? Ù?Ù?Ø´Ù? اÛ? از جÙ?اÙ? است با عÙ?اÙ?ت Ù?اÛ? Ù?رÙ?ز Ú©Ù? Ù?Ø­Ù? بازپخش Ù?اÛ? شبکÙ? "
@@ -94,9 +84,9 @@ msgid ""
 "map by clicking on the map and then dragging it in whatever direction you "
 "would like to move the map."
 msgstr ""
-"براÛ? درشت Ù?Ù?اÛ?Û? Ù?Ø­Ù?Û? از Ù?Ù?Ø´Ù? رÙ?Û? <b>Zoom In</b> Ù? <b>Zoom Out</b> در toolbar "
-"Ú©Ù?Û?Ú© Ú©Ù?Û?د. Ù?Ù?Ú?Ù?Û?Ù? Ù?Û? تÙ?اÙ?Û?د با Ú©Ù?Û?Ú© کردÙ? رÙ?Û? Ù?Ù?Ø´Ù? Ù? کشاÙ?دÙ? Ø¢Ù? بÙ? Ù?ر سÙ?تÛ? Ú©Ù? "
-"Ù?اÛ?Ù?Û?دØ?  دÙ?رتادÙ?ر Ù?Ù?Ø´Ù? را تÙ?اشا Ú©Ù?Û?د."
+"براÛ? درشت Ù?Ù?اÛ?Û? Ù?Ø­Ù?Û? از Ù?Ù?Ø´Ù? رÙ?Û? <b>Zoom In</b> Ù? <b>Zoom Out</b> در toolbar"
+" Ú©Ù?Û?Ú© Ú©Ù?Û?د. Ù?Ù?Ú?Ù?Û?Ù? Ù?Û? تÙ?اÙ?Û?د با Ú©Ù?Û?Ú© کردÙ? رÙ?Û? Ù?Ù?Ø´Ù? Ù? کشاÙ?دÙ? Ø¢Ù? بÙ? Ù?ر سÙ?تÛ? Ú©Ù?"
+" Ù?اÛ?Ù?Û?دØ?  دÙ?رتادÙ?ر Ù?Ù?Ø´Ù? را تÙ?اشا Ú©Ù?Û?د."
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:50
@@ -106,28 +96,28 @@ msgid ""
 "geoip.vidalia-project.net."
 msgstr ""
 " Ù?Ù?Ø·Ù?Ù? جغراÙ?Û?اÛ?Û? Û?Ú© بازپخش Tor با Ù¾Û?دا کردÙ? آدرس Ø¢Û? Ù¾Û? Ø¢Ù? بازپخش در بخش "
-"اطÙ?اعات GeoIP  Ú©Ù? تÙ?سط MaxMind اÛ?جاد شدÙ? Ù? در geoip.vidalia-project.net Ù?رار "
-"دادÙ? شدÙ?Ø? تعÛ?Û?Ù? Ù?Û? Ø´Ù?د. "
+"اطÙ?اعات GeoIP  Ú©Ù? تÙ?سط MaxMind اÛ?جاد شدÙ? Ù? در geoip.vidalia-project.net Ù?رار"
+" دادÙ? شدÙ?Ø? تعÛ?Û?Ù? Ù?Û? Ø´Ù?د. "
 
 #. type: Content of: <html><body><p>
 #: 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 ""
-"در Ù?سط دÛ?اÙ?Ù?Ú¯Ø? زÛ?ر Ù?Ù?Ø´Ù? شبکÙ?Ø? Ù?Û?ستÛ? از Ù?دارÙ?اÛ? Ù?Ù?جÙ?د Ø®Ù?د Ù? Ù?Û?ز تÙ?اÙ? Ø¢Ù?د Ù? شد "
-"اپÙ?Û?Ú©Ø´Ù? Ù?اÛ?Û? Ú©Ù? در Ù?Ù?اÙ? Ù?Ù?Ù?ع در Ø¢Ù? Ù?دارÙ?ا جرÛ?اÙ? دارÙ?د را Ù?شاÙ?دÙ? Ù?Û? Ú©Ù?Û?د. "
+"در Ù?سط دÛ?اÙ?Ù?Ú¯Ø? زÛ?ر Ù?Ù?Ø´Ù? شبکÙ?Ø? Ù?Û?ستÛ? از Ù?دارÙ?اÛ? Ù?Ù?جÙ?د Ø®Ù?د Ù? Ù?Û?ز تÙ?اÙ? Ø¢Ù?د Ù? شد"
+" اپÙ?Û?Ú©Ø´Ù? Ù?اÛ?Û? Ú©Ù? در Ù?Ù?اÙ? Ù?Ù?Ù?ع در Ø¢Ù? Ù?دارÙ?ا جرÛ?اÙ? دارÙ?د را Ù?شاÙ?دÙ? Ù?Û? Ú©Ù?Û?د. "
 "Ù?Ù?تÛ? Ú©Ù? Ù?Ù?Ø´Ù? شبکÙ? براÛ? بار اÙ?Ù? باز Ù?Û? Ø´Ù?دØ? احتÙ?اÙ?Ù? اتصاÙ? بÙ? geoip.vidalia-"
 "project.net را Ù?Û? بÛ?Ù?Û?دØ? Ú©Ù? Ù?عÙ?Ù?Ù?Ù? Ù?Ù?تÛ? Ú©Ù? Vidalia در حاÙ? Û?اÙ?تÙ? اطÙ?اعات "
 "جغراÙ?Û?اÛ?Û? براÛ? Ù?Û?ست بازپخش Ù?اÛ? Tor استØ? Ù?ابÙ? Ù?شاÙ?دÙ? است. در Ù?ظر داشتÙ? باشÛ?د "
-"Ú©Ù? اÛ?Ù? درخÙ?است از طرÛ?Ù? Tor صÙ?رت Ù?Û? Ú¯Û?ردØ? Ù? بÙ? Ù?Ù?Û?Ù? خاطر Ù?Ø­Ù? جغراÙ?Û?اÛ?Û? Ø´Ù?ا از "
-"سÙ?Û? بازپخش GeoIP آشکار Ù?Ø®Ù?اÙ?د شد. Ù?تاÛ?ج جستجÙ?Ø? در Ù?Ø­Ù? ذخÛ?رÙ? Ù?Û? Ø´Ù?د تا بار "
+"Ú©Ù? اÛ?Ù? درخÙ?است از طرÛ?Ù? Tor صÙ?رت Ù?Û? Ú¯Û?ردØ? Ù? بÙ? Ù?Ù?Û?Ù? خاطر Ù?Ø­Ù? جغراÙ?Û?اÛ?Û? Ø´Ù?ا از"
+" سÙ?Û? بازپخش GeoIP آشکار Ù?Ø®Ù?اÙ?د شد. Ù?تاÛ?ج جستجÙ?Ø? در Ù?Ø­Ù? ذخÛ?رÙ? Ù?Û? Ø´Ù?د تا بار "
 "بازپخش Ù?اÛ? GeoIP Ù?تعÙ?Ù? بÙ? Vidalia را کاÙ?Ø´ دÙ?د."
 
 #. type: Content of: <html><body>
@@ -193,8 +183,8 @@ msgid ""
 "the past day."
 msgstr ""
 "تÙ?اÙ? ارزشگذارÛ? Ù¾Ù?Ù?اÛ? Ù?Ù?ار از رÙ?Û? Ù?Ù?Û?اسÛ? بر اساس حداÙ?Ù? Ù¾Ù?Ù?اÛ? Ù?Ù?ارÛ? Ú©Ù? در "
-"ظرÙ?Û?ت حداکثرÛ? Ø®Ù?د در دÙ? ثاÙ?Û?Ù? در رÙ?ز Ù¾Û?Ø´Ø? Ù?رÙ?دÛ? Ù? Û?ا خرÙ?جÛ? داشتÙ? استØ? Ù?حاسبÙ? "
-"Ù?Û? Ø´Ù?د."
+"ظرÙ?Û?ت حداکثرÛ? Ø®Ù?د در دÙ? ثاÙ?Û?Ù? در رÙ?ز Ù¾Û?Ø´Ø? Ù?رÙ?دÛ? Ù? Û?ا خرÙ?جÛ? داشتÙ? استØ? Ù?حاسبÙ?"
+" Ù?Û? Ø´Ù?د."
 
 #. type: Content of: <html><body>
 #: en/netview.html:122
@@ -211,12 +201,12 @@ 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 ""
-"تابÙ?Ù? شرح جزئÛ?ات بازپخش در سÙ?ت راست صÙ?Ø­Ù? جزئÛ?ات Ù?ربÙ?Ø· بÙ? بازپخش Ù? Û?ا بازپخشÛ? "
-"Ú©Ù? در حاÙ? حاضر در href=\"#relaylist\">relay list</a> گزÛ?Ù?Ø´ شدÙ? است را در "
+"تابÙ?Ù? شرح جزئÛ?ات بازپخش در سÙ?ت راست صÙ?Ø­Ù? جزئÛ?ات Ù?ربÙ?Ø· بÙ? بازپخش Ù? Û?ا بازپخشÛ?"
+" Ú©Ù? در حاÙ? حاضر در href=\"#relaylist\">relay list</a> گزÛ?Ù?Ø´ شدÙ? است را در "
 "اختÛ?ار Ø´Ù?ا Ù?رار Ù?Û? دÙ?د. اگر Û?Ú© Ù?دار Ù? Û?ا Û?Ú© جرÛ?اÙ? را در Ù?Û?ست Ù?دارÙ?ا Ù? Û?ا "
 "جرÛ?اÙ? Ù?ا Ù?Ù?جÙ?د Ù?عÙ?Û? Ø®Ù?د اÙ?تخاب کردÙ? اÛ?دØ? اÛ?Ù? تابÙ?Ù? بÙ? Ø´Ù?ا جزئÛ?ات Ù?ربÙ?Ø· Ù?ر "
 "بازپخشÛ? Ú©Ù? Ù?Ù?Û?Ù? حاÙ?ا از Ù?سÛ?ر تراÙ?Û?Ú© Ø´Ù?ا ارساÙ? Ù?Û? Ø´Ù?د را Ù?شاÙ? Ù?Û? دÙ?د."
@@ -275,8 +265,8 @@ msgid ""
 "Estimated maximum amount of bandwidth that the directory relays have seen "
 "this relay handle recently."
 msgstr ""
-"حداکثر Ù¾Ù?Ù?اÛ? Ù?Ù?ارÛ? Ú©Ù? بÙ?ا بÙ? تخÙ?Û?Ù? Ù?Ù?رست اطÙ?اعاتÛ? بازپخش Ù?ا اÛ?Ù? بازپخش اخÛ?رÙ? "
-"Ù?ادر بÙ?دÙ? بکار بگÛ?رد."
+"حداکثر Ù¾Ù?Ù?اÛ? Ù?Ù?ارÛ? Ú©Ù? بÙ?ا بÙ? تخÙ?Û?Ù? Ù?Ù?رست اطÙ?اعاتÛ? بازپخش Ù?ا اÛ?Ù? بازپخش اخÛ?رÙ?"
+" Ù?ادر بÙ?دÙ? بکار بگÛ?رد."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:160
@@ -301,3 +291,5 @@ msgstr "<b>آخرÛ?Ù? بÙ? رÙ?ز رساÙ?Û?</b>"
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
 msgstr "آخرÛ?Ù? تارÛ?Ø® بÙ? رÙ?زرساÙ?Û? اطÙ?اعات اÛ?Ù? بازپخش."
+
+
diff --git a/fa/server.po b/fa/server.po
index ecb7ca2..f91bd77 100644
--- a/fa/server.po
+++ b/fa/server.po
@@ -1,34 +1,24 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+#   <behravanhamed@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-25 16:46+0200\n"
-"Last-Translator: Ghazal <nevisht@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-06-29 15:23+0000\n"
+"Last-Translator: behravan <behravanhamed@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: fa\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: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/server.html:16
 msgid "Setting Up a Tor Relay"
-msgstr "راÙ? اÙ?دازÛ? بازپخش Tor"
+msgstr ""
 
 #. type: Content of: <html><body>
 #: en/server.html:19
@@ -37,14 +27,11 @@ msgid ""
 "of their spare bandwidth by running a Tor relay. Vidalia helps you do your "
 "part by making it easy to set up a relay of your own.  <a name=\"basic\"/>"
 msgstr ""
-"اÛ?Ù? شبکÙ? با Ù?Ù?کارÛ? داÙ?Ø·Ù?باÙ?Ù? اÙ?رادÛ? در سراسر جÙ?اÙ?Ø? Ú©Ù? بخشÛ? از Ù¾Ù?Ù?اÛ? Ù?Ù?ار Ø®Ù?د "
-"راØ? با Ù?عاÙ? سازÛ? بازپخش Tor اÙ?دا Ù?Û? Ú©Ù?Ù?دØ? تشکÛ?Ù? شدÙ? است. Vidalia با آساÙ? "
-"Ù?Ù?Ù?دÙ? Ù?راحÙ? راÙ? اÙ?دازÛ?Ø? اÙ?کاÙ? Ù?Û? دÙ?د Ú©Ù? Ø´Ù?ا Ù?Ù? سÙ?Ù? Ø®Ù?د را ادا Ú©Ù?Û?د. "
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:24
 msgid "Basic Settings"
-msgstr "تÙ?ظÛ?Ù?ات پاÛ?Ù?"
+msgstr ""
 
 #. type: Content of: <html><body><p>
 #: en/server.html:26
@@ -52,8 +39,6 @@ msgid ""
 "If you decide you want to help the Tor network grow by running a relay, you "
 "can follow these steps to get started:"
 msgstr ""
-"اگر Ù?اÛ?Ù?Û?د Ø´Ù?ا Ù?Û?ز با راÙ? اÙ?دازÛ? Û?Ú© بازپخش بÙ? رشد Ù? گسترش شبکÙ? Tor  Û?ارÛ? "
-"Ú©Ù?Û?دØ? براÛ? شرÙ?ع اÛ?Ù? Ù?راحÙ? را گاÙ? بÙ? گاÙ? اجرا Ú©Ù?Û?د."
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:31
@@ -62,13 +47,11 @@ msgid ""
 "tray menu or <i>Preferences</i> from your system menubar on Macintosh "
 "systems."
 msgstr ""
-"<i>تÙ?ظÛ?Ù?ات Ú¯Ù?تگÙ?</i> را با اÙ?تخاب <i> تÙ?ظÛ?Ù?ات </i> از Ù?Û?ست Ù?Ù?Û?Ù? Ù? Û?ا از "
-"<i>گزÛ?Ù?Ù? Ù?ا</i> از Ù?Ù?ار Ù?Ù?Û?Ù? در سÛ?ستÙ? Ù?Ú©Û?Ù?تاشØ? باز Ú©Ù?Û?د. "
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:35
 msgid "Select the <i>Relay</i> configuration page."
-msgstr "<i> بازپخش</i> را در صÙ?Ø­Ù? تÙ?ظÛ?Ù?ات اÙ?تخاب Ú©Ù?Û?د. "
+msgstr ""
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:37
@@ -77,21 +60,14 @@ 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 ""
-"تصÙ?Û?Ù? بگÛ?رÛ?د Ú©Ù? Ù?اÛ?Ù?Û?د بازپخش Tor Ù?عÙ?Ù?Ù?Û? را Ù?عاÙ? Ú©Ù?Û?د Û?ا بازپخش <i>Ù¾Ù?</i>Ø? "
-"Û?عÙ?Û? Tor Ù?عÙ?Ù?Ù?Û? Û?ا Ù?رÚ?Ù? جدÛ?دتر Ø¢Ù?. بازپخش Ù?اÛ? Ù¾Ù? بÙ? کاربرÙ?اÛ? ساÙ?سÙ?رشدÙ? Tor "
-"Ú©Ù? راÙ? دسترسشاÙ? بÙ? شبکÙ? Tor Ù?ستÙ?Û?Ù?Ù? Ù?سدÙ?د شدÙ? Ú©Ù?Ú© Ù?Û? Ú©Ù?Ù?د. اگر Ù?اÛ?Ù?Û?د Ú©Ù? Tor "
-"Ù?عÙ?Ù?Ù?Û? را Ù?عاÙ? Ú©Ù?Û?دØ? Ù?ربع Ù?ارک <i> تراÙ?Û?Ú© بازپخش براÛ? شبکÙ? تÙ?ر </i>  را تÛ?Ú© "
-"بزÙ?Û?د. اگر Ù?اÛ?Ù? Ù?ستÛ?د بازپخش Ù?عÙ?Ù?Ù?Û? Tor را Ù?عاÙ? Ú©Ù?Û?د Ù? اگر Ù?Û? Ø®Ù?اÙ?Û?د Ú©Ù? Û?Ú© "
-"بازپخش Ù¾Ù? Ù?عاÙ? Ú©Ù?Û?د <i>Ú©Ù?Ú© بÙ? کاربرÙ?ا براÛ? دسترسÛ? بÙ? شبکÙ? تÙ?ر</i> را اÙ?تخاب "
-"Ú©Ù?Û?د."
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:44
 msgid "Enter the following information:"
-msgstr "اطÙ?اعات زÛ?ر را Ù?ارد Ú©Ù?Û?د:"
+msgstr "Ù?شخصات زÛ?ر را Ù?ارد Ú©Ù?Û?د:"
 
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:46
@@ -99,8 +75,6 @@ msgid ""
 "<b>Nickname</b>: The name which your relay will be known as on the Tor "
 "network. An example of a relay nickname is \"MyVidaliaRelay\"."
 msgstr ""
-"<b>اسÙ? Ù?ستعار</b>: Ù?اÙ?Û? است Ú©Ù? بازپخش Ø´Ù?ا در شبکÙ? Tor بÙ? Ø¢Ù? Ù?اÙ? Ø´Ù?اختÙ? Ù?Û? "
-"Ø´Ù?د. Ù?Ù?Ù?Ù?Ù? اÛ? از Ù?اÙ? Ù?ستعار بازپخشØ? \"بازپخش Ù?Û?داÙ?Û?اÛ? Ù?Ù?\" (\"MyVidaliaRelay\")."
 
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:50
@@ -110,59 +84,43 @@ msgid ""
 "goes wrong with your relay. You might also include your PGP or GPG key ID "
 "and fingerprint."
 msgstr ""
-"<b>اطÙ?اعات تÙ?اس</b>: آدرس اÛ?Ù?Û?Ù? Ø´Ù?ا. اÛ?Ù? آدرس Ù?Ù?Ø· براÛ? تÙ?اس با Ø´Ù?ا در صÙ?رتÛ? "
-"Ú©Ù? Û?Ú© برÙ?زرساÙ?Û? اÙ?Ù?Û?تÛ? ضرÙ?رت Ù¾Û?دا Ú©Ù?د Ù? Û?ا بازپخش Ø´Ù?ا دÚ?ار اشکاÙ? Ø´Ù?دØ? "
-"استÙ?ادÙ? Ù?Û? Ø´Ù?د. Ù?Ù?Ú?Ù?Û?Ù? Ù?Û? تÙ?اÙ?Û?د رÙ?ز Ø´Ù?اساÛ?Û? Ù? اÙ?گشت Ù?گارÛ? PGP Ù? Û?ا GPG را "
-"Ù?ارد Ú©Ù?Û?د. "
 
 #. 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 ""
-"<b>درگاÙ? بازپخش</b>: درگاÙ?Û? Ú©Ù? از Ø¢Ù? بازپخش Ø´Ù?ا بÙ? تراÙ?Û?Ú© کاربراÙ? Ù? Û?ا "
-"بازپخش Ù?اÛ? دÛ?گر Tor Ú¯Ù?Ø´ Ù?Û? دÙ?د. "
 
 #. 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."
-msgstr ""
-"اگر Ù?اÛ?Ù?Û?د Ù?Ù?رست بازپخش Ù?اÛ? Tor را براÛ? دÛ?گراÙ? بر رÙ?Û? شبکÙ? Ù?Ù?عکس Ú©Ù?Û?د Ù?Û? "
-"تÙ?اÙ?Û?د Ù?ربع Ù?جاÙ?ر <i>Ù?Ù?رست بازپخش را Ù?Ù?عکس Ú©Ù?</i> را تÛ?Ú© بزÙ?Û?د. اگر Ù¾Ù?Ù?اÛ? "
-"Ù?Ù?ار Ø´Ù?ا کاÙ?Û? Ù?Û?ستØ? اÛ?Ù? Ù?ربع را خاÙ?Û? بگذارÛ?د. اگر تصÙ?Û?Ù? گرÙ?تÛ?د Ú©Ù? Ù?Ù?رست "
-"بازپخش را Ù?Ù?عکس Ú©Ù?Û?دØ? Ù?Ø·Ù?ئÙ? Ø´Ù?Û?د Ú©Ù? <i>درگاÙ? Ù?Ù?رست</i> از <i>درگاÙ? "
-"بازپخش</i> Ú©Ù? در باÙ?ا Ù?ارد کردÛ?دØ? Ù?تÙ?اÙ?ت است. Ù¾Ù? Ù?اÛ? بازپخش <i>Ù?Û? باÛ?ست</i> "
-"Ù?Ù?رست بازپخش را Ù?Ù?عکس Ú©Ù?Ù?د.  "
+"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>
 #: en/server.html:71
 msgid "<a name=\"bandwidth\"/>"
-msgstr "<Û?Ú© Ù?اÙ?=\"Ù¾Ù?Ù?اÛ? Ù?Ù?ار\"/>"
+msgstr ""
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:72
 msgid "Bandwidth Limits"
-msgstr "حد Ù¾Ù?Ù?اÛ? Ù?Ù?ار"
+msgstr ""
 
 #. type: Content of: <html><body><p>
 #: en/server.html:74
 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 ""
-"Ù?عاÙ? سازÛ? بازپخش Tor بخش عظÛ?Ù?Û? از Ù¾Ù?Ù?اÛ? Ù?Ù?ار را اشغاÙ? Ù?Û? Ú©Ù?دØ? با اÛ?Ù? Ù?جÙ?دØ? "
-"Tor اÛ?Ù? اÙ?کاÙ? را اÛ?جاد Ù?Û? Ú©Ù?د Ú©Ù? Ø´Ù?ا Ù?Ù?دار Ù¾Ù?Ù?اÛ? Ù?Ù?ارÛ? Ú©Ù? Ù?اÛ?Ù?Û?د بÙ? شبکÙ? Tor "
-"اÙ?دا Ú©Ù?Û?د را Ù?حدÙ?د Ú©Ù?Û?د. Ù?Û? تÙ?اÙ?Û?د Ù?Ù?زÙ?اÙ? Ú©Ù? Û?Ú© بازپخش را Ù?عاÙ? Ù?Û? Ú©Ù?Û?دØ? "
-"ارتباط با شبکÙ? را براÛ? استÙ?ادÙ? خصÙ?صÛ? Ø®Ù?د Ø­Ù?ظ Ú©Ù?Û?د."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:80
@@ -171,76 +129,55 @@ msgid ""
 "connection speed. If you select <i>Custom</i>, you will be able to specify "
 "your own limits."
 msgstr ""
-"Ù?Û? باÛ?ست گزÛ?Ù?Ù? اÛ? Ú©Ù? بÛ?Ø´ از Ù?Ù?Ù? با سرعت اتصاÙ? Ø´Ù?ا Ù?Ù?اÙ?Ù?Ú¯ است را در Ù?Ù?Ù?Û? "
-"کرکرÙ? اÛ? (dropdown menu) تÛ?Ú© بزÙ?Û?د. اگر <i>سÙ?Û?Ù?Ù?</i> را اÙ?تخاب کردÙ? اÛ?دØ? Ù?Û? "
-"تÙ?اÙ?Û?د Ø®Ù?دتاÙ? تعÛ?Û?Ù? Ú©Ù?Û?د Ú©Ù? Ú?Ù? حدÛ? بÙ? کار Ø´Ù?ا Ù?Û? Ø¢Û?د."
 
 #. type: Content of: <html><body><h4>
 #: en/server.html:84
 msgid "Custom Limits"
-msgstr "Ù?حدÙ?دÛ?ت Ù?اÛ? Ø®Ù?دساختÙ?"
+msgstr ""
 
 #. type: Content of: <html><body><p>
 #: 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 ""
-"<i>Ù?رخ حداکثرÛ?</i> Ù?خزÙ?Û? از باÛ?ت است Ú©Ù? در دÙ?رÙ? Ù?اÛ? Ú©Ù?تاÙ? تراÙ?Û?Ú© باÙ?ا Ú©Ù? بÛ?Ø´ "
-"از ظرÙ?تÛ? است Ú©Ù? در<i>Ù?رخ Ù?تÙ?سط</i> تعÛ?Û?Ù? کردÙ? اÛ?دØ? بÙ? عÙ?Ù?اÙ? Ù?Û?رÙ?Û? Ú©Ù?Ú©Û? عÙ?Ù? "
-"Ù?Û? Ú©Ù?دØ? اÙ?ا در دراز Ù?دت Ù?Ù?Ú?Ù?اÙ? Ù?تÙ?سط Ù?Û? Ù?اÙ?د. Û?Ú© Ù?رخ Ù?تÙ?سط Ù?ازÙ?Ø? Ù?Ù?راÙ? با "
-"Ù?رخ حداکثرÛ? باÙ?اØ? در دراز Ù?دت Ù?رخ Ù?تÙ?سط را تÙ?Ù?Û?ت Ù?Û? Ú©Ù?د Ù? Ù?Ù?زÙ?اÙ? در ساعات "
-"Ø´Ù?Ù?غØ? اÙ?کاÙ? تراÙ?Û?Ú© شدÛ?دتر راØ? در صÙ?رتÛ? Ú©Ù? ظرÙ?Û?ت Ù?تÙ?سط بÙ? Ø·Ù?ر کاÙ?Ù? Ù?صرÙ? Ù?شدÙ? "
-"باشدØ? اÛ?جاد Ù?Û? Ú©Ù?د. اگر Ù?رخ Ù?تÙ?سط Ø´Ù?ا با<i>Ù?رخ حداکثرÛ?</i> Ø´Ù?ا Û?کساÙ? استØ? در "
-"اÛ?Ù? صÙ?رت Tor Ù?Û?Ú? Ù?Ù?ت از Ù?رخÛ? Ú©Ù? تعÛ?Û?Ù? کردÙ? اÛ?دØ? تجاÙ?ز Ù?Ù?Û? Ú©Ù?د. <i>Ù?رخ "
-"حداکثرÛ?</i> Ø´Ù?ا Ù?Û? باÛ?ست از <i>Ù?رخ Ù?تÙ?سط</i> بÛ?شتر Û?ا Ù?Ù?ساÙ? باشد. "
 
 #. type: Content of: <html><body><p>
 #: 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 ""
-"<i>Ù?رخ Ù?تÙ?سط</i> حداکثر Ù¾Ù?Ù?اÛ? Ù?Ù?ارÛ? با Ù?رخ Ù?تÙ?سط است Ú©Ù? براÛ? Ù?صرÙ? دراز Ù?دت "
-"(Ú©Û?Ù?Ù?باÛ?ت در ثاÙ?Û?Ù?) Ù?جاز است. براÛ? Ù?Ù?Ù?Ù?Ù?Ø? Ù?Ù?Ú©Ù? است گزÛ?Ù?Ù? 2 Ù?گاباÛ?ت در ثاÙ?Û?Ù? "
-"(2048 KB/s) Ù? Û?ا 50 Ú©Û?Ù?Ù?باÛ?ت در ثاÙ?Û?Ù? (اتصاÙ? Ú©Û?بÙ?Û? سرعت Ù?تÙ?سط) را اÙ?تخاب "
-"Ú©Ù?Û?د. Tor بÙ? 20 Ú©Û?Ù?Ù?باÛ?ت در ثاÙ?Û?Ù? Ù?Û?از دارد تا بازپخش را Ù?عاÙ? Ú©Ù?د."
 
 #. 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>."
 msgstr ""
-"Ù?کتÙ? با اÙ?Ù?Û?تÛ? Ú©Ù? باÛ?د بÙ? خاطر داشت Ø¢Ù? است Ú©Ù? Tor Ù¾Ù?Ù?اÛ? Ù?Ù?ار را <b>باÛ?ت</b> "
-" اÙ?دازÙ? Ù?Û? Ú¯Û?رد Ù?Ù? با بÛ?ت (bits). Ù?Ù?Ú?Ù?Û?Ù?Ø? Tor تÙ?Ù?ا بÙ? باÛ?ت Ù?اÛ? Ù?رÙ?دÛ? تÙ?جÙ? "
-"Ù?Û? Ú©Ù?د Ù?Ù? باÛ?ت Ù?اÛ? خرÙ?جÛ?. براÛ? Ù?ثاÙ? اگر بازپخش Ø´Ù?ا بÙ? عÙ?Ù?اÙ? Ù?Ù?عکس Ú©Ù?Ù?دÙ? "
-"Ù?Ù?رست عÙ?Ù? Ù?Û? Ú©Ù?Ù?دØ? اÙ?کاÙ? دارد باÛ?ت Ù?اÛ? خرÙ?جÛ? Ø´Ù?ا بÛ?شتر از باÛ?ت Ù?اÛ? Ù?رÙ?دÛ? Ø´Ù?ا "
-"باشد. اگر اÛ?Ù?Ø·Ù?ر باشد Ù? Ù?شار زÛ?ادÛ? بر Ù¾Ù?Ù?اÛ? Ù?Ù?ار Ø´Ù?ا Ù?ارد Ú©Ù?دØ? بÙ?تر است Ú?Ú© "
-"باکس <i>Ù?Ù?رست را Ù?Ù?عکس Ú©Ù?</i> تÛ?Ú© Ù?زÙ?Û?د."
 
 #. type: Content of: <html><body>
 #: en/server.html:111
 msgid "<a name=\"exitpolicy\"/>"
-msgstr "<Û?Ú© اسÙ?=\"Ù?Ù?ررات خرÙ?ج\"/>"
+msgstr ""
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:112
 msgid "Exit Policies"
-msgstr "Ù?Ù?ررات خرÙ?ج"
+msgstr ""
 
 #. type: Content of: <html><body><p>
 #: en/server.html:114
@@ -251,11 +188,6 @@ msgid ""
 "as mail to prevent spam and some default file sharing ports to reduce abuse "
 "of the Tor network."
 msgstr ""
-"Ù?Ù?ررات خرÙ?ج بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د تعÛ?Û?Ù? Ú©Ù?Û?د  دÛ?گر کاربراÙ? Tor از کداÙ? Ù?Ù?ابع "
-"اÛ?Ù?ترÙ?تÛ? Ø´Ù?ا Ù?جازÙ?د استÙ?ادÙ? Ú©Ù?Ù?د. Tor Û?Ú© Ù?Û?ست Ù¾Û?Ø´Ù?رض از Ù?Ù?ررات خرÙ?جØ? Ú©Ù? "
-"استÙ?ادÙ? بعضÛ? از سرÙ?Û?س Ù?ا Ù?ظÛ?ر اÛ?Ù?Û?Ù?Ø? براÛ? جÙ?Ù?Ú¯Û?رÛ? از ارساÙ? Ù?رزÙ?اÙ?Ù?Ø? Ù? Ú?Ù?د "
-"درگاÙ? اشتراک Ù?اÛ?Ù? Ù¾Û?Ø´Ù?رض شدÙ?Ø? براÛ? جÙ?Ù?Ú¯Û?رÛ? از سÙ?Ø¡ استÙ?ادÙ? Ø®Ù?اÙ? از شبکÙ? Tor "
-"را Ù?سدÙ?د Ù?Û? Ú©Ù?د. "
 
 #. type: Content of: <html><body><p>
 #: en/server.html:121
@@ -267,131 +199,121 @@ msgid ""
 "checked, Tor users will be able to access other services not covered by the "
 "other checkboxes or Tor's default exit policy."
 msgstr ""
-"Ù?ر Ú?Ú© باکس Ù?ربÙ?Ø· بÙ? Û?Ú© Ù?Ù?ع از Ù?Ù?ابعÛ? است Ú©Ù? Ø´Ù?ا Ù?Û? تÙ?اÙ?Û?د بÙ? کاربراÙ? Tor "
-"اجازÙ? بدÙ?Û?د از طرÛ?Ù? Ø¢Ù? بÙ? بازپخش Ø´Ù?ا دسترسÛ? Ù¾Û?دا Ú©Ù?Ù?د. اگر Ú?Ú© باکس Ú©Ù?ار Û?Ú© "
-"Ù?Ù?بع را تÛ?Ú© Ù?زÙ?Û?دØ? کاربراÙ? Tor Ù?جاز بÙ? دسترسÛ? بÙ? Ø¢Ù? Ù?Ù?بع از طرÛ?Ù? بازپخش Ø´Ù?ا "
-"Ù?Ø®Ù?اÙ?Ù?د بÙ?د. اگر باکس <i>Misc Other Services</i> تÛ?Ú© شدÙ? باشدØ? کاربراÙ? Tor "
-"Ù?ادر Ø®Ù?اÙ?Ù?د بÙ?د بÙ? دÛ?گر سرÙ?Û?س Ù?اÛ?Û? Ú©Ù? شاÙ?Ù? Ú?Ú© باکس Ù?اÛ? دÛ?گر Ù? Û?ا Ù?Ù?ررات خرÙ?ج "
-"Ù¾Û?Ø´Ù?رض شدÙ? Tor Ù?Ù?Û? Ø´Ù?Ù?دØ? دسترس داشتÙ? باشÙ?د. "
 
 #. type: Content of: <html><body><p>
 #: en/server.html:130
 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 ""
-"براÛ? تکÙ?Û?Ù?Ø? جدÙ?Ù? زÛ?رØ? Ù?Û?ستÛ? از Ø´Ù?ارÙ? درگاÙ? Ù?اÛ? Ù?عÛ?Ù? با Ú?Ú© باکس Ù?ربÙ?Ø· بÙ? Ø¢Ù? "
-"درگاÙ? بÙ? دست Ù?Û? دÙ?د. ستÙ?Ù?<b>شرح</b> Ù?Ù?ابعÛ? را Ù?عÛ?Ù? Ù?Û? Ú©Ù?د Ú©Ù? کاربراÙ? Tor "
-"Ù?جاز Ø®Ù?اÙ?Ù?د بÙ?د از طرÛ?Ù? بازپخش Ø´Ù?ا بÙ? Ø¢Ù? دسترسÛ? Û?ابÙ?دØ? اگر باکس Ù?ربÙ?Ø· تÛ?Ú© "
-"Ø®Ù?ردÙ? باشد. "
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:138
 msgid "<b>Checkbox</b>"
-msgstr "<b>Ú?Ú© باکس</b>"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:139
 msgid "<b>Ports</b>"
-msgstr "<b>درگاÙ? Ù?ا</b>"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:140
 msgid "<b>Description</b>"
-msgstr "<b>شرح</b>"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:143
 msgid "Websites"
-msgstr "Ù?بساÛ?ت Ù?ا"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:144
 msgid "80"
-msgstr "80"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:145
 msgid "Normal, unencrypted Web browsing"
-msgstr "Ù?رÙ?ر Ù?ب Ù?رÙ?اÙ? Ù? رÙ?زبÙ?دÛ? Ù?شدÙ?"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:148
 msgid "Secure Websites (SSL)"
-msgstr "Ù?بساÛ?ت Ù?اÛ? اÙ?Ù? (SSL)"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:149
 msgid "443"
-msgstr "443"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:150
 msgid "Encrypted Web browsing"
-msgstr "Ù?رÙ?ر Ù?ب رÙ?زبÙ?دÛ? شدÙ?"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:153
 msgid "Retrieve Mail (POP, IMAP)"
-msgstr "بازÛ?ابÛ? ارساÙ?ات (POP , IMAP)"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:154
 msgid "110, 143, 993, 995"
-msgstr "995, 993, 143, 110"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:155
 msgid "Downloading email (does not permit sending email)"
-msgstr "بارگÛ?رÛ? اÛ?Ù?Û?Ù? (اجازÙ? ارساÙ? اÛ?Ù?Û?Ù? Ù?Ù?Û? دÙ?د)"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:158
 msgid "Instant Messaging (IM)"
-msgstr "ارساÙ? Ù?Ù?رÛ? Ù¾Û?اÙ?"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:159
 msgid "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888"
-msgstr "703Ø?1863Ø?5050Ø?5190Ø?5222Ø?5223Ø?8300Ø?8888"
+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>
 #: en/server.html:163
 msgid "Internet Relay Chat (IRC)"
-msgstr "Ú?ت بازپخش اÛ?Ù?ترÙ?تÛ? (IRC)"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:164
 msgid "6660-6669, 6697, 7000-7001"
-msgstr "6660-6669, 6697, 7000-7001"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:165
 msgid "IRC clients and servers"
-msgstr "کاربراÙ? Ù? سرÙ?Û?سدÙ?Ù?دگاÙ? Ø¢Û? آر سÛ?"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:168
 msgid "Misc. Other Services"
-msgstr "دÛ?گر سرÙ?Û?س Ù?اÛ? Ù?تÙ?رÙ?Ù?"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:169
 msgid "*"
-msgstr "*"
+msgstr ""
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:170
 msgid "All other applications that aren't covered by the previous checkboxes"
-msgstr "تÙ?اÙ?Û? دÛ?گر برÙ?اÙ?Ù? Ù?اÛ? کاربردÛ? Ú©Ù? شاÙ?Ù? Ú?Ú© باکس Ù?اÛ? Ù¾Û?Ø´Û?Ù? Ù?Ù?Û? Ø´Ù?Ù?د."
+msgstr ""
 
 #. type: Content of: <html><body><p>
 #: en/server.html:175
@@ -402,11 +324,6 @@ msgid ""
 "network.  Your relay will allow other Tor users to connect to the Tor "
 "network and will help relay traffic between other Tor relays."
 msgstr ""
-"اگر Ù?اÛ?Ù? Ù?Û?ستÛ?د دÛ?گر کاربراÙ? Tor از طرÛ?Ù? بازپخش Ø´Ù?ا با خارج از شبکÙ? Tor در "
-"ارتباط باشÙ?دØ? Ù?Û?Ú?کداÙ? از Ú?Ú© باکس Ù?ا را تÛ?Ú© Ù?زÙ?Û?د. حتÛ? اگر Ù?Û?Ú? کداÙ? از Ú?Ú© "
-"باکس Ù?ا را تÛ?Ú© Ù?زÙ?Û?دØ? بازپخش Ø´Ù?ا Ù?Ù?Ú?Ù?اÙ? براÛ? شبکÙ? Tor سÙ?دÙ?Ù?د Ø®Ù?اÙ?د بÙ?د. "
-"بازپخش Ø´Ù?ا بÙ? دÛ?گر کاربراÙ? Tor اÙ?کاÙ? Ù?Û? دÙ?د Ú©Ù? بÙ? شبکÙ? Tor Ù?تصÙ? Ø´Ù?Ù?د Ù? Ù?Û?ز "
-"بÙ? بازپخش تراÙ?Û?Ú© Ù?Û?اÙ? دÛ?گر بازپخش Ù?اÛ? Tor Ú©Ù?Ú© Ù?Û? Ú©Ù?د. "
 
 #. type: Content of: <html><body><p>
 #: en/server.html:182
@@ -415,36 +332,27 @@ msgid ""
 "grayed out, since bridge relays do not allow exit connections. Bridges are "
 "only used by Tor clients to connect to the Tor network."
 msgstr ""
-"اگر تصÙ?Û?Ù? گرÙ?تÛ?د Û?Ú© Ù¾Ù? بازپخش Ù?عاÙ? Ú©Ù?Û?دØ? Ú©Ù?Û?د <i>Ù?Ù?ررات خرÙ?ج</i> خاکسترÛ? Ù?Û? "
-"Ø´Ù?دØ? Ù? Ù¾Ù? Ù?اÛ? بازپخش اجازÙ? ارتباطات خرÙ?جÛ? را Ù?Ù?Û? دÙ?Ù?د. Ù¾Ù? Ù?ا تÙ?Ù?ا تÙ?سط "
-"Ù?شترÛ?اÙ? Tor براÛ? اتصاÙ? بÙ? شبکÙ? Tor استÙ?ادÙ? Ù?Û? Ø´Ù?د. "
 
 #. type: Content of: <html><body>
 #: en/server.html:188
 msgid "<a name=\"upnp\"/>"
-msgstr "<a name=\"upnp\"/>"
+msgstr ""
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:189
 msgid "Port Forwarding"
-msgstr "ارساÙ? درگاÙ?"
+msgstr ""
 
 #. type: Content of: <html><body><p>
 #: 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."
-msgstr ""
-"بسÛ?ارÛ? از کاربراÙ? خاÙ?Ú¯Û? از طرÛ?Ù? <i>router</i> بÙ? اÛ?Ù?ترÙ?ت Ù?صÙ? Ù?Û? Ø´Ù?Ù?د Ú©Ù? بÙ? "
-"Ù?Ù?زÙ?اÙ? بÙ? Ú?Ù?دÛ?Ù? کاÙ?Ù¾Û?Ù?تر اجازÙ? Ù?Û?دÙ?د Ú©Ù? از Û?Ú© اتصاÙ? اÛ?Ù?ترÙ?تÛ? Ù?احد استÙ?ادÙ? "
-"Ú©Ù?Ù?د. بعضÛ? از کاربراÙ? Ù?Ù?Ú©Ù? است تÙ?سط <i>firewall</i> Ú©Ù? اتصاÙ? Ù?رÙ?دÛ? بÙ? "
-"کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا از طرÛ?Ù? دÛ?گر کاÙ?Ù¾Û?Ù?ترÙ?اÛ? Ø¢Ù?Ù?اÛ?Ù? را Ù?سدÙ?د Ù?Û? Ú©Ù?د. اگر Ù?Û? Ø®Ù?اÙ?Û?د "
-"بازپخش Tor را Ù?عاÙ? Ú©Ù?Û?د دÛ?گر کارکÙ?اÙ? Ù? Ù?شترÛ?اÙ?  Tor Ù? بازپخش Ù?ا Ù?Û? باÛ?ست "
-"Ù?جاز باشÙ?د از طرÛ?Ù? router خاÙ?Ú¯Û? Ù? Û?ا 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>
 #: en/server.html:200
@@ -455,27 +363,17 @@ msgid ""
 "firewall to \"forward\" all connections to certain ports on your router or "
 "firewall to local ports on your computer."
 msgstr ""
-"اگر بخÙ?اÙ?Û?د بازپخش Ø®Ù?د را در دسترس عÙ?Ù?Ù? Ù?رار دÙ?Û?د Ù?Û? باÛ?ست <i>port "
-"forwarding</i>(ارساÙ? درگاÙ?) را راÙ? اÙ?دازÛ? Ú©Ù?Û?د تا router Û?ا firewall Ø´Ù?ا "
-"بداÙ?د کداÙ? درگاÙ? Ù?ا Ù?جاز بÙ? Ù?رÙ?د از طرÛ?Ù? کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا Ù?ستÙ?د. ارساÙ? "
-"درگاÙ?router Û?ا firewall تÙ?ظÛ?Ù? Ù?Û? Ú©Ù?د تا تÙ?اÙ?Û? اتصاÙ? درگاÙ? Ù?اÛ? Ù?عÛ?Ù? router Ù? "
-"Û?ا firewall را بÙ? درگاÙ? Ù?اÛ? Ù?Ø­Ù?Û? کاÙ?Ù¾Û?Ù?تر Ø´Ù?ا \"ارساÙ?\" Ú©Ù?د."
 
 #. type: Content of: <html><body><p>
 #: 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."
 msgstr ""
-" اگر باکس <i> اÙ?داÙ? بÙ? تÙ?ظÛ?Ù? اتÙ?Ù?اتÛ?Ú© ارساÙ? درگاÙ?</i> را تÛ?Ú© بزÙ?Û?دØ? Vidalia "
-"اÙ?داÙ? بÙ? راÙ? اÙ?دازÛ? اتÙ?Ù?اتÛ?Ú© ارساÙ? Ù¾Ù?رت بر رÙ?Û? شبکÙ? اتصاÙ? Ù?Ø­Ù?Û? Ø´Ù?ا Ù?Û? Ú©Ù?د تا "
-"دÛ?گر کاربراÙ? Tor بتÙ?اÙ?Ù?د بÙ? بازپخش Ø´Ù?ا Ù?تصÙ? Ø´Ù?Ù?د. Ù?Û? تÙ?اÙ?Û?د دکÙ?Ù? "
-"<i>Test</i> Ú©Ù?ار Ú?Ú© باکس را بزÙ?Û?د تا ببÛ?Ù?Û?د Ø¢Û?ا Vidalia Ù?Û? تÙ?اÙ?د بÙ? Ø·Ù?ر "
-"اتÙ?Ù?اتÛ?Ú© براÛ? Ø´Ù?ا ارساÙ? درگاÙ? را راÙ? اÙ?دازÛ? Ú©Ù?د Û?ا Ù?Ù?."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:217
@@ -487,25 +385,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/\";>http://192.168.0.1</a> or <a "
-"href=\"http://192.168.1.1/\";>http://192.168.1.1</a> in your Web browser. You "
-"should consult your router's instruction manual for more information."
-msgstr ""
-"اگر دکÙ?Ù? <i>Test</i> درÛ?ابد Ú©Ù? Vidalia Ù?ادر Ù?Û?ست براÛ? Ø´Ù?ا ارساÙ? درگاÙ? را راÙ? "
-"اÙ?دازÛ? Ú©Ù?دØ? شاÛ?د Ù?ازÙ? Ø´Ù?د اÛ?Ù? گزÛ?Ù?Ù? را رÙ?Û? router Ù?عاÙ? Ú©Ù?Û?د Ù? Û?ا ارساÙ? "
-"درگاÙ? را Ø®Ù?دتاÙ? عÙ?Ù?Ù? Ù?عاÙ? Ú©Ù?Û?د. بعضÛ? از دستگاÙ? Ù?اÛ? Ù?Ù?رد استÙ?ادÙ? شبکÙ? گزÛ?Ù?Ù? "
-"اÛ? دارÙ?د بÙ? Ù?اÙ? <i>Universal Plug-and-Play</i> (UPnP). اگر بÙ? بخش تÙ?ظÛ?Ù?ات "
-"اجراÛ?Û? router Ø®Ù?د دسترسÛ? دارÛ?دØ? باÛ?د دÙ?باÙ? گزÛ?Ù?Ù? اÛ? بگرددÛ?د Ú©Ù? UPnP را Ù?عاÙ? "
-"Ú©Ù?د. بخش تÙ?ظÛ?Ù?ات اجراÛ?Û? بÛ?شتر rounterÙ?ا با باز کردÙ? <a "
-"href=\"http://192.168.0.1/\";>http://192.168.0.1</a>Ø? Ù? Û?ا <a "
-"href=\"http://192.168.1.1/\";>http://192.168.1.1</a> در  Ù?رÙ?رگر Ù?بØ? Ù?ابÙ? دسترسÛ? "
-"است. براÛ? اطÙ?اعات بÛ?شتر بÙ? راÙ?Ù?Ù?اÛ? استÙ?ادÙ? از rounter Ø®Ù?د Ù?راجعÙ? Ú©Ù?Û?د."
+"href=\"http://192.168.1.1/\";>http://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\";> "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" 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 "
@@ -513,11 +402,5 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
-"اگر Ù?Û? Ø®Ù?اÙ?Û?د ارساÙ? درگاÙ? را بÙ? صÙ?رت دستÛ? Ù?عاÙ? Ú©Ù?Û?دØ? راÙ?Ù?Ù?اÛ? راÙ? اÙ?دازÛ? "
-"ارساÙ? درگاÙ? بسÛ?ارÛ? از routerÙ?ا Ù? firewallÙ?ا  در اÛ?Ù? Ù?بساÛ?ت Ù?Ù?جÙ?د است: <a hre"
-"f=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.ht";
-"m\"> portforward.com</a>. دست Ú©Ù?Ø? Ù?Û? باÛ?ست<i>Relay Port</i> (درگاÙ? بازپخش) "
-"Ø®Ù?د را ارساÙ? Ú©Ù?Û?د Ú©Ù? بر رÙ?Û? درگاÙ? 443 در Ù?Û?Ù?دÙ?ز Ù? 9001 در دÛ?گر سÛ?ستÙ? Ù?اÛ? "
-"عاÙ?Ù?Ø? Ù¾Û?Ø´Ù?رض شدÙ? است. Ù? Ù?Û?زØ? اگر باکس <i>Mirror the relay directory</i> را "
-"تÛ?Ú© زدÙ? اÛ?دØ? Ù?Û? باÛ?ست <i>Directory Port</i> Ø®Ù?د را Ù?Û?ز ارساÙ? Ú©Ù?Û?د. در تÙ?اÙ? "
-"سÛ?ستÙ? Ù?اÛ? عاÙ?Ù?Ø?<i>Directory Port</i> بر 9030 Ù¾Û?Ø´Ù?رض شدÙ? است."
+
+
diff --git a/fa/services.po b/fa/services.po
index ed12243..46d7ee7 100644
--- a/fa/services.po
+++ b/fa/services.po
@@ -1,34 +1,25 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+#   <aalaeiarash@xxxxxxxxx>, 2011.
+#   <behravanhamed@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-26 18:52+0200\n"
-"Last-Translator: Ghazal <nevisht@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-07-05 19:48+0000\n"
+"Last-Translator: arashaalaei <aalaeiarash@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: fa\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: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/services.html:16
 msgid "Hidden Services"
-msgstr "سرÙ?Û?س Ù?اÛ? Ù?Ø®Ù?Û?"
+msgstr "خدÙ?ات Ù¾Ù?Ù?اÙ?"
 
 #. type: Content of: <html><body>
 #: en/services.html:19
@@ -39,17 +30,13 @@ msgid ""
 "goes wrong. If you find bugs or have comments on this new feature, please "
 "let us know! We need your feedback.  <a name=\"about\"/>"
 msgstr ""
-"تÙ?جÙ?: سرÙ?Û?س پشتÛ?باÙ?Û? از سرÙ?Û?س Ù?اÛ? Ù?Ø®Ù?Û? در Vidalia تازÙ? است. در Ù?ظر داشتÙ? "
-"باشÛ?د Ú©Ù? اÛ?Ù? سرÙ?Û?س Ù?Ù?Ú©Ù? است باگ (Ù?ارساÛ?Û?) داشتÙ? باشد Ù? برخÛ? از اÛ?Ù? باگ Ù?ا "
-"تÙ?ظÛ?Ù? سرÙ?Û?س Ù?اÛ? Ù?Ø®Ù?Û? Ø´Ù?ا را دÚ?ار اشکاÙ? Ú©Ù?Ù?د. بÙ? اÛ?Ù? سرÙ?Û?س Ù?باÛ?د اطÙ?Û?Ù?اÙ? کاÙ?Ù? "
-"داشتØ? Ù? Ù?Û?زØ? اگر اشکاÙ?Û? Ù¾Û?Ø´ Ø¢Ù?د Ù?ا را Ø´Ù?اتت Ù?Ú©Ù?Û?د. اگر با اشکاÙ? Ù?Ù?اجÙ? شدÛ?د "
-"Ù? Û?ا Ù¾Û?Ø´Ù?Ù?ادÛ? در Ù?Ù?رد اÛ?Ù? برÙ?اÙ?Ù? جدÛ?د داشتÛ?دØ? Ø®Ù?اÙ?Ø´Ù?Ù?دÛ?Ù? با Ù?ا در Ù?Û?اÙ? "
-"بگذارÛ?د. Ù?Ù?تظر درÛ?اÙ?ت Ù?ظرات Ø´Ù?ا Ù?ستÛ?Ù?. "
+"Ù?کتÙ? : پشتÛ?باÙ?Û? از خدÙ?ات Ù?Ø®Ù?Û?  در Ù?Û?داÙ?Û?ا بتازگÛ? صÙ?رت گرÙ?تÙ?. باÛ?د اÙ?تظار اشکاÙ?ات را داشتÙ? باشÛ?د Ø? Ú©Ù? بعضÛ? از Ø¢Ù?Ù?ا احتÙ?اÙ?ا Ù¾Û?کربÙ?دÛ? خدÙ?ات شبکÙ? Ø´Ù?ا را بÙ?Ù? Ø®Ù?اÙ?د زد. بÙ?ابراÛ?Ù? Ø? بر رÙ?Û? Ø¢Ù? تکÛ?Ù? Ù?Ú©Ù?Û?د Ø? Û?ا حداÙ?Ù? Ø? Ù?ا را سرزÙ?Ø´ Ù?Ù?Û? Ú©Ù?Û?د اگر Ú?Û?زÛ? اشتباÙ? است. اگر Ø´Ù?ا باگ Ù¾Û?دا کردÙ? اÛ?د Û?ا Ù?ظرÛ? دارÛ?د Ø? Ù?Ø·Ù?ا بÙ? Ù?ا اطÙ?اع دÙ?Û?د! Ù?ا Ù?Û?از بÙ? Ù?ظرات Ø´Ù?ا دارÛ?Ù?\n"
+"<a name=\"about\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:26
 msgid "What is a hidden service?"
-msgstr "سرÙ?Û?س Ù?Ø®Ù?Û? Ú?Û?ستØ?"
+msgstr " سرÙ?Û?س Ù?Ø®Ù?Û? Ú?Û?ستØ?"
 
 #. type: Content of: <html><body><p>
 #: en/services.html:28
@@ -59,10 +46,11 @@ msgid ""
 "provide a hidden service is built on top of the same circuits that Tor uses "
 "for anonymous browsing and roughly has similar anonymity properties."
 msgstr ""
-"سرÙ?Û?س Ù?Ø®Ù?Û? بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د Ù?ر Ù?Ù?ع سرÙ?Û?س TCPÙ?Ø«Ù? سرÙ?Û?س HTTP را در اختÛ?ار "
-"دÛ?گراÙ? بگذارÛ?د بدÙ?Ù? اÛ?Ù? Ú©Ù? آدرس Ø¢Û? Ù¾Û? Ø®Ù?د Ø´Ù?ا آشکار Ø´Ù?د. Ù¾Û?Ø´Ù?Ù?Û?س Ù?رارداد "
-"ارائÙ? سرÙ?Û?س Ù?Ø®Ù?Û? بر رÙ?Û? Ù?Ù?اÙ? Ù?دارÛ? Ú©Ù? کار شدÙ? است Ú©Ù? Tor براÛ? Ù?رÙ?رگرÛ? Ù?Ø®Ù?Û? "
-"استÙ?ادÙ? Ù?Û? Ú©Ù?د Ù? تÙ?رÛ?بÙ? از Ù?Û?Ú?Ú¯Û? Ù?اÛ? Ù?شابÙ? براÛ? استتار Ù?Ù?Û?ت برخÙ?ردار است.  "
+" خدÙ?ات Ù¾Ù?Ù?اÙ? بÙ? Ø´Ù?ا اجازÙ? ارائÙ? Ù?ر Ù?Ù?ع خدÙ?ات Ù?بتÙ?Û? بر تÛ? سÛ? Ù¾Û? Ø? را Ù?Û? دÙ?د "
+"بÙ? عÙ?Ù?اÙ? Ù?ثاÙ? سرÙ?Û?س اÚ? تÛ? تÛ? Ù¾Û? Ø? بدÙ?Ù?  اÛ?Ù?Ú©Ù? آدرس Ø¢Û? Ù¾Û? Ø´Ù?ا را بÙ? دÛ?گراÙ? "
+"بدÙ?د. اÛ?Ù? پرÙ?تکÙ? براÛ? ارائÙ? خدÙ?ات Ù¾Ù?Ù?اÙ? است Ù? رÙ?Û? Ù?دارÙ?اÛ?Û? Ú©Ù? تÙ?ر از Ø¢Ù?Ù?ا "
+"براÛ? جستجÙ? استÙ?ادÙ? Ù?Û? Ú©Ù?د ساختÙ? شدÙ? Ù? براÛ? Ù?رÙ?ر Ù?اشÙ?اس Ù? Ú¯Ù?Ù?اÙ? تÙ?رÛ?با داراÛ? "
+"Ø®Ù?اص Ù?شابÙ? ساختÙ? شدÙ? است."
 
 #. type: Content of: <html><body><p>
 #: en/services.html:35
@@ -71,24 +59,24 @@ msgid ""
 "Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous "
 "Specification (doc/spec/rend-spec.txt)."
 msgstr ""
-"براÛ? اطÙ?اعات بÛ?شتر در Ù?Ù?رد سرÙ?Û?س Ù?Ø®Ù?Û? Ù?Û? تÙ?اÙ?Û?د بخش 5 از Ù?Ù?اÙ?Ù? ساختار Tor در "
-"(doc/design-paper/tor-design.pdf) Ù? Û?ا شاخصÙ? Û? Ù?Û?عادگاÙ? را (doc/spec/rend-"
+"براÛ? اطÙ?اعات بÛ?شتر از خدÙ?ات Ù¾Ù?Ù?اÙ? Ù?Û? تÙ?اÙ?Û?د از بخش Ûµ Ù?سÙ?ت طراحÛ? تÙ?ر را (DOC "
+"/ طراحÛ? کاغذ / TOR - design.pdf)Ù?شخصات Ù? (DOC / Ù?شخصات / پارÙ? کردÙ? - "
 "spec.txt) را بخÙ?اÙ?Û?د."
 
 #. type: Content of: <html><body>
 #: en/services.html:40
 msgid "<a name=\"provide\"/>"
-msgstr "<Û?Ú© اسÙ?=\"ارائÙ?\"/>"
+msgstr "<a name=\"provide\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:41
 msgid "How do I provide a hidden service?"
-msgstr "Ú?Ú¯Ù?Ù?Ù? سرÙ?Û?س Ù?Ø®Ù?Û? ارائÙ? Ú©Ù?Ù?Ø?"
+msgstr "Ú?Ú¯Ù?Ù?Ù? Ù?Û?تÙ?اÙ? سرÙ?Û?س Ù?Ø®Ù?Û? اراÛ?Ù? کردØ?"
 
 #. type: Content of: <html><body><p>
 #: en/services.html:43
 msgid "Providing a hidden service consists of at least two steps:"
-msgstr "ارائÙ? سرÙ?Û?س Ù?Ø®Ù?Û? شاÙ?Ù? دست Ú©Ù? دÙ? Ù?رحÙ?Ù? Ù?Û? Ø´Ù?د:"
+msgstr "ارائÙ? سرÙ?Û?س Ù?Ø®Ù?Û? Ù?تشکÙ? از حداÙ?Ù? دÙ? Ù?رحÙ?Ù? است :"
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/services.html:45
@@ -96,8 +84,8 @@ msgid ""
 "Install a web server locally (or a server for whatever service you want to "
 "provide, e.g. IRC) to listen for local requests."
 msgstr ""
-"Ù?صب Û?Ú© سرÙ?Û?س دÙ?Ù?دÙ? Ù?ب بر سÛ?ستÙ? (Ù? Û?ا Ù?ر سرÙ?Û?س دÙ?Ù?دÙ? اÛ? Ú©Ù? سرÙ?Û?سÛ? Ú©Ù? Ù?اÛ?Ù? بÙ? "
-"ارائÙ? Ù?ستÛ?د را ارائÙ? Ú©Ù?دØ? Ù?ظÛ?ر IRC) براÛ? Ø´Ù?Ù?د Ù?طاÙ?بات Ù?Ø­Ù?Û?. "
+"Ù?صب Û?Ú© Ù?ب سرÙ?ر Ù?Ø­Ù?Û? (Ù? Û?ا Û?Ú© سرÙ?ر براÛ? Ù?ر سرÙ?Û?س Ø´Ù?ا Ù?Û? Ø®Ù?اÙ?Û?د براÛ? ارائÙ? Ø? "
+"بÙ? عÙ?Ù?اÙ? Ù?ثاÙ? Ø¢Û? آر سÛ?) بÙ? Ú¯Ù?Ø´ دادÙ? بÙ? درخÙ?است Ù?اÛ? Ù?Ø­Ù?Û? است."
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/services.html:47
@@ -105,29 +93,27 @@ msgid ""
 "Configure your hidden service, so that Tor relays requests coming from Tor "
 "users to your local server."
 msgstr ""
-"سرÙ?Û?س Ù?Ø®Ù?Û? Ø®Ù?د را تÙ?ظÛ?Ù? Ú©Ù?Û?د تا Ù?طاÙ?بات بازپخش Tor از طرÙ? کاربراÙ? Tor بÙ? "
-"سرÙ?Û?س دÙ?Ù?دÙ? Ù?Ø­Ù?Û? Ø´Ù?ا برسد."
+"Ù¾Û?کربÙ?دÛ? سرÙ?Û?س Ù?اÛ? Ù?Ø®Ù?Û? Ø®Ù?د را تÙ?ظÛ?Ù? Ú©Ù?Û?د Ø? بÙ? Ø·Ù?رÛ? Ú©Ù? درخÙ?است رÙ?Ù? تÙ?ر از "
+"کاربراÙ? تÙ?ر را بÙ? سرÙ?ر Ù?اÛ? Ù?Ø­Ù?Û? Ø®Ù?د بÙ?رستÛ?د"
 
 #. 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 ""
-"Ø¢Ù?Ù?ختارÛ? بسÛ?ار عاÙ?Û? در Ù?بساÛ?ت Tor (https://www.torproject.org/docs/tor-";
-"hidden-service.html) Ù?Ù?جÙ?د است Ú©Ù? تÙ?اÙ? اÛ?Ù? Ù?راحÙ? را با جزئÛ?ات بÛ?شتر شرح Ù?Û? "
-"دÙ?د."
+"Û?Ú© Ù?Ø·Ù?ب Ø¢Ù?Ù?زشÛ? Ø®Ù?ب در Ù?ب ساÛ?ت تÙ?ر  Ù?Ù?جÙ?د است\n"
+"(https://www.torproject.org/docs/tor-hidden-service.html) Ú©Ù? شرح اÛ?Ù? Ù?راحÙ? را با جزئÛ?ات بÛ?شتر در Ø®Ù?د دارد."
 
 #. type: Content of: <html><body>
 #: en/services.html:55
 msgid "<a name=\"data\"/>"
-msgstr "<Û?Ú© اسÙ?=\"اطÙ?اعات\"/>"
+msgstr "<a name=\"data\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:56
 msgid "What data do I need to provide?"
-msgstr "Ú?Ù? اطÙ?اعاتÛ? را Ù?Û? باÛ?ست ارائÙ? Ú©Ù?Ù?Ø?"
+msgstr "Ú?Ù? دادÙ? Ù?ا Û?Û? را براÛ? ارائÙ? Ù?Û?از دارÙ?Ø? "
 
 #. type: Content of: <html><body><p>
 #: en/services.html:58
@@ -135,41 +121,42 @@ msgid ""
 "The services table contains five columns containing data about configured "
 "hidden services:"
 msgstr ""
-"جدÙ?Ù? سرÙ?Û?سØ? داراÛ? Ù¾Ù?ج ستÙ?Ù? حاÙ?Û? اطÙ?اعات در سرÙ?Û?س Ù?اÛ? Ù?Ø®Ù?Û? تÙ?ظÛ?Ù? شدÙ? است. "
+"جدÙ?Ù? خدÙ?ات حاÙ?Û? Ù¾Ù?ج ستÙ?Ù? داراÛ? دادÙ? Ù?Ù?رد Ù?ظر براÛ? Ù¾Û?کربÙ?دÛ?  خدÙ?ات Ù¾Ù?Ù?اÙ? است "
+":"
 
 #. type: Content of: <html><body><p><ul><li>
 #: 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 ""
-"آدرس رÙ?ترÙ?اÛ? Ù¾Û?ازÛ? (Ù?Ù?Ù?د): آدرس سرÙ?Û?س (Û?ا Ù¾Û?از) بÙ? Ù?سÛ?Ù?Ù? Tor تÙ?Ù?Û?د شدÙ? تا بÙ? "
-"Ú¯Ù?Ù?Ù? اÛ? Ù?Ù?حصر بÙ? Ù?رد سرÙ?Û?س Ø´Ù?ا را Ø´Ù?اساÛ?Û? Ú©Ù?د. اÛ?Ù? آدرس Ù¾Û?ازÛ? را بÙ? کساÙ?Û? "
-"Ú©Ù? Ù?رار است بÙ? سرÙ?Û?س Ø´Ù?ا دسترسÛ? داشتÙ? باشÙ?د بدÙ?Û?د. Ù?Û? تÙ?اÙ?Û?د از Ú©Ù?Û?د (Ú©Ù¾Û? Ú©Ù? "
-"رÙ?Û? Ú©Ù?Û?پبÙ?رد) تا اشتباÙ? تاÛ?Ù¾Û? جÙ?Ù?Ú¯Û?رÛ? Ú©Ù?Û?د. اگر درجا Û?Ú© سرÙ?Û?س Ù?Ø®Ù?Û? اÛ?جاد "
-"کردÙ? اÛ?دØ? Ù?Ø­Û?Ø· اÛ?Ù?Ú¯Ù?Ù?Ù? Ø®Ù?اÙ?دÙ? Ø®Ù?اÙ?د شد \"[Created by Tor]Ø? براÛ? اÛ?Ù? Ú©Ù? آدرس "
-"Ù¾Û?ازÛ? Ù?اÙ?عÛ? را Ù?شاÙ? دÙ?دØ? Ù?Û? باÛ?ست تÙ?ظÛ?Ù?ات Ø®Ù?د را سÛ?Ù? Ú©Ù?Û?د Ù? Ù¾Ù?جرÙ? تÙ?ظÛ?Ù?ات "
-"Ù?Ø­Û?Ø· را بازگشاÛ?Û? Ú©Ù?Û?د."
+"آدرس  Ù¾Û?از (تÙ?Ù?Û?دشدÙ?) :  آدرس Ù?اÛ? اÛ?Ù? سرÙ?Û?س (Ù? Û?ا Ù¾Û?از) تÙ?سط تÙ?ر تÙ?Ù?Û?د شدÙ? "
+"تا بطÙ?ر Ù?Ù?حصر بÙ? Ù?رد Ù?ادر بÙ? Ø´Ù?اساÛ?Û? خدÙ?ات کاربراÙ? باشد.  اÛ?Ù? آدرس  Û?ا Ù¾Û?از "
+"را بÙ? اÙ?رادÛ?  بدÙ?Û?د Ú©Ù? Ù?Û? Ø®Ù?اÙ?Û?د Ù?ادر بÙ? دسترسÛ? بÙ? خدÙ?ات Ø´Ù?ا باشÙ?د. براÛ? "
+"جÙ?Ù?Ú¯Û?رÛ? از غÙ?Ø· اÙ?Ù?اÛ?Û? Ù?Û?تÙ?اÙ?Û?د \"Ú©Ù¾Û? بÙ? Ú©Ù?Û?Ù¾ بÙ?رد\" را Ù?شار دÙ?Û?د . اگر Ø´Ù?ا "
+"بتازگÛ? Û?Ú© سرÙ?Û?س Ù?Ø®Ù?Û? اÛ?جاد کردÙ? اÛ?د Ø? Ú©Ù? در زÙ?Û?Ù?Ù? Ø¢Ù? Ù?Ù?شتÙ? شدÙ? : \"اÛ?جاد شدÙ?"
+" تÙ?سط تÙ?ر\" Ø? بÙ? Ù?Ù?ظÙ?ر Ù?Ù?اÛ?Ø´ Ù¾Û?از آدرس Ø¢Ù? Ø? Ø´Ù?ا  دارÛ?د تا ابتدا تÙ?ظÛ?Ù?ات "
+"Ù¾Û?کربÙ?دÛ? Ø®Ù?د را ذخÛ?رÙ? کردÙ? Ù?  سپس دÙ?بارÙ? Ù¾Ù?جرÙ? تÙ?ظÛ?Ù?ات را باز Ú©Ù?Û?د"
 
 #. 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."
 msgstr ""
-"درگاÙ? Ù?جازÛ? (ضرÙ?رÛ?): براÛ? دسترسÛ? بÙ? سرÙ?Û?س Ø´Ù?ا کاربراÙ? بÙ? Ø´Ù?اساÛ?Û? درگاÙ? TCP "
-"Ù?Û?از دارÙ?د. Ù?اعدتÙ?Ø? Ø´Ù?ا Ù?اÛ?Ù? Ø®Ù?اÙ?Û?د بÙ?د Ú©Ù? درگاÙ? Ù?Û?Ú?Ù? سرÙ?Û?سدÙ?Û? را در اÛ?Ù?جا "
-"استÙ?ادÙ? Ú©Ù?Û?دØ? Ù?ظÛ?ر درگاÙ? 80 براÛ? HTTP. در Ù?ظر داشتÙ? باشÛ?د Ú©Ù? درگاÙ? Ù?جازÛ? "
-"Ù?عÙ?Ù?Ù?Ù? ربطÛ? بÙ? Ù?Ø­Û?Ø· firewall Ù?داردØ? زÛ?را تÙ?Ù?ا در Ù?Ù?ارد درÙ?Ù?TorÛ? استÙ?ادÙ? شدÙ? "
-"است. "
+" Ù¾Ù?رت Ù?جازÛ?(Ù?ازÙ?) : اÛ?Ù? Û?Ú© Ù¾Ù?رت تÛ? سÛ? Ù¾Û? است Ú©Ù? کاربراÙ? براÛ? Ù?صÙ? شدÙ? بÙ? "
+"سرÙ?Û?س تÙ?ر بÙ? Ø¢Ù? Ù?Û?از دارÙ?د. بÙ? Ø·Ù?ر Ù?عÙ?Ù?Ù? Ø? کاربر ترجÛ?Ù? Ù?Û?دÙ?د از Ù¾Ù?رت خدÙ?ات "
+"خاص استÙ?ادÙ? Ú©Ù?د  Ø? بÙ? عÙ?Ù?اÙ? Ù?ثاÙ? Ù¾Ù?رت Û¸Û° براÛ? اÚ? تÛ? تÛ? Ù¾Û?. تÙ?جÙ? داشتÙ? باشÛ?د "
+"Ú©Ù? Ù¾Ù?رت Ù?اÛ? Ù?جازÛ? Ù?عÙ?Ù?Ù?ا Ù?Û?Ú? ربطÛ? بÙ? تÙ?ظÛ?Ù?ات Ù?اÛ?رÙ?اÙ? Ù?دارÙ?دØ? دÙ?Û?Ù? Ø¢Ù? است Ú©Ù? "
+"تÙ?Ù?ا استÙ?ادÙ? ازآÙ? براÛ? استÙ?ادÙ? داخÙ?Û? Ù?رÙ? اÙ?زار تÙ?ر است"
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:73
@@ -182,13 +169,12 @@ msgid ""
 "specify any target, Tor will redirect requests to the port specified in "
 "\"Virtual Port\" on localhost."
 msgstr ""
-"Ù?دÙ? (اختÛ?ارÛ?): Ù?عÙ?Ù?Ù?Ù? Ø´Ù?ا Ù?Û? Ø®Ù?اÙ?Û?د Ú©Ù? Tor Ù?طاÙ?بات اتصاÙ? بÙ? Ù?است-Ù?Ø­Ù?Û? را در "
-"درگاÙ?Û? Ù?تÙ?اÙ?ت از Ø¢Ù?Ú?Ù? Ø´Ù?ا در \"درگاÙ? Ù?جازÛ?\" Ù?عÛ?Ù? کردÙ? اÛ?دØ? بازپخش Ú©Ù?د. در "
-"Ù?تÛ?جÙ?Ø? Ø´Ù?ا Ù?Û? تÙ?اÙ?Û?د Ù?دÙ?Û? Ù?تشکÙ? از آدرس Ù?Û?زÛ?Ú©Û? Ù? درگاÙ?Û? Ú©Ù? درخÙ?استÙ?اÛ? Ù?ربÙ?Ø· "
-"بÙ? سرÙ?Û?س Ù?Ø®Ù?Û? بÙ? Ø¢Ù? باز-ارساÙ? شدÙ?Ø? Ù?عÛ?Ù? Ú©Ù?Û?د Ù?ظÛ?ر بÙ? Ù?است-Ù?Ø­Ù?Û?: 5222 (Ù? Û?ا "
-"بر رÙ?Û? Ù?رکداÙ? از درگاÙ? Ù?اÛ?Û? Ú©Ù? سرÙ?Û?سدÙ?Ù?دÙ? Û? Ø´Ù?ا Ø´Ù?Ù?د Ù?Û? Ú©Ù?د) تعÛ?Û?Ù? Ú©Ù?Û?د. اگر "
-"Ù?Û?Ú? Ù?دÙ?Û? را Ù?عÛ?Ù? Ù?Ú©Ù?Û?دØ? Tor Ù?طاÙ?بات را بÙ? درگاÙ? تعÛ?Û?Ù? شدÙ? براÛ? \"درگاÙ? "
-"Ù?جازÛ?\" در Ù?است-Ù?Ø­Ù?Û? باز-ارساÙ? Ø®Ù?اÙ?د کرد."
+"Ù?دÙ? (اختÛ?ارÛ?) : Ù?عÙ?Ù?Ù?ا Ø´Ù?ا Ù?Û? Ø®Ù?اÙ?Û?د تÙ?ردرخÙ?است Ù?اÛ? اتصاÙ? را بÙ? Ù?است Ù?Ø­Ù?Û? Ù? "
+"در Ù¾Ù?رتÛ? جداÛ? \"Ù¾Ù?رت Ù?جازÛ?\" Ù?شخص شدÙ?Ø?رÙ?Ù? Ú©Ù?د .  بÙ?ابراÛ?Ù? Ø? Ø´Ù?ا Ù?Û? تÙ?اÙ?Û?د با"
+" تعÛ?Û?Ù? Ù?دÙ?Û? Ú©Ù? شاÙ?Ù? آدرس Ù?Û?زÛ?Ú©Û? Ù? Ù¾Ù?رتÛ? Ú©Ù? بÙ? Ù?سÛ?Ù?Ù? Ø¢Ù? درخÙ?است سرÙ?Û?س Ù?اÛ? "
+"Ù?Ø®Ù?Û? Ø´Ù?ا Ù?داÛ?ت Ù?Û?Ø´Ù?د Ø? بÙ? عÙ?Ù?اÙ? Ù?ثاÙ? Ù?است Ù?Ø­Ù?Û? ÛµÛ²Û²Û²(Û?ا Ù?ر Ù¾Ù?رت دÛ?گرÛ?) Ù?دÙ? را"
+" Ù?شخص Ú©Ù?Û?د. اگر Ø´Ù?ا Ù?دÙ?Û? Ù?شخص Ù?Ú©Ù?Û?د Ø? تÙ?ر درخÙ?است اتصاÙ? را بÙ? Ù¾Ù?رت Ù?شخص شدÙ? "
+"در \"Ù¾Ù?رت Ù?جازÛ?\" رÙ?Û? Ù?است Ù?Ø­Ù?Û? تغÛ?Û?ر Ù?Û? دÙ?د"
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:81
@@ -206,56 +192,53 @@ msgid ""
 "disk to the new place. Finally, change the directory in Vidalia to the new "
 "location, enable the service again, and save the new configuration."
 msgstr ""
-"Ù?Ù?رست خدÙ?ات (ضرÙ?رÛ?): Tor Ù?Û? باÛ?ست برخÛ? Ù?اÛ?Ù? Ù?اÛ? Ù?عÛ?Ù? سرÙ?Û?س Ù?Ø®Ù?Û? را در Û?Ú© "
-"Ù?Ù?رست Ù?جزا ذخÛ?رÙ? Ú©Ù?دØ? Ù?ظÛ?ر Û?Ú© Ú©Ù?Û?د خصÙ?صÛ? Ù? Ù?اÛ?Ù? Ù?اÙ? سرÙ?Û?س دÙ?Ù?دÙ? حاÙ?Û? آدرس "
-"Ù?اÛ? Ù¾Û?ازÛ?. اÛ?Ù? Ù?Ù?رست Ù?Û? باÛ?ست از Ù?Ù?رستÛ? Ú©Ù? حاÙ?Û? اطÙ?اعات ارائÙ? شدÙ? تÙ?سط "
-"سرÙ?Û?سدÙ?Ù?دÙ? است Ù?جزا باشد. Ù?Ø­Ù? Ù?Ù?اسب براÛ? Ù?راردادÙ? Ù?Ù?رست سرÙ?Û?سØ? اÛ?جاد  شاخÙ? "
-"Ù?رعÛ? در Ù?Û?ست اصÙ?Û? اطÙ?اعات Tor است. --- تÙ?جÙ? داشتÙ? باشÛ?د Ú©Ù? Ù?Ù?Û? تÙ?اÙ?Û?د Ù?Û?ست "
-"Û?Ú© سرÙ?Û?س را Ù?Ù?گاÙ?Û? Ú©Ù? در حاÙ? کار استØ? تغÛ?Û?ر دÙ?Û?د( بÙ? دÙ?Û?Ù? Ø¢Ù? Ú©Ù?   جابجاÛ?Û? "
-"Ù?Û?ست Ù?اÛ? رÙ?Û? سخت اÙ?زار Ø´Ù?ا جزÙ? Ù?ظاÛ?Ù? Vidalia Ù?Û?ستØ? Ù?جاز داشتÙ? Vidalia بÙ? "
-"تغÛ?Û?ر Ù?Û?ستØ? بÛ? Ù?عÙ?ا است!). اگر Ù?اÛ?Ù?Û?د Û?Ú© سرÙ?Û?س Ù?Ø®Ù?Û? را بÙ? Ù?Û?ست دÛ?گرÛ? Ù?Ù?تÙ?Ù? "
-"Ú©Ù?Û?دØ? Ù?Ø·Ù?Ù? بÙ? اÛ?Ù? ترتÛ?ب عÙ?Ù? Ú©Ù?Û?د: اÙ?Ù? سرÙ?Û?س را در Vidalia غÛ?رÙ?عاÙ? Ú©Ù?Û?د Ù? "
-"تÙ?ظÛ?Ù?ات را سÛ?Ù? Ú©Ù?Û?د. سپس Ù?Û?ست رÙ?Û? سخت اÙ?زار Ø®Ù?د را بÙ? Ù?Ø­Ù? جدÛ?د Ù?Ù?تÙ?Ù? Ú©Ù?Û?د. "
-"دست آخرØ? Ù?Û?ست Vidalia را بÙ? Ù?Ø­Ù? جدÛ?د Ù?Ù?تÙ?Ù? Ú©Ù?Û?دØ? سرÙ?Û?س را دÙ?بارÙ? Ù?عاÙ? Ú©Ù?Û?دØ? "
-"Ù? تÙ?ظÛ?Ù?ات جدÛ?د را سÛ?Ù? Ú©Ù?Û?د. "
+"سرÙ?Û?س داÛ?رکتÙ?رÛ? (Ù?ازÙ?) : تÙ?ر Ù?Û?از بÙ? ذخÛ?رÙ? برخÛ? از Ù?اÛ?Ù? Ù?اÛ? Ù?Ø®Ù?Û? خدÙ?ات خاص "
+"در Û?Ú© داÛ?رکتÙ?رÛ? جداگاÙ?Ù? دارد Ø? بÙ? عÙ?Ù?اÙ? Ù?ثاÙ? Û?Ú© Ú©Ù?Û?د خصÙ?صÛ? Ù? Û?Ú© Ù?اÛ?Ù? Ù?Û?زباÙ? "
+"حاÙ?Û? آدرس Ù¾Û?از. اÛ?Ù? Ù¾Ù?Ø´Ù? باÛ?د Ù?تÙ?اÛ?ز از  داÛ?رکتÙ?رÛ? اÛ? Ú©Ù? حاÙ?Û? Ù?حتÙ?اÛ? سرÙ?Û?س "
+"استØ?باشد. Û?Ú© جاÛ? Ø®Ù?ب براÛ? داÛ?رکتÙ?رÛ? سرÙ?Û?س Ù?ا Ù?Ù?Ú©Ù? است در زÛ?ر شاخÙ? Ù?Ù?رست تÙ?ر "
+"دادÙ?. -- تÙ?جÙ? داشتÙ? باشÛ?د Ú©Ù? Ø´Ù?ا Ù?Û? تÙ?اÙ?Û?د از Û?Ú© سرÙ?Û?س داÛ?رکتÙ?رÛ? در حاÙ? اجرا"
+" (Ø¢Ù? را حس بسÛ?ار را بÙ? Ø¢Ù? اجازÙ? دÙ?د Ø? Ú?را Ú©Ù? Privoxy Ù? Vidalia در Ù?رار Ù?Û?ست "
+"براÛ? حرکت بÙ? داÛ?رکتÙ?رÛ? Ù?ا بر رÙ?Û? دÛ?سک سخت Ø®Ù?د را!) را تغÛ?Û?ر دÙ?Û?د. اگر Ø´Ù?ا Ù?Û?"
+" Ø®Ù?اÙ?Û?د را بÙ? حرکت Û?Ú© سرÙ?Û?س Ù¾Ù?Ù?اÙ? را بÙ? شاخÙ? دÛ?گرÛ? Ø? Ù?Ø·Ù?ا بÙ? اداÙ?Ù? شرح زÛ?ر "
+"است : شرÙ?ع با غÛ?رÙ?عاÙ? کردÙ? خدÙ?ات در Vidalia Ù? ذخÛ?رÙ? تÙ?ظÛ?Ù?ات. سپس داÛ?رکتÙ?رÛ? "
+"در Ù?ارد دÛ?سک Ø®Ù?د را بÙ? Ù?Ø­Ù? جدÛ?د حرکت Ù?Û? Ú©Ù?د. در Ù?Ù?اÛ?ت Ø? تغÛ?Û?ر داÛ?رکتÙ?رÛ? در "
+"Vidalia را بÙ? Ù?Ø­Ù? جدÛ?د Ø? Ù?ادر بÙ? خدÙ?ات دÛ?گر Ø? Ù? ذخÛ?رÙ? تÙ?ظÛ?Ù?ات جدÛ?د است."
 
 #. type: Content of: <html><body><p><ul><li>
 #: 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 ""
-"Ù?عاÙ?-شدÙ?: اگر اÛ?Ù? Ú?Ú©-باکس بÙ? عÙ?Ù?اÙ? غÛ?رÙ?عاÙ?Ø? تÛ?Ú© Ø®Ù?ردÙ? باشدØ? Vidalia آدرس "
-"سرÙ?Û?س Ù?Ø®Ù?Û? Ú©Ù? بÙ? Tor دادÙ? شدÙ? را Ù¾Û?کربÙ?دÛ? Ù?Ø®Ù?اÙ?د کرد. اÛ?Ù? Ù?Û? تÙ?اÙ?د براÛ? "
-"استÙ?ادÙ? Ù?اÛ? Ø¢Û?Ù?دÙ? از Ù¾Û?کربÙ?دÛ? سرÙ?Û?سÛ? Ú©Ù? در حاÙ? حاضر استÙ?ادÙ? Ù?شدÙ?Ø? سÙ?دÙ?Ù?د "
-"باشد. تÙ?اÙ? سرÙ?Û?س Ù?اÛ? Ù?عاÙ?-Ù?شدÙ? در Ù?اÛ?Ù? Ù¾Û?کربÙ?دÛ? Ù?Û?Ú?Ù? VidaliaØ?  در "
-"vidalia.conf. Ù?Ú¯Ù?دارÛ? Ù?Û? Ø´Ù?Ù?د."
+"Ù?عاÙ? بÙ?دÙ? : اگر اÛ?Ù? گزÛ?Ù?Ù? غÛ?ر Ù?عاÙ? است Ø? Ù?Û?داÙ?Û?ا Ù¾Û?کر بÙ?دÛ? سرÙ?Û?س Ù?Ø®Ù?Û? را اÙ?جاÙ? Ù?Ø®Ù?اÙ?د داد. اÛ?Ù? Ù?Û? تÙ?اÙ?د Ù?Ù?Û?د باشد براÛ? Ù?Ú¯Ù? داشتÙ? تÙ?ظÛ?Ù?ات از Û?Ú© سرÙ?Û?س در حاÙ? حاضر بÙ?ا استÙ?ادÙ? براÛ? استÙ?ادÙ? Ù?اÛ? بعدÛ?. Ú©Ù?Û?Ù? خدÙ?ات غÛ?ر Ù?عاÙ? در Ù?Û?داÙ?Û?ا بطÙ?ر خاص در Ù?اÛ?Ù?\n"
+"vidalia.conf \n"
+"درÙ?اÛ?Ù? Ù¾Û?کربÙ?دÛ? ذخÛ?رÙ? شدÙ? است."
 
 #. type: Content of: <html><body>
 #: en/services.html:103
 msgid "<a name=\"buttons\"/>"
-msgstr "<Û?Ú© اسÙ?=\"Ú©Ù?Û?دÙ?ا\"/>"
+msgstr "<a name=\"buttons\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:104
 msgid "What are the five buttons used for?"
-msgstr "اÛ?Ù? Ù¾Ù?ج Ú©Ù?Û?د Ú?Ù? استÙ?ادÙ? اÛ? دارÙ?دØ?"
+msgstr " Ù¾Ù?ج دکÙ?Ù?  Ù?Û?داÙ?Û?ا Ú?Ù? Ù?Ù?رد استÙ?ادÙ? اÛ? دارÙ?دØ?"
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:107
 msgid "Add service: Creates a new empty service configuration."
-msgstr "اÙ?زÙ?دÙ? سرÙ?Û?س: Ù¾Û?کربÙ?دÛ? Û?Ú© سرÙ?Û?س خاÙ?Û? جدÛ?د اÛ?جاد Ù?Û? Ú©Ù?د. "
+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>
 #: en/services.html:111
@@ -263,61 +246,60 @@ msgid ""
 "Copy to clipboard: Copies the onion address to the clipboard, so that you "
 "can tell it to whoever shall be able to use your service."
 msgstr ""
-"Ú©Ù¾Û? بÙ? Ú©Ù?Û?Ù¾ بÙ?رد: آدرس Ù?اÛ? Ù¾Û?ازÛ? را رÙ?Û? Ú©Ù?Û?Ù¾ بÙ?رد Ú©Ù¾Û? Ù?Û? Ú©Ù?د تا Ø´Ù?ا بتÙ?اÙ?Û?د "
-"آدرس را بÙ? Ù?ر کس Ú©Ù? Ù?اÛ?Ù?Û?د سرÙ?Û?س Ø´Ù?ا را استÙ?ادÙ? Ú©Ù?Û?دØ? بدÙ?Û?د."
+"Ú©Ù¾Û? بÙ? Ú©Ù?Û?Ù¾ بÙ?رد : آدرس Ù¾Û?از را بÙ? Ú©Ù?Û?Ù¾ بÙ?رد اضاÙ?Ù? Ù?Û? Ú©Ù?د Ø? بÙ? Ø·Ù?رÛ? Ú©Ù? Ø´Ù?ا "
+"Ù?Û? تÙ?اÙ?Û?د Ù?ر کس Ú©Ù? Ù?Û?Ø®Ù?اÙ?Û?د Ù?ادر بÙ? استÙ?ادÙ? از خدÙ?ات Ø´Ù?ا باشد را تعÛ?Û?Ù? Ú©Ù?Û?د"
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:114
 msgid "Browse: Lets you browse to find a local hidden service directory."
-msgstr ""
-"Ù?رÙ?رگرÛ?: بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د Ú©Ù? بگردÛ?د Ù? جاÛ? Ù?Û?ست Û?Ú© سرÙ?Û?س Ù?Ø®Ù?Û? را Ù¾Û?دا "
-"Ú©Ù?Û?د."
+msgstr "جستجÙ?:کاربر را Ù?ادر Ù?Û?Ú©Ù?د در داÛ?رکتÙ?رÛ? Ù?Ø­Ù?Û?  بدÙ?باÙ? سرÙ?Û?س Ù?Ø®Ù?Û? بگردد"
 
 #. type: Content of: <html><body>
 #: en/services.html:119
 msgid "<a name=\"advanced\"/>"
-msgstr "<Û?Ú© اسÙ?=\"Ù¾Û?شرÙ?تÙ?\"/>"
+msgstr "<a name=\"advanced\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:120
 msgid "How can I configure advanced hidden service settings?"
-msgstr "Ú?Ú¯Ù?Ù?Ù? تÙ?ظÛ?Ù?ات Ù?Ø­Û?Ø· Ù¾Û?شرÙ?تÙ? سرÙ?Û?س Ù?Ø®Ù?Û? را Ù¾Û?کربÙ?دÛ? Ú©Ù?Ù?Ø?"
+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 ""
-"Tor اÙ?کاÙ? تÙ?ظÛ?Ù?ات بÛ?شتر براÛ? سرÙ?Û?س Ù?اÛ? Ù?Ø®Ù?Û? با Ù?Ø­Û?Ø· Ù?Û?Ú?Ù? را اÛ?جاد Ù?Û? Ú©Ù?دØ? "
-"Ù?ظÛ?ر Ù?اداشتÙ? بÙ? استÙ?ادÙ? (Ù? Û?ا جÙ?Ù?Ú¯Û?رÛ? از) گرÙ? Ù?اÛ? Ù?عÛ?Ù? بÙ? عÙ?Ù?اÙ? Ù?Ù?Ø·Ù? تÙ?اÙ?Û?Ø? "
-"Ù? Û?ا ارائÙ? درگاÙ? Ù?اÛ? Ù?جازÛ? Ù?تعدد براÛ? سرÙ?Û?س Ù?احد."
+"تÙ?ر کاربر را Ù?ادر Ù?Û?Ú©Ù?د تا تÙ?ظÛ?Ù?ات خاص براÛ? سرÙ?Û?س Ù?Ø®Ù?Û? در Ù¾Û?کربÙ?دÛ? اÙ?جاÙ? دÙ?د"
+" Ø? بÙ? عÙ?Ù?اÙ? Ù?ثاÙ? اجبار بÙ? استÙ?ادÙ? از (Ù? Û?ا اجتÙ?اب از) گرÙ? Ù?اÛ? خاصÛ? از تÙ?ر بÙ?"
+" عÙ?Ù?اÙ? Ù?Ù?Ø·Ù? آغاز Ø? Ù? Û?ا ارائÙ? Ù¾Ù?رت Ù?اÛ? Ù?تعدد Ù?جازÛ? براÛ? خدÙ?ات Ù?شابÙ?."
 
 #. type: Content of: <html><body><p>
 #: en/services.html:128
 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 ""
-"با اÛ?Ù? Ù?جÙ?دØ? Ù?ا بر Ø¢Ù? شدÛ?Ù? Ú©Ù? استÙ?ادÙ? از Vidalia را سÙ?Ù? تر Ú©Ù?Û?Ù? Ù? بÙ? اÛ?Ù? "
-"خاطر تÙ?Ù?ا راÛ?ج ترÛ?Ù? Ù?Ø­Û?Ø· Ù?ا را در دسترس Ù?رار دادÛ?Ù?. اگر Ù?اÛ?Ù? بÙ? Ù¾Û?کربÙ?دÛ? "
-"Ù?Ø­Û?Ø· Ù?اÛ? Ù¾Û?شرÙ?تÙ? Ù?ستÛ?دØ? اÛ?Ù?کار را Ù?Û? باÛ?ست در Ù?اÛ?Ù? torrc در Tor اÙ?جاÙ? دÙ?Û?د. "
-"اگر بÛ?Ø´ از Û?Ú© درگاÙ? Ù?جازÛ? را Ù?شخص کردÙ? باشÛ?دØ? تÙ?Ù?ا اÙ?Ù?Û?Ù? درگاÙ? Ù?شاÙ? دادÙ? "
-"Ø®Ù?اÙ?د شد Ù? تÙ?Ù?ا Ù?Ù?اÙ? درگاÙ? Ù?ابÙ? Ù?Û?راÛ?Ø´ Ø®Ù?اÙ?د بÙ?د. "
+" Ù?ا تصÙ?Û?Ù? گرÙ?تÛ?Ù? Ú©Ù? در Ù?Û?داÙ?Û?ا Ù?Ù?Ù? Ú?Û?ز را سادÙ? Ú©Ù?Û?Ù? Ù? تÙ?Ù?ا تÙ?ظÛ?Ù?ات سادÙ? "
+"ارائÙ? Ú©Ù?Û?Ù? . براÛ? Ù¾Û?کربÙ?دÛ? تÙ?ظÛ?Ù?ات Ù¾Û?شرÙ?تÙ? Ø? Ø´Ù?ا Ù?Û?از بÙ? اÙ?جاÙ? اÛ?Ù? کار Ù?Û?از"
+"  دارÛ?د از Ù?اÛ?Ù? تÙ?رک تÙ?ر استÙ?ادÙ? Ú©Ù?Û?د. Ù?Û?داÙ?Û?ا  اÛ?Ù? تÙ?ظÛ?Ù?ات را حذÙ? Ù?Ø­Ù?اÙ?د  "
+"کردحتÛ? زÙ?اÙ?Û? Ú©Ù? Ø´Ù?ا سرÙ?Û?س Ù?Ø®Ù?Û? Ø®Ù?د را Ù?Û?راÛ?Ø´ Ù?Û?Ú©Ù?Û?د . اگر بÛ?Ø´ از Û?Ú© Ù¾Ù?رت "
+"Ù?جازÛ? Ù?شخص Ù?Û? Ú©Ù?Û?د Ø? Ù?Ù?Ø· Ù¾Ù?رت اÙ?Ù? Ù?Ù?اÛ?Ø´ دادÙ? Ø®Ù?اÙ?د شد Ù? Ù?ابÙ? Ù?Û?راÛ?Ø´ Ø®Ù?اÙ?د "
+"بÙ?د"
 
 #. type: Content of: <html><body>
 #: en/services.html:135
 msgid "<a name=\"client\"/>"
-msgstr "<Û?Ú© اسÙ?=\"کاربر\"/>"
+msgstr "<a name=\"client\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:136
 msgid "How does Vidalia help me to access other hidden services?"
-msgstr "Vidalia Ú?Ú¯Ù?Ù?Ù? بÙ? Ù?Ù? Ú©Ù?Ú© Ù?Û? Ú©Ù?د بÙ? دÛ?گر سرÙ?Û?س Ù?اÛ? Ù?Ø®Ù?Û? دسترس داشتÙ? باشÙ?Ø?"
+msgstr "Ù?Û?داÙ?Û?ا  Ú?Ú¯Ù?Ù?Ù? بÙ? Ù?Ù?  براÛ? دسترسÛ? بÙ? سرÙ?Û?س Ù?اÛ? Ù¾Ù?Ù?اÙ? دÛ?گر Ú©Ù?Ú© Ù?Û? Ú©Ù?دØ?"
 
 #. type: Content of: <html><body><p>
 #: en/services.html:138
@@ -327,7 +309,9 @@ 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 ""
-"Ù?Ù?Ø? اصÙ?Ù?. Ù?Û?Ú? Ù?Û?ازÛ? بÙ? اÛ?Ù? کار Ù?Û?ست. اگر Ù?Û? Ø®Ù?اÙ?Û?د بÙ? Û?Ú© سرÙ?Û?س Ù?Ø®Ù?Û? دÛ?گر "
-"دسترسÛ? داشتÙ? باشÛ?دØ? آدرس Ù¾Û?ازÛ? Ø¢Ù? سرÙ?Û?س را در Ù?رÙ?رگر Ø®Ù?د (Ù? Û?ا در Ù?رÙ? کاربرÛ? "
-"Ù?ربÙ?Ø·Ù?) تاÛ?Ù¾ Ú©Ù?Û?دØ? Ù? Tor  بÙ?Û?Ù? کارÙ?ا را براÛ? Ø´Ù?ا اÙ?جاÙ? Ù?Û? دÙ?د. Ù?Û?ازÛ?  Ú©Ù? "
-"Tor  بÙ? Ø·Ù?ر Ù?Û?Ú?Ù? براÛ? اÛ?Ù? کار تÙ?ظÛ?Ù? Ø´Ù?د. "
+"بÙ? Ù?Û?Ú? Ù?جÙ?.  Ù?Û?ازÛ? بÙ? اÙ?جاÙ? اÛ?Ù? کار Ù?جÙ?د Ù?دارد. اگر Ø´Ù?ا Ù?Û? Ø®Ù?اÙ?Û?د براÛ? "
+"دسترسÛ? بÙ? دÛ?گر سرÙ?Û?س Ù?اÛ? Ù?Ø®Ù?Û? Ø? Ù?Ù?ع آدرس Ù¾Û?از سرÙ?Û?س را در Ù?رÙ?رگر Ø®Ù?د (Ù? Û?ا "
+"برÙ?اÙ?Ù? Ú©Ù?اÛ?Ù?ت Ù?Ù?اسب اگر Ø¢Ù? را Û?Ú© سرÙ?Û?س Ù?ب Ù?Û?ست) Ø? Ù? تر Ù?Û? Ú©Ù?د Ù? بÙ?Û?Ù? را براÛ?"
+" Ø´Ù?ا. بدÙ?Ù? Ù?Û?از بÙ? Ù¾Û?کربÙ?دÛ? تÙ?ر بÙ? Ø·Ù?ر خاص براÛ? Ø¢Ù? Ù?جÙ?د دارد."
+
+
diff --git a/fa/troubleshooting.po b/fa/troubleshooting.po
index 33d5753..b4f0663 100644
--- a/fa/troubleshooting.po
+++ b/fa/troubleshooting.po
@@ -1,34 +1,25 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+#   <aalaeiarash@xxxxxxxxx>, 2011.
+#   <behravanhamed@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: 2010-09-29 04:17+0200\n"
-"Last-Translator: Ghazal <nevisht@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-07-14 02:16+0000\n"
+"Last-Translator: arashaalaei <aalaeiarash@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: fa\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: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 # type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
 msgid "Troubleshooting"
-msgstr "عÛ?ب زداÛ?Û?"
+msgstr "عÛ?ب Û?ابÛ?"
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:19
@@ -38,67 +29,66 @@ msgid ""
 "having, check out our website at <i>www.vidalia-project.net</i> for more "
 "support and information.  <a name=\"start\"/>"
 msgstr ""
-"Ù?Û?ستÛ? Ú©Ù? در زÛ?ر Ù?Û? Ø¢Û?د Ù?Ø´Ú©Ù?ات Û?ا سÙ?اÙ?اتÛ? است Ú©Ù? بÙ? Ø·Ù?ر Ù?عÙ?Ù?Ù? کساÙ?Û? Ú©Ù? از Tor "
-"استÙ?ادÙ? Ù?Û? Ú©Ù?Ù?دØ? با Ø¢Ù? Ù?Ù?اجÙ? اÙ?د. اگر Ù?Û?Ú? Ù?Ù?ردÛ? Ù?ربÙ?Ø· بÙ? Ù?Ø´Ú©Ù? خاصÛ? Ú©Ù? Ø´Ù?ا "
-"دارÛ?د Ù¾Û?دا Ù?کردÛ?دØ? براÛ? اطÙ?اعات بÛ?شتر بÙ? Ù?بساÛ?ت Ù?ا در <i>www.vidalia-"
-"project.net</i> Ù?راجعÙ? Ú©Ù?Û?د."
+"Ù?Û?ست زÛ?ر برخÛ? از Ù?Ø´Ú©Ù?ات Ù?عÙ?Ù?Ù?  Ù?ردÙ? در Ù?Ù?گاÙ? اجراÛ? تÙ?ر است. اگر \n"
+"جÙ?اب سÙ?اÙ? Ø®Ù?د را در اÛ?Ù? Ù?Û?ست Ù¾Û?دا Ù?کردÛ?د براÛ? پشتÛ?باÙ?Û? Ù? اطÙ?اعات بÛ?شترÙ?Ø·Ù?ا بÙ? آدرس\n"
+" <i>www.vidalia - project.net</i> برÙ?Û?د"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:25
 msgid "I Can't Start Tor"
-msgstr "Ù?Ù?Û? تÙ?اÙ?Ù? Tor را Ù?عاÙ? Ú©Ù?Ù?"
+msgstr "Ù?Ù?Û?تÙ?اÙ?Ù? تÙ?ر را راÙ? اÙ?دازÛ? Ú©Ù?Ù?"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:27
 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 ""
-"Û?Ú©Û? از Ù?عÙ?Ù?Ù? ترÛ?Ù? دÙ?اÛ?Ù?Û? Ú©Ù?  باعث Ù?Û? Ø´Ù?د Vidalia Ù?تÙ?اÙ?د Tor را Ù?عاÙ? Ú©Ù?د اÛ?Ù? "
-"است Ú©Ù? در داÛ?رکتÙ?رÛ? اشتباÙ? بÙ? دÙ?باÙ? Ù?صب Tor Ù?Û? گردد. با بÙ? رÙ?ز کردÙ? گزÛ?Ù?Ù? "
-"<i>Tor Executable</i> در <a href=\"config.html#general\"> Ù?Ø­Û?Ø· تÙ?ظÛ?Ù?ات عÙ?Ù?Ù?Û?Ø? "
-"Ù?Û? تÙ?اÙ?Û?د Ù?Ø­Ù? Tor را بÙ? Vidalia بگÙ?Û?Û?د."
+"Ù?حتÙ?Ù? ترÛ?Ù? دÙ?Û?Ù? Ù¾Û?دا Ù?شدÙ? تÙ?ر تÙ?سط Ù?Û?داÙ?Û?ا اÛ? است Ú©Ù? Ù?Û?داÙ?Û?ا براÛ? Û?اÙ?تÙ? تÙ?ر بÙ? داÛ?رکتÙ?رÛ? اشتباÙ? Ù?راجعÙ? Ù?Û? Ú©Ù?د.Ø´Ù?ا با برÙ?ز رساÙ?Û?\n"
+"<i>اجراÛ?Û? تÙ?ر</i>\n"
+"Ù?Û?تÙ?اÛ?Ù?د جاÛ? جدÛ?د تÙ?ر را بÙ? Ù?Û?داÙ?Û?ا بگÙ?Û?Û?د \n"
+"<a href=\"config.html#general\">در تÙ?ظÛ?Ù?ات عÙ?Ù?Ù?Û?</a> ."
 
 # 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 ""
-"Û?Ú© دÙ?Û?Ù? دÛ?گر Ù?عاÙ? Ù?شدÙ? Tor Ù?Û? تÙ?اÙ?د اÛ?Ù? باشد Ú©Ù? پرÙ?سÙ? دÛ?گرÛ? از Tor Ù?شغÙ?Ù? کار "
-"است. Ù?Û?ست پرÙ?سÙ? Ù?اÛ? در حاÙ? کار را Ú?Ú© Ú©Ù?Û?د Ù? پرÙ?سÙ? Ù¾Û?Ø´Û?Ù? Tor راØ? اگر بÙ?دØ? "
-"Ù?تÙ?Ù?Ù? Ú©Ù?Û?د. سپس دÙ?بارÙ? سعÛ? Ú©Ù?Û?د Tor  را Ù?عاÙ? Ú©Ù?Û?د."
+"Û?Ú©Û? دÛ?گر از دÙ?اÛ?Ù?Û? Ú©Ù? Ù?Ù?Ú©Ù? است تÙ?ر اجرا Ù?Ø´Ù?د اÛ?Ù? است Ú©Ù? اÙ?کاÙ? دارد Û² برÙ?اÙ?Ù? "
+"تÙ?ر Ù?Ù?زÙ?اÙ? رÙ?Û? راÛ?اÙ?Ù? در حاÙ? اجرا باشد . Ú?Ú© Ù?Û?ست Ø®Ù?د را از در حاÙ? اجرا رÙ?Ù?د "
+"Ù? Ù?تÙ?Ù?Ù? کردÙ? رÙ?Ù?د Ù?بÙ?Û? تÙ?ر بÙ? Ø? اگر Ø´Ù?ا Û?Ú©Û?. سپس Ø? سعÛ? Ú©Ù?Û?د تÙ?ر را در حاÙ? "
+"اجرا دÙ?بارÙ?."
 
 # 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 ""
-"اگر اÛ?Ù? Ù?Û?ز کارگر Ù?بÙ?دØ? Ù¾Û?اÙ? Ù?رÙ?د <a href=\"log.html\"> را Ú?Ú© Ú©Ù?Û?د ببÛ?Ù?Û?د Ø¢Û?ا "
-"Tor Ù?Û?Ú? اطÙ?اعاتÛ? در Ù?Ù?رد خطاÛ?Û? Ú©Ù? در زÙ?اÙ? شرÙ?ع با Ø¢Ù? Ù?Ù?اجÙ? شدÙ?Ø? ثبت کردÙ? Û?ا "
-"Ù?Ù?"
+"در صÙ?رتÛ? Ú©Ù? Ù?Ø´Ú©Ù? Ø´Ù?ا Ø­Ù? Ù?شد\n"
+" <a href=\"log.html\"> Ù?Û?ست Ù¾Û?اÙ?</a> \n"
+"را بدÙ?باÙ? Ù¾Û?اÙ?Û? از تÙ?ر Ù?بÙ?Û? بر اشتباÙ? Ù?رÙ? اÙ?زار در Ù?Ù?گاÙ? شرÙ?ع Ø¢Ù? جستجÙ? Ú©Ù?Û?د"
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:43
 msgid "<a name=\"connect\"/>"
-msgstr "<Û?Ú© Ù?اÙ?=\"اتصاÙ?\"/>"
+msgstr "<a name=\"connect\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:44
 msgid "Vidalia Can't Connect to Tor"
-msgstr "Vidalia Ù?Ù?Û? تÙ?اÙ?د بÙ? Tor Ù?صÙ? Ø´Ù?د"
+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>."
-msgstr ""
-" Vidalia Ù?داÛ?ت Tor را از طرÛ?Ù? ارتباط Ú¯Û?رÛ? با Ø¢Ù? بÙ? Ù?سÛ?Ù?Ù? (درگاÙ? Ú©Ù?ترÙ?) "
-"<i>control port</i> اÙ?جاÙ? Ù?Û? دÙ?د."
+msgid ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
+msgstr " با تÙ?ر در ارتباط است<i>Ù¾Ù?رت Ú©Ù?ترÙ?</i>Ù?Û?داÙ?Û?ا از طرÛ?Ù? "
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:49
@@ -108,10 +98,10 @@ msgid ""
 "your <a href=\"log.html\">message log</a> to see if Tor reported any errors "
 "while it started."
 msgstr ""
-"Û?Ú©Û? از Ù?عÙ?Ù?Ù? ترÛ?Ù? دÙ?اÛ?Ù?Û? Ú©Ù? Ù?اÙ?ع اتصاÙ? Tor Ù?Û? Ø´Ù?د اÛ?Ù? است Ú©Ù? Tor شرÙ?ع بÙ? کار "
-"کردÙ? اÙ?ا در Ù?Ù?اÙ? زÙ?اÙ? با خطاÛ?Û? Ù?Ù?اجÙ? شدÙ? Ù? بÙ?اÙ?اصÙ?Ù? برگشت کردÙ? است. باÛ?د "
-"Ù¾Û?اÙ? Ù?رÙ?د بÙ? سÛ?ستÙ? <a href=\"log.html\"> را Ú?Ú© Ú©Ù?Û?د ببÛ?Ù?Û?د Ø¢Û?ا Tor گزارشÛ? از "
-"خطاÛ? Ù?Ù?زÙ?اÙ? با شرÙ?ع کار Ø®Ù?د ثبت کردÙ? Û?ا Ù?Ù?."
+" شاÛ?ع ترÛ?Ù? دÙ?Û?Ù?Û? Ú©Ù? Ù?Û?داÙ?Û?ا Ù?Ù?Û? تÙ?اÙ?د بÙ? تÙ?ر Ù?صÙ? Ø´Ù?د اÛ?Ù?ست Ú©Ù? پس از براÙ? اÙ?تادÙ? تÙ?رâ??Ø?Ù?رÙ? اÙ?زار دÚ?ار Ù?Ø´Ú©Ù? Ù? در Ù?تÛ?جÙ? بسرعت بستÙ? شدÙ? است.\n"
+"Ø´Ù?ا باÛ?د \n"
+"<a href=\"log.html\">Ù?Û?ست Ù¾Û?اÙ?</a> \n"
+"را براÛ?  گزارش Ù?ر Ú¯Ù?Ù?Ù? خطا در زÙ?اÙ?Û? Ú©Ù? تÙ?ر آغاز شدÙ? جستجÙ? Ú©Ù?Û?د"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:55
@@ -119,25 +109,22 @@ 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 ""
-"اگر Tor در درگاÙ?Û? بÙ? جز Ø¢Ù? Ú©Ù? Vidalia Ú¯Ù?اÙ? Ù?Û? Ú©Ù?دØ? Ø´Ù?Ù?د Ù?Û? Ú©Ù?دØ? Vidalia Ù?ادر "
-"بÙ? اتصاÙ? بÙ? Tor Ù?Ø®Ù?اÙ?د بÙ?د. Ù?ر Ú?Ù?د بÙ? Ù?درت Ù?اÚ?ار بÙ? تغÛ?Û?ر تÙ?ظÛ?Ù?ات اÛ?Ù? Ù?Ø­Û?Ø· "
-"Ø®Ù?اÙ?Û?د شد اÙ?ا اگر سرÙ?Û?س دÛ?گرÛ? در دستگاÙ? Ø´Ù?ا Ù?عاÙ? باشد Ú©Ù? با درگاÙ? Ú©Ù?ترÙ? Tor "
-"تصادÙ? داشتÙ? باشدØ? Ù?Û? باÛ?ست درگاÙ? دÛ?گرÛ? را تعÛ?Û?Ù? Ú©Ù?Û?د. Ù?Ø­Û?Ø· را در تÙ?ظÛ?Ù?ات "
-"Ù¾Û?شرÙ?تÙ? Ù?Ø­Û?Ø· <a href=\"config.html#advanced\"> در VidaliaÙ?Û? تÙ?اÙ?Û?د تغÛ?Û?ر دÙ?Û?د."
+"اگر تÙ?ر بر رÙ?Û? Ù¾Ù?رتÛ? Ù?تÙ?اÙ?ت از Ø¢Ù?Ú?Ù? Ù?Û?داÙ?Û?ا اÙ?تظار دارد بÙ? اÛ?Ù?ترÙ?ت Ù?صÙ? باشدØ? Ù?Û?داÙ?Û?ا Ù?ادر بÙ? اتصاÙ? بÙ? تÙ?ر Ù?Ø®Ù?اÙ?د بÙ?د. Ø´Ù?ا بÙ? Ù?درت Ù?Û?از بÙ? تغÛ?Û?ر اÛ?Ù? تÙ?ظÛ?Ù?ات دارÛ?دØ? اÙ?ا اگر Û?Ú© سرÙ?Û?س دÛ?گر در حاÙ? اجرا بر رÙ?Û? دستگاÙ? Ø´Ù?ا است Ú©Ù? با Ù¾Ù?رت Ú©Ù?ترÙ? Ù?Û?داÙ?Û?ا Ù?Ù?Ø®Ù?اÙ?Û? Ù?داردØ? Ø´Ù?ا    Ù?Û?ازÙ?Ù?د تعرÛ?Ù? Ù¾Ù?رت Ù?اÛ? جدÛ?دÛ? Ù?Û?باشÛ?د. Ø´Ù?ا Ù?Û? تÙ?اÙ?Û?د اÛ?Ù? تÙ?ظÛ?Ù?ات را در\n"
+"<a href=\"config.html#advanced\">تغÛ?Û?ر Ù¾Û?Ø´ رÙ?تÙ? در تÙ?ظÛ?Ù?ات</a>Ù?Û?داÙ?Û?ا تغÛ?Û?ر دÙ?Û?د"
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:63
 msgid "<a name=\"password\"/>"
-msgstr "<Û?Ú© Ù?اÙ?=\"Ú©Ù?Ù?Ù? عبÙ?ر\"/>"
+msgstr "<a name=\"password\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:64
 msgid "Why is Vidalia asking me for a \"control password\"?"
-msgstr "Ú?را Vidalia از Ù?Ù? \"Ú©Ù?Ù?Ù? عبÙ?ر\" Ù?Û? Ø®Ù?اÙ?دØ?"
+msgstr "Ú?را Ù?Û?داÙ?Û?ا از Ù?Ù? درخÙ?است رÙ?ز عبÙ?ر \"Ú©Ù?ترÙ?\"Ù?Û? Ú©Ù?دØ?"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:66
@@ -149,12 +136,12 @@ msgid ""
 "applications from also connecting to the control port and potentially "
 "compromising your anonymity."
 msgstr ""
-"Vidalia با Ù?رÙ? اÙ?زار Tor از طرÛ?Ù? درگاÙ? Ú©Ù?ترÙ? Tor ارتباط Ù?Û? Ú¯Û?رد. درگاÙ? Ú©Ù?ترÙ? "
-"بÙ? Vidalia اÙ?کاÙ? Ù?Û? دÙ?د Ú©Ù? بÙ? رÙ?زرساÙ?Û? Ù?اÛ? Ù?ضعÛ?ت را از Tor درÛ?اÙ?ت Ú©Ù?دØ? "
-"درخÙ?است Ø¢Û? دÛ? تازÙ? بکÙ?دØ? Ù?Ø­Û?Ø· Tor را تشخÛ?ص بدÙ?دØ? Ù? غÛ?رÙ?. Ù?ر بار Ú©Ù? Vidalia "
-"از Ù?Ù? Tor را راÙ? اÙ?دازÛ? Ù?Û? Ú©Ù?دØ? Û?Ú© Ú©Ù?Ù?Ù? عبÙ?ر تصادÙ?Û? براÛ? درگاÙ? Ú©Ù?ترÙ? Tor "
-"تعÛ?Û?Ù? Ù?Û? Ú©Ù?د تا از اتصاÙ? اپÙ?Û?Ú©Ø´Û?Ù? Ù?اÛ? دÛ?گر بÙ? درگاÙ? Ú©Ù?ترÙ? Ù? Ù?Ù? رÙ?تÙ? Ù?Ù?Û?ت Ø´Ù?ا "
-"جÙ?Ù?Ú¯Û?رÛ? Ø´Ù?د."
+"Ù?Û?داÙ?Û?ا تعاÙ?Ù? با Ù?رÙ? اÙ?زار تÙ?ر را از طرÛ?Ù?\"Ù¾Ù?رت Ú©Ù?ترÙ?\" تÙ?ر اÙ?جاÙ? Ù?Û? دÙ?د. "
+"Ù¾Ù?رت Ú©Ù?ترÙ? اجازÙ? Ù?Û? دÙ?د تا Ù?Û?داÙ?Û?ا از طرÙ? تÙ?ر بÙ? رÙ?ز رساÙ?Û? Ù?ضعÛ?ت Ø´Ù?د Ø? "
+"درخÙ?است Ù?Ù?Û?تÛ? جدÛ?د Ú©Ù?د Ø? Ù¾Û?کربÙ?دÛ? تÙ?ظÛ?Ù?ات تÙ?ر را اÙ?جاÙ? دÙ?د Ù? غÛ?رÙ? .Ù?ر بار "
+"Ù?Û?داÙ?Û?ا تÙ?ر را براÙ? Ù?Û? اÙ?دازد Ø? Ù?Û?داÙ?Û?ا Û?Ú© رÙ?ز عبÙ?ر تصادÙ?Û? براÛ? Ù¾Ù?رت Ú©Ù?ترÙ? "
+"تÙ?ر درست Ù?Û? Ú©Ù?د تا برÙ?اÙ?Ù? Ù?اÛ? کاربردÛ? دÛ?گر Ù?تÙ?اÙ?Ù?د بÙ? Ù¾Ù?رت Ú©Ù?ترÙ?  Ù?صÙ? Ø´Ù?Ù?د Ù?"
+" بÙ? Ø·Ù?ر باÙ?Ù?Ù?Ù? اÙ?Ù?Û?ت Ù? Ú¯Ù?Ù?اÙ?Û? کاربر راتÙ?دÛ?د Ú©Ù?Ù?د"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:75
@@ -163,9 +150,9 @@ msgid ""
 "happens in the background. There are three common situations, though, where "
 "Vidalia may prompt you for a password:"
 msgstr ""
-"Ù?عÙ?Ù?Ù?Ù? پرÙ?سÙ? تÙ?Ù?Û?د Ù? تعÛ?Û?Ù? Û?Ú© Ú©Ù?Ù?Ù? عبÙ?ر براÛ? Ú©Ù?ترÙ?Ø? در پس زÙ?Û?Ù?Ù? اتÙ?اÙ? Ù?Û? "
-"اÙ?تدØ? اÙ?ا سÙ? Ù?Ù?Ù?عÛ?ت Ù?شابÙ? Ù?Ù?جÙ?د است Ú©Ù? در Ø¢Ù? Ù?Ù?Ú©Ù? است Vidalia از Ø´Ù?ا Ø·Ù?ب "
-"Ú©Ù?Ù?Ù? عبÙ?ر Ú©Ù?د."
+"Ù?عÙ?Ù?Ù?ا اÛ?Ù? Ù?رآÛ?Ù?د در تÙ?Ù?Û?د Ù? تÙ?ظÛ?Ù? Ú©Ù?ترÙ? Û?Ú© رÙ?ز عبÙ?ر تصادÙ?Û? در پس زÙ?Û?Ù?Ù? "
+"اتÙ?اÙ? Ù?Û? اÙ?تد. سÙ? Ù?Ù?Ù?عÛ?ت Ù?اÛ? Ù?شترک Ù?جÙ?د دارد Ø? Ù?ر Ú?Ù?د Ø? Ú©Ù? در Ø¢Ù? Ù?Û?داÙ?Û?ا "
+"Ù?Ù?Ú©Ù? است Ø´Ù?ا را براÛ? Û?Ú© رÙ?ز عبÙ?ر را سرÛ?ع :"
 
 # type: Content of: <html><body><ul><li>
 #: en/troubleshooting.html:82
@@ -175,22 +162,23 @@ msgid ""
 "Tor Browser Bundle. In that case, you'll need to close the old Vidalia and "
 "Tor before you can run this one."
 msgstr ""
-"Ù?Ù? اکÙ?Ù?Ù? Vidalia Ù? Tor را Ù?عاÙ? کردÙ? اÛ?د. براÛ? Ù?ثاÙ?Ø? اگر Ú©Ù? بستÙ? Vidalia را "
-"Ù?صب کردÙ? باشÛ?د Ù? بخÙ?اÙ?Û?د بستÙ? Ù?رÙ?رگر Tor را Ù?عاÙ? Ú©Ù?Û?دØ? اÛ?Ù? Ù?Ù?Ù?عÛ?ت Ù?Ù?Ú©Ù? است "
-"Ù¾Û?Ø´ بÛ?اÛ?د. در اÛ?Ù? صÙ?رتØ? Ù¾Û?Ø´ از Ù?عاÙ? کردÙ? اÛ?Ù? Û?Ú©Û?Ø? باÛ?د Vidalia Ù? Tor Ù?دÛ?Ù?Û? "
-"را ببÙ?دÛ?د.  "
+"Ø´Ù?ا در حاÙ? حاضر در حاÙ? اجراÛ? Ù?Û?داÙ?Û?ا Ù? تÙ?ر Ù?ستÛ?د. بÙ? عÙ?Ù?اÙ? Ù?ثاÙ? Ø?  اگر Ø´Ù?ا "
+"ابتدا  بستÙ? Ù?رÙ? اÙ?زارÛ? Ù?Û?داÙ?Û?ا را Ù?صب  Ù? سپس اکÙ?Ù?Ù? در حاÙ? تÙ?اش براÛ? اجراÛ? "
+"بستÙ? Ù?رÙ? اÙ?زارÛ? Ù?رÙ?رگر Ù?ستÛ?د اÛ?Ù? Ù?ضعÛ?ت Ù?Û? تÙ?اÙ?د اتÙ?اÙ? بÛ?اÙ?تد. در Ø¢Ù? صÙ?رت Ø? "
+"Ø´Ù?ا Ù?بÙ? از Ù?ر Ú?Û?ز Ù?Û?از بÙ? بستÙ? برÙ?اÙ?Ù? تÙ?ر Ù? Ù?Û?داÙ?Û?ا دارÛ?د تا بعد از Ø¢Ù? "
+"برÙ?اÙ?Ù? جدÛ?د را اجرا Ú©Ù?Û?د"
 
 # 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 ""
-"Vidalia تصادÙ? (crash)  Ù?Û? Ú©Ù?د اÙ?ا Ù?Ù?Ú?Ù?اÙ? بÙ? Tor از طرÛ?Ù? آخرÛ?Ù? Ú©Ù?Ù?Ù? عبÙ?ر "
-"اتÙ?اÙ?Û? اÙ?کاÙ? کار Ù?Û? دÙ?د. بعد از رÛ? استارت Vidalia بÙ? Ø´Ù?ا Û?Ú© Ú©Ù?Ù?Ù? عبÙ?ر دÛ?گر "
-"ارائÙ? Ù?Û? Ú©Ù?د اÙ?ا در اÙ? صÙ?رت دÛ?گر Vidalia Ù?Ù?Û? تÙ?اÙ?د با Tor Ù?کاÙ?Ù?Ù? Ú©Ù?د زÛ?را "
-"Ú©Ù?Ù?Ù? عبÙ?ر تازÙ? شاÙ? با Ù?Ù? Ù?تÙ?اÙ?ت است. "
+"Ù?Û?داÙ?Û?ا کرش کردÙ? Ø? اÙ?ا تÙ?ر را در حاÙ? اجرا با  آخرÛ?Ù? رÙ?ز عبÙ?ر Ø´Ù?اختÙ? شدÙ? تÙ?Ù?ا"
+" گذاشتÙ?. پس از راÙ? اÙ?دازÛ? Ù?جدد Ù?Û?داÙ?Û?اØ? Ù?رÙ? اÙ?زار رÙ?ز عبÙ?ر تصادÙ?Û? جدÛ?د تÙ?Ù?Û?د"
+" Ù?Û? Ú©Ù?دØ? اÙ?ا Ù?Û?داÙ?Û?ا در اÛ?Ù?حاÙ? Ù?Ù?Û? تÙ?اÙ?د بÙ? تÙ?ر Ù?تصÙ? گردد Ø? Ú?را Ú©Ù? رÙ?زÙ?اÛ? "
+"عبÙ?ر تصادÙ?Û? Ù?تÙ?اÙ?ت Ù?ستÙ?د."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:94
@@ -199,8 +187,9 @@ msgid ""
 "button, you can click the button and Vidalia will restart Tor with a new "
 "random control password."
 msgstr ""
-"اگر Ù?کاÙ?Ù?Ù? اÛ? Ú©Ù? از Ø´Ù?ا Ø·Ù?ب Ú©Ù?Ù?Ù? عبÙ?ر Ù?Û? Ú©Ù?د Ú©Ù?Û?د <i>Reset</i> داردØ? رÙ?Û? Ø¢Ù? "
-"Ú©Ù?Û?Ú© Ú©Ù?Û?د. Vidalia با Û?Ú© Ú©Ù?Ù?Ù? عبÙ?ر تصادÙ?Û? دÛ?گر Tor را Ù?عاÙ? Ø®Ù?اÙ?د کرد. "
+"اگردÛ?اÙ?Ù?Ú¯Û? Ú©Ù? براÛ? رÙ?ز عبÙ?ر Ú©Ù?ترÙ? رÙ?Û? صÙ?Ø­Ù? باز Ù?Û? Ø´Ù?د داراÛ? دکÙ?Ù?\n"
+"<i>Ù?جدد</i> \n"
+"باشدØ? Ø´Ù?ا Ù?Û? تÙ?اÙ?Û?د بر رÙ?Û? دکÙ?Ù? Ú©Ù?Û?Ú© Ú©Ù?Û?د Ù? Ù?Û?داÙ?Û?ا  تÙ?ر را با Û?Ú© رÙ?ز عبÙ?ر جدÛ?د راÙ? اÙ?دازÛ? Ù?جدد Ù?Û? Ú©Ù?د "
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:99
@@ -210,77 +199,73 @@ msgid ""
 "process or task manager, and terminate the Tor process. Then use Vidalia to "
 "restart Tor and all will work again."
 msgstr ""
-"اگر Ú©Ù?Û?د <i>Reset</i> را Ù?Ù?Û? Û?ابÛ?دØ? Ù? Û?ا اگر Vidalia Ù?ادر بÙ? رÛ?-استارت Tor "
-"Ù?Û?ستØ? Ù?Û? تÙ?اÙ?Û?د Ù?Ø´Ú©Ù? را بÙ? صÙ?رت دستÛ? Ø­Ù? Ú©Ù?Û?د. کاÙ?Û? است رÙ?Û? بخش Ù?دÛ?رÛ?ت پرÙ?سÙ? "
-"Ù? Ù?دÛ?رÛ?ت تکÙ?Û?Ù? Ú©Ù?Û?Ú© Ú©Ù?Û?د Ù? پرÙ?سÙ? Tor را Ù?طع Ú©Ù?Û?د. پس از Ø¢Ù? براÛ? رÛ?-استارت "
-"Tor از Vidaila استÙ?ادÙ? Ú©Ù?Û?د Ù? Ù?Ù?Ù? اپÙ?Û?Ú©Ø´Ù? Ù?ا دÙ?بارÙ? بکار Ù?Û? اÙ?تÙ?د. "
+"اگر Ø´Ù?ا دکÙ?Ù?\n"
+"<i> شرÙ?ع دÙ?بارÙ?</i> \n"
+"را Ù?Ù?Û? بÛ?Ù?Û?د Ø? Ù? Û?ا اگر Ù?Û?داÙ?Û?ا Ù?ادر بÙ? راÙ? اÙ?دازÛ? Ù?جددتÙ?ر براÛ? Ø´Ù?ا Ù?Û?ست Ø? Ø´Ù?ا Ù?Ù?Ù?ز Ù?ادر Ø­Ù? Ù?Ø´Ú©Ù? بصÙ?رت دستÛ? Û?ا غÛ?ر Ø®Ù?دکار Ù?ستÛ?د. Ù?گراÙ? Ù?باشÛ?د Ø? بÙ? Ù?دÛ?رÛ?ت اجراÛ?Û? برÙ?Û?د Ù?  تÙ?ر راÙ?تÙ?Ù?Ù? Ú©Ù?Û?د. سپس  از Ù?Û?داÙ?Û?ا براÛ? راÙ? اÙ?دازÛ? Ù?جدد تÙ?ر استÙ?ادÙ? Ú©Ù?Û?د Ù? Ù?Ù?Ù? Ú?Û?ز دÙ?بارÙ? کار Ø®Ù?اÙ?د کرد"
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:106
 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 ""
-"Ù¾Û?Ø´ از اÛ?Ù? Tor را Ù?عاÙ? کردÙ? بÙ?دÛ?د تا بÙ? عÙ?Ù?اÙ? سرÙ?Û?س Ù?عاÙ? باشد. اگر Tor بÙ? "
-"عÙ?Ù?اÙ? سرÙ?Û?سØ? Ù?عاÙ? باشدØ? با راÙ?-اÙ?دازÛ? سÛ?ستÙ? شرÙ?ع بÙ? کار Ù?Û? Ú©Ù?د. اگر Tor را "
-"تÙ?ظÛ?Ù? کردÙ? باشÛ?د تا بÙ? عÙ?Ù?اÙ? سرÙ?Û?سØ? Ù? از طرÛ?Ù? Vidaila آغاز Ú©Ù?دØ? Ú©Ù?Ù?Ù? عبÙ?رÛ? "
-"Ù?Ù? براÛ?Ø´ Ù?عÛ?Ù? شدÙ? Ù? در Tor سÛ?Ù? شدÙ? است. در Ù?Ù?گاÙ? راÙ?-اÙ?دازÛ? Ù?جددØ? Tor با "
-"استÙ?ادÙ? از Ú©Ù?Ù?Ù? عبÙ?ر تصادÙ?Û? Ú©Ù? سÛ?Ù? کردÙ? استØ? شرÙ?ع بÙ? کار Ù?Û? Ú©Ù?د. Ø´Ù?ا Ù?ارد "
-"سÛ?ستÙ? Ù?Û? Ø´Ù?Û?د Ù? Vidalia را Ù?عاÙ? Ù?Û? Ú©Ù?Û?د. Vidalia سعÛ? Ù?Û? Ú©Ù?د با Tor Ú©Ù? از Ù?بÙ? "
-"Ù?عاÙ? بÙ?دÙ? Ù?ارد Ù?کاÙ?Ù?Ù? Ø´Ù?د. Vidalia Û?Ú© Ú©Ù?Ù?Ù? عبÙ?ر تصادÙ?Û? تÙ?Ù?Û?د Ù?Û? Ú©Ù?دØ? اÙ?ا "
-"اÛ?Ù? Ú©Ù?Ù?Ù? عبÙ?ر با Ú©Ù?Ù?Ù? عبÙ?رÛ? Ú©Ù? در Tor سÛ?Ù? شدÙ?Ø? Ù?تÙ?اÙ?ت است."
+"Ù?رض Ú©Ù?Û?د Ú©Ù? Ù?بÙ?ا تÙ?ر را بÙ? عÙ?Ù?اÙ? Û?Ú© سرÙ?Û?س اجرا کردÙ? اÛ?د. Ù?Ù?گاÙ?Û? Ú©Ù? تÙ?ر Ù?رار "
+"است بÙ? عÙ?Ù?اÙ? Û?Ú© سرÙ?Û?س اجرا Ø´Ù?د Ø? در Ù?Ù?گاÙ? بÙ?ت شدÙ? دستگاÙ? آغاز بکار Ù?Û? Ú©Ù?د . "
+"اگر Ø´Ù?ا Ù¾Û?کربÙ?دÛ? تÙ?ر را بÙ? عÙ?Ù?اÙ? Û?Ú© سرÙ?Û?س از طرÛ?Ù? Ù?Û?داÙ?Û?ا اÙ?جاÙ? دادÙ? اÛ?د Ø? "
+"Û?Ú© رÙ?ز عبÙ?ر تصادÙ?Û? براÛ? تÙ?ر در Ù?Ù?اÙ? زÙ?اÙ? تÙ?ظÛ?Ù? Ù? ذخÛ?رÙ? Ù?Û? Ø´Ù?د. Ù?Ù?گاÙ?Û? Ú©Ù? "
+"دستگاÙ? راÙ? اÙ?دازÛ? Ù?جدد Ù?Û? Ø´Ù?د Ø? تÙ?ر براÙ? Ù?Û? اÙ?تد Ù? رÙ?ز عبÙ?ر ذخÛ?رÙ? شدÙ? را "
+"استÙ?ادÙ? Ù?Û? Ú©Ù?د. Ø´Ù?ا باÛ?د Ù?Û?داÙ?Û?ا را راÙ? اÙ?دازÛ? Ú©Ù?Û?د سپس Ù?Û?داÙ?Û?ا بÙ? Ù?رÙ? اÙ?زار"
+" در حاÙ? اجراÛ? تÙ?ر Ù?تصÙ? Ù?Û? Ø´Ù?د Ù? رÙ?ز عبÙ?ر جدÛ?دÛ? تÙ?Ù?Û?د Ù?Û? Ú©Ù?د Ú©Ù? از رÙ?ز عبÙ?ر "
+"تÙ?ر Ù?تÙ?اÙ?ت است"
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:114
 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\";> "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
-"Ø´Ù?ا Ù?Û? باÛ?ست Tor را Ø·Ù?رÛ? تÙ?ظÛ?Ù? Ú©Ù?Û?د Ú©Ù? سرÙ?Û?س Ù?باشد. بÙ? صÙ?Ø­Ù? wiki Tor در Ù?عاÙ? "
-"ساختÙ? Tor بÙ? عÙ?Ù?اÙ? سرÙ?Û?س در <a href=\"https://wiki.torproject.org/noreply/Th";
-"eOnionRouter/TorFAQ#WinNTService\"> Ù?راجعÙ? Ú©Ù?Û?د تا اطÙ?اعات بÛ?شتر در Ù?Ù?رد خارج "
-"کردÙ? Tor از Ù?ضعÛ?ت سرÙ?Û?س بÙ? دست Ø¢Ù?رÛ?د. "
+"Ø´Ù?ا باÛ?د Ù¾Û?کربÙ?دÛ? Ù?جدد تÙ?ر را تغÛ?Û?ر دÙ?Û?د تا دÛ?گر Û?Ú© سرÙ?Û?س Ù?باشد. براÛ? اÛ?Ù?کار صÙ?Ø­Ù? Ù?Û?Ú©Û? تÙ?ر را Ù?طاÙ?عÙ? Ú©Ù?Û?د\n"
+"<a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";> تÙ?ر بÙ? عÙ?Ù?اÙ? سرÙ?Û?س</a> Û? براÛ? کسب اطÙ?اعات بÛ?شتر در Ù?Ù?رد Ú?Ú¯Ù?Ù?Ú¯Û? حذÙ? سرÙ?Û?س تÙ?ر"
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:122
 msgid "<a name=\"torexited\"/>"
-msgstr "<Û?Ú© اسÙ?=\"Torخارج شد\"/>"
+msgstr "<a name=\"torexited\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:123
 msgid "Tor Exited Unexpectedly"
-msgstr "Tor Ù?اگÙ?اÙ? از سرÙ?Û?س خارج شد"
+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 ""
-"اگر Tor بÙ?اÙ?اصÙ?Ù? بعد از تÙ?اش براÛ? استارت خارج Ø´Ù?دØ? بÙ? احتÙ?اÙ? Ù?Ù?Û? Ø´Ù?ا Û?Ú© Tor "
-"دÛ?گر از Ù?بÙ? دارÛ?د Ú©Ù? Ù?عاÙ? است. Ù¾Û?اÙ? <a href=\"log.html\">message log</a> را Ú?Ú© "
-"Ú©Ù?Û?د ببÛ?Ù?Û?د Ø¢Û?ا Ù?Û?Ú?Û?Ú© از Ù¾Û?اÙ? Ù?اÛ? Ù?Û?ست با رÙ?Ú¯ زرد Ù?شخص شدÙ? اÙ?د Ù? Ù¾Û?اÙ?Û? شبÛ?Ù? "
-"بÙ? Ù¾Û?اÙ? زÛ?ر دارÙ?د Û?ا Ù?Ù?:"
+"اگر  تÙ?ر بÙ?اÙ?اصÙ?Ù? پس از تÙ?اش براÛ? شرÙ?ع بستÙ? Ø´Ù?د Ø? بÙ? احتÙ?اÙ? زÛ?اد Û?Ú©  Ù?راÛ?Ù?د تÙ?ر دÛ?گر در حاÙ? حاضر در حاÙ? اجراست\n"
+"<a href=\"log.html\">Ù?رÙ?د بÙ? سÛ?ستÙ? Ù¾Û?اÙ?</a> \n"
+"را Ú?Ú© Ú©Ù?Û?دتا ببÛ?Ù?Û?د اگر Ù?ر Û?Ú© از Ù¾Û?اÙ? Ù?ا در Ù?Û?ست Ù?ا بÙ? رÙ?Ú¯ زرد Ù?اÛ?Ù?اÛ?ت شدÙ? Ù? حاÙ?Û? Û?Ú© Ù¾Û?اÙ?Û? شبÛ?Ù? بÙ? Ù¾Û?اÙ? زÛ?ر است :"
 
 # 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 ""
-"ارتباط-اÛ?جاد-Ø´Ù?Ù?Ù?دÙ?(): اÙ?کاÙ? اتصاÙ? بÙ? 127.0.0.1:9050 Ù?بÙ?د: آدرس Ù¾Û?شاپÛ?Ø´ Ù?Ù?رد "
-"استÙ?ادÙ? بÙ?دÙ? است. Ø¢Û?ا Tor در حاÙ? حاضر Ù?عاÙ? استØ?"
+"connection_create_listener () : \n"
+"اتصاÙ? بÙ? 127.0.0.1:9050 : Ù?Ù?Ú©Ù? Ù?Û?ست. آدرس در حاÙ? حاضر در حاÙ? استÙ?ادÙ? است\n"
+". Ø¢Û?ا تÙ?ر در حاÙ? حاضر در حاÙ? اجراستØ?\n"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:135
@@ -291,34 +276,32 @@ msgid ""
 "operating systems, the <i>ps</i> command can help you find the other Tor "
 "process."
 msgstr ""
-"گر بÙ? Ù¾Û?اÙ? خطاØ? Ù?شابÙ? Ù¾Û?اÙ? باÙ?ا برخÙ?ردÛ?دØ? Ù?Û? باÛ?ست پرÙ?سÙ? TorÙ?اÛ? دÛ?گر را اپÛ?Ø´ "
-"از Ø¢Ù? Ú©Ù? Û?Ú© پرÙ?سÙ? تازÙ? Ù?Ù?راÙ? با Vidalia شرÙ?ع Ú©Ù?Û?دØ? Ù?طع Ú©Ù?Û?د. در Ù?Û?Ù?دÙ?زØ? "
-"<i>tor.exe</i> را در بخش Ù?دÛ?رÛ?ت تکÙ?Û?Ù? (task manager) Ù¾Û?دا Ú©Ù?Û?د. در اکثر "
-"سÛ?ستÙ? Ù?اÛ? عاÙ?Ù? دÛ?گرØ? Ù?رÙ?اÙ?<i>ps</i> Ù?Û? تÙ?اÙ?د بÙ? Û?اÙ?تÙ? دÛ?گر پرÙ?سÙ? Ù?اÛ? Tor Ú©Ù?Ú© "
-"Ú©Ù?د. "
+"اگر Ø´Ù?ا Ù¾Û?غاÙ? خطاÛ?Û? Ù?اÙ?Ù?دپÛ?اÙ? باÙ?ا درÛ?اÙ?ت کردÛ?د Ø?  اÙ?Ù? باÛ?د Ù?رآÛ?Ù?د دÛ?گر تÙ?ر را  Ù?بÙ? از شرÙ?ع Û?Ú© Ù?راÛ?Ù?د جدÛ?د با Ù?Û?داÙ?Û?ا Ù?تÙ?Ù?Ù? Ú©Ù?Û?د. در Ù?Û?Ù?دÙ?ز Ø?  بدÙ?باÙ?\n"
+" <i>tor.exe</i>\n"
+"  در Ù?دÛ?رÛ?ت اجراÛ?Û? بگردÛ?د . بر رÙ?Û? اکثر سÛ?ستÙ? عاÙ?Ù? Ù?اÛ? دÛ?گر Ø? <i>دستÙ?ر</i> ps \n"
+"Ù?Û? تÙ?اÙ?د Ú©Ù?Ú© Ú©Ù?د تا Ù?رآÛ?Ù?د دÛ?گر تÙ?ر را Ù¾Û?دا Ú©Ù?Û?د."
 
 # type: Content of: <html><body><p>
 #: 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 ""
-"اگر Tor براÛ? Ù?دتÛ? بÙ? Ø·Ù?ر Ù?Ù?Ù?Ù?Û?ت Ø¢Ù?Û?ز Ù?عاÙ? بÙ?دÙ?Ø? (Û?عÙ?Û? بÛ?شتر از Ú?Ù?د ثاÙ?Û?Ù?)Ø? "
-"Ù?Û? باÛ?ست بخش ذخÛ?رÙ? Ù¾Û?اÙ? <a href=\"log.html\">message log</a> را براÛ? اطÙ?اعات "
-"Ù?ربÙ?Ø· بÙ? Ù?ر Ù?Ù?ع خطاÛ?Û? Ú©Ù? Tor Ù?بÙ? از خرÙ?ج بÙ? Ø¢Ù? برخÙ?ردÙ?Ø? Ú?Ú© Ú©Ù?Û?د. اÛ?Ù? خطاÙ?ا "
-"با رÙ?Ú¯ زرد Ù? Û?ا Ù?رÙ?ز Ù?شخص شدÙ? اÙ?د."
+"اگر تÙ?ر براÛ? Ù?دتÛ? با Ù?Ù?Ù?Ù?Û?ت  در حاÙ? اجرا بÙ?دÙ? (Ø·Ù?Ù?اÙ?Û? تر از Ú?Ù?د ثاÙ?Û?Ù? )باÛ?د براÛ? کسب اطÙ?اعات در Ù?Ù?رد Ù?ر Ú¯Ù?Ù?Ù? خطا\n"
+"<a href=\"log.html\">Ù?رÙ?د بÙ? سÛ?ستÙ? Ù¾Û?اÙ?</a> \n"
+"را جستجÙ? Ú©Ù?Û?د. Ú?Ù?Û?Ù? اشتباÙ?اتÛ? بارÙ?Ú¯  Ù?رÙ?ز Û?ا زرد پر رÙ?Ú¯ شدÙ? است."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:147
 msgid "<a name=\"stop\"/>"
-msgstr "<Û?Ú© اسÙ?=\"تÙ?Ù?Ù?\"/>"
+msgstr "<a name=\"stop\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:148
 msgid "Vidalia Can't Stop Tor"
-msgstr "Vidalia Ù?ادر Ù?Û?ست Tor را Ù?تÙ?Ù?Ù? Ú©Ù?د"
+msgstr "Ù?Û?داÙ?Û?ا تÙ?ر را Ù?تÙ?Ù?Ù? Ù?Ù?Û?Ú©Ù?د"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:150
@@ -327,6 +310,8 @@ msgid ""
 "href=\"log.html\">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
-"اگر Vidalia Ù?تÙ?اÙ?د Tor را Ù?تÙ?Ù?Ù? Ú©Ù?دØ? Ù?Û? باÛ?ست Ù?خزÙ? Ù¾Û?اÙ? Ø®Ù?د در <a "
-"href=\"log.html\">message log</a> Ú?Ú© Ú©Ù?Û?د Ù? ببÛ?Ù?Û?د Ø¢Û?ا Tor Ù¾Û?اÙ? خطاÛ?Û? Ù?بÙ? از "
-"تÙ?اش براÛ? خرÙ?ج ارساÙ? کردÙ? است Û?ا Ù?Ù?."
+"اگر Ù?Û?داÙ?Û?ا تÙ?ر را Ù?تÙ?Ù?Ù? Ù?کرد Ø? Ø´Ù?ا باÛ?د بÙ?\n"
+"<a href=\"log.html\">آرشÛ?Ù?Ù¾Û?اÙ? </a>\n"
+"  برÙ?Û?د Ù? Ú?Ú© Ú©Ù?Û?د Ú©Ù? تÙ?ر گزارشÛ? از اشتباÙ?  در حاÙ? تÙ?اش براÛ? خرÙ?ج Ù?گذاشتÙ? باشد"
+
+
diff --git a/fr/bridges.po b/fr/bridges.po
index f0b51f5..207f5c0 100644
--- a/fr/bridges.po
+++ b/fr/bridges.po
@@ -1,10 +1,13 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
+# skhaen <skhaen@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -128,3 +131,5 @@ msgid ""
 msgstr ""
 "Configurer plusieurs passerelles rend la connexion Tor plus stable au cas où"
 " certaines passerelles deviennent inaccessibles."
+
+
diff --git a/fr/config.po b/fr/config.po
index 722a595..512fdbf 100644
--- a/fr/config.po
+++ b/fr/config.po
@@ -1,27 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2010-07-12 15:29-0600\n"
+"PO-Revision-Date: 2010-12-21 22:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -36,9 +28,9 @@ msgid ""
 "href=\"server.html\">Tor relay</a> so you can help the Tor network grow."
 msgstr ""
 "Vidalia vous permet de configurer quelques-uns des aspects communément "
-"modifiables de Vidalia et de Tor. Il vous permet aussi de mettre en place et "
-"de gérer un <a href=\"server.html\">relai Tor</a> afin d'aider le réseau Tor "
-"à grandir."
+"modifiables de Vidalia et de Tor. Il vous permet aussi de mettre en place et"
+" de gérer un <a href=\"server.html\">relai Tor</a> afin d'aider le réseau "
+"Tor à grandir."
 
 #. type: Content of: <html><body>
 #: en/config.html:26
@@ -52,7 +44,8 @@ msgstr "Paramètres généraux"
 
 #. 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 ""
 "Les paramètres sur la page <i>Paramètres généraux</i> sont les paramètres "
 "les plus souvent modifiés."
@@ -60,10 +53,10 @@ 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 ""
 "<b>Exécutable Tor</b>: Ceci est le fichier exécutable de Tor que Vidalia "
@@ -97,8 +90,8 @@ msgstr "Paramètres du réseau"
 #. 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 ""
 "La page des paramètres <i>Réseau</i> vous permet de modifier comment Tor se "
 "connecte au réseau Tor."
@@ -117,8 +110,8 @@ msgstr ""
 "<b>J'utilise un proxy pour accéder à internet</b>: Si votre connexion "
 "Internet requiert un proxy HTTP, vous pouvez configurer Tor pour diriger "
 "toutes les requêtes et les connexions relais à travers ce proxy. Vous devez "
-"au moins spécifier le nom d'hôte ou l'adresse de votre proxy, et le port sur "
-"lequel le proxy attend des connexions. Si votre proxy demande une "
+"au moins spécifier le nom d'hôte ou l'adresse de votre proxy, et le port sur"
+" lequel le proxy attend des connexions. Si votre proxy demande une "
 "authetification, vous pouvez aussi entrer le <i>nom d'utilisateur</i> et le "
 "<i>mot de passe</i> que vous utilisez pour vous connecter à votre proxy.  "
 "Autrement, vous pouvez laisser ces champs vides."
@@ -130,15 +123,15 @@ 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>Mon pare-feu me permet de me connecter seulement sur certains ports</b>: "
-"si vous êtes derrière un pare-feu réstrictif ou derrière un proxy qui limite "
-"les connexions à certains ports seulement, vous pouvez configurer Tor de "
+"si vous êtes derrière un pare-feu réstrictif ou derrière un proxy qui limite"
+" les connexions à certains ports seulement, vous pouvez configurer Tor de "
 "sorte à se connecter directement sur des relais qui écoutent seulement sur "
-"les ports autorisés par votre pare-feu ou proxy. Entrez simplement une liste "
-"de ports autorisés par votre pare-feu ou proxy, séparé par des virgules. "
+"les ports autorisés par votre pare-feu ou proxy. Entrez simplement une liste"
+" de ports autorisés par votre pare-feu ou proxy, séparé par des virgules. "
 "(<i>Exemple: 80,443,8080</i>)"
 
 #. type: Content of: <html><body><ul><li>
@@ -148,8 +141,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 ""
 "<b>Mon FAI bloque des connexions sur le réseau Tor</b>: Si votre FAI "
 "(Fournisseur d'accès à Internet) bloque les connexions sur le réseau Tor, "
@@ -162,7 +155,8 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:77
 msgid "Below are examples of valid bridge address formats:"
-msgstr "Voici quelques exemples de formats d'adresses de passerelles valides :"
+msgstr ""
+"Voici quelques exemples de formats d'adresses de passerelles valides :"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:80
@@ -184,10 +178,10 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
 msgid ""
 "Even if you do not know any bridge relay addresses, checking this checkbox "
 "may still be helpful. Tor will encrypt its directory requests, which can "
-"defeat blocking mechanisms that try to filter Tor's requests for information "
-"about other relays. If connections to normal Tor relays are also blocked, "
-"then you will need to learn a bridge relay address somehow and add it "
-"here. See the help topic on <a href=\"bridges.html#finding\">finding bridge "
+"defeat blocking mechanisms that try to filter Tor's requests for information"
+" about other relays. If connections to normal Tor relays are also blocked, "
+"then you will need to learn a bridge relay address somehow and add it here. "
+"See the help topic on <a href=\"bridges.html#finding\">finding bridge "
 "relays</a> for more information on how to learn new bridge relay addresses "
 "and fingerprints."
 msgstr ""
@@ -214,11 +208,11 @@ msgstr "Paramètres relai"
 #. type: Content of: <html><body><p>
 #: en/config.html:103
 msgid ""
-"<i> See <a href=\"server.html\">this help topic</a> for detailed information "
-"about setting up and managing a Tor relay.  </i>"
+"<i> See <a href=\"server.html\">this help topic</a> for detailed information"
+" about setting up and managing a Tor relay.  </i>"
 msgstr ""
-"<i> Lire <a href=\"server.html\">l'aide</a> pour des informations détaillées "
-"sur la mise en place et la gestion d'un relai Tor.  </i>"
+"<i> Lire <a href=\"server.html\">l'aide</a> pour des informations détaillées"
+" sur la mise en place et la gestion d'un relai Tor.  </i>"
 
 #. type: Content of: <html><body>
 #: en/config.html:109
@@ -242,19 +236,19 @@ 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>Langue:</b>: l'interface de Vidalia a été traduite dans de nombreuses "
 "langues par des volontaires. Lorsque Vidalia est lancé pour la première "
 "fois, l'application tentera de deviner quelle est la langue employée sur "
-"l'ordinateur en cours d'utilisation. Si Vidalia n'a pas fait le bon choix ou "
-"bien si voous désirez utiliser une autre langue, vous pouvez en choisir une "
-"sur la liste déroulante. Vous devrez redémarrer Vidalia afin que la langue "
+"l'ordinateur en cours d'utilisation. Si Vidalia n'a pas fait le bon choix ou"
+" bien si voous désirez utiliser une autre langue, vous pouvez en choisir une"
+" sur la liste déroulante. Vous devrez redémarrer Vidalia afin que la langue "
 "utilisée soit celle que vous avez choisie."
 
 #. type: Content of: <html><body><ul><li>
@@ -264,8 +258,8 @@ msgid ""
 "default interface style. If you dislike the default, you can choose "
 "whichever interface style you prefer from the dropdown box."
 msgstr ""
-"<b>Style</b>: Dans la plupart des cas, Vidalia utilisera le style par défaut "
-"de votre plateforme. Si ce dernier ne vous plaît pas, vous pouvez le "
+"<b>Style</b>: Dans la plupart des cas, Vidalia utilisera le style par défaut"
+" de votre plateforme. Si ce dernier ne vous plaît pas, vous pouvez le "
 "changer en en sélectionnant un autre dans la liste déroulante. "
 
 #. type: Content of: <html><body>
@@ -290,8 +284,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 ""
@@ -310,8 +304,8 @@ msgid ""
 msgstr ""
 "<b>Authentification du Port de Contrôle</b>: L'authentification du port de "
 "contrôle est utilisée pour gérer quelles seront les applications de votre "
-"machine qui pourront se connecter et reconfigurer l'installation de Tor. Les "
-"méthodes d'authentification suivantes sont disponibles:"
+"machine qui pourront se connecter et reconfigurer l'installation de Tor. Les"
+" méthodes d'authentification suivantes sont disponibles:"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:150
@@ -330,21 +324,21 @@ 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>Mot de passe</b> <i>(Défaut)</i> -- Lorsque cette méthode est employée, "
 "vous pouvez indiquer un mot de passe que Tor demandera chaque fois qu'un "
 "utilisateur ou une application tentera de se connecter au port de contrôle. "
-"Si Vidalia lance Tor pour vous, vous pouvez faire en sorte que l'application "
-"génère un nouveau mot de passe au hasard, à chaque fois qu'elle démarrera "
+"Si Vidalia lance Tor pour vous, vous pouvez faire en sorte que l'application"
+" génère un nouveau mot de passe au hasard, à chaque fois qu'elle démarrera "
 "Tor en activant la case <i>Génération Aléatoire</i>."
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:162
 msgid ""
-"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file "
-"(or, <i>cookie</i>) containing random bytes to its data directory when it "
+"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file"
+" (or, <i>cookie</i>) containing random bytes to its data directory when it "
 "starts. Any user or application that tries to connect to Tor's control port "
 "must be able to provide the contents of this cookie."
 msgstr ""
@@ -375,18 +369,18 @@ 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>Répertoire de Données de Tor</b> <i>(optionnel)</i>: Vous pouvez indiquer "
-"l'emplacement dans lequel Tor enregistrera ses données telles que le cache "
+"<b>Répertoire de Données de Tor</b> <i>(optionnel)</i>: Vous pouvez indiquer"
+" l'emplacement dans lequel Tor enregistrera ses données telles que le cache "
 "d'information sur les relais, les clefs ainsi que les fichiers de "
-"configuration. Si vous laissez ce champ à blanc, Tor utilisera l'emplacement "
-"par défaut."
+"configuration. Si vous laissez ce champ à blanc, Tor utilisera l'emplacement"
+" par défaut."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:181
 msgid ""
-"<b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter "
-"a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it "
-"starts.  If you enter a value for <b>Run as Group</b>, Tor will "
+"<b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter"
+" a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it"
+" starts.  If you enter a value for <b>Run as Group</b>, Tor will "
 "<i>setgid</i> to this group when it starts."
 msgstr ""
 "<b>Permissions</b> <i>(optionnel, non disponible sous Windows)</i>: Si vous "
@@ -408,9 +402,11 @@ msgstr "Paramètres des Services cachés"
 #. 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 ""
 "Les services cachés vous permettent de mettre à disposition d'autres "
 "personnes tout type de service basé sur le TCP, par exemple, un service "
 "HTTP, sans révéler votre adresse IP."
+
+
diff --git a/fr/links.po b/fr/links.po
index 788c8c4..2268960 100644
--- a/fr/links.po
+++ b/fr/links.po
@@ -1,11 +1,14 @@
 # 
+# Translators:
+# mehditaileb <mehditaileb@xxxxxxxxxxxxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-05-11 00:17+0000\n"
+"Last-Translator: mehditaileb <mehditaileb@xxxxxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,12 +48,12 @@ msgstr ""
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:31 links.html:58
 msgid "Wiki and Bugtracker"
-msgstr ""
+msgstr "Wiki et Bugtracker"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:33
 msgid "<a href=\"http://trac.torproject.org/\";> http://trac.torproject.org/</a>"
-msgstr ""
+msgstr "<a href=\"http://trac.torproject.org/\";>http://trac.torproject.org/</a>"
 
 #. type: Content of: <html><body><h3>
 #: links.html:39
@@ -73,8 +76,12 @@ msgid ""
 "<a href=\"https://www.torproject.org/docs/faq.html\";> "
 "https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
+"<a "
+"href=\"https://www.torproject.org/docs/faq.html\";>https://www.torproject.org/docs/faq.html</a>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
-msgstr ""
+msgstr "<a href=\"https://trac.torproject.org/\";>https://trac.torproject.org/</a>"
+
+
diff --git a/fr/log.po b/fr/log.po
index b18adb4..39e5d9b 100644
--- a/fr/log.po
+++ b/fr/log.po
@@ -1,28 +1,20 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed by
-#   the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified, propagated, or
-#   distributed except according to the terms described in the LICENSE
-#   file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
+# skhaen <skhaen@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,18 +24,18 @@ msgstr "Journal des messages"
 #. 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\"/>"
-msgstr ""
-"Le Journal permet de suivre les informations d'état d'une instance de Tor en "
-"cours d'utilisation.  <a name=\"basic\"/> Chaque message est associé a un "
+"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 ""
+"Le Journal permet de suivre les informations d'état d'une instance de Tor en"
+" cours d'utilisation.  <a name=\"basic\"/> Chaque message est associé à un "
 "niveau de <i>gravité</i>, depuis <b>Erreur</b> (le plus sérieux) jusqu'à "
 "<b>Débogage</b> (le plus bavard). Consultez la section suivante sur la <a "
-"href=\"#severities\">gravité des messages</a> pour davantage d'informations.  "
-"<a name=\"severities\"/>"
+"href=\"#severities\">gravité des messages</a> pour davantage d'informations."
+"  <a name=\"severities\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/log.html:28
@@ -54,9 +46,9 @@ msgstr "Niveaux de gravité des messages"
 #: 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 ""
 "Le niveau de gravité permet de connaître l'importance d'un message. Un "
 "message de gravité supérieure indique généralement qu'un problème est "
@@ -66,8 +58,10 @@ msgstr ""
 
 #. type: Content of: <html><body><p>
 #: en/log.html:37
-msgid "The possible message severities, from most severe to least severe, are:"
-msgstr "Les niveaux de gravité sont les suivants, du plus au moins sévère:"
+msgid ""
+"The possible message severities, from most severe to least severe, are:"
+msgstr ""
+"Les niveaux de gravité sont les suivants, du plus grave au moins sévère:"
 
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:41
@@ -83,9 +77,9 @@ 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 ""
 "<b>Avertissement</b>&nbsp;: Ces messages s'affichent lorsque Tor rencontre "
 "un problème qui ne l'empêche pas de continuer. Ils sont surlignés en "
@@ -94,8 +88,8 @@ 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 ""
 "<b>Signalement</b>&nbsp;: Ces messages apparaissent quelquefois lors des "
 "opérations normales de Tor. Ils ne sont pas considérés comme des erreurs, "
@@ -104,8 +98,8 @@ 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 ""
 "<b>Information</b>&nbsp;: Ces messages renvoient aux opérations normales de "
 "Tor et ne présentent généralement pas d'intérêt pour la plupart des "
@@ -115,12 +109,12 @@ msgstr ""
 #: 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 ""
 "<b>Débogage</b>&nbsp;: Ces messages extrêmement complets sont avant tout "
-"destinés aux développeurs. Vous ne devez généralement pas les afficher, sauf "
-"si vous savez exactement ce que vous faîtes."
+"destinés aux développeurs. Vous ne devez généralement pas les afficher, sauf"
+" si vous savez exactement ce que vous faîtes."
 
 #. type: Content of: <html><body><p>
 #: en/log.html:66
@@ -133,7 +127,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 ""
 "Pour choisir les niveaux de gravité des messages que vous souhaitez "
 "afficher, vous devez suivre cette procédure&nbsp;:"
@@ -153,11 +148,11 @@ msgstr "Cliquez <i>Options</i> en haut de la fenêtre du Journal."
 #. 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 ""
-"Cochez les niveaux de gravité que vous souhaitez afficher dans la fenêtre du "
-"Journal des messages et décochez les autres."
+"Cochez les niveaux de gravité que vous souhaitez afficher dans la fenêtre du"
+" Journal des messages et décochez les autres."
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:79
@@ -188,10 +183,11 @@ 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 ""
-"Cochez la case intitulé <i>Enregistrer automatiquement les nouveaux messages "
-"dans un fichier </i>."
+"Cochez la case intitulé <i>Enregistrer automatiquement les nouveaux messages"
+" dans un fichier </i>."
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:96
@@ -200,8 +196,8 @@ msgid ""
 "either type the path and filename into the text box, or click <i>Browse</i> "
 "to navigate to a location for your log file."
 msgstr ""
-"Si vous voulez changer le fichier dans lequel les messages sont enregistrés, "
-"entrez le chemin et le nom du fichier dans le champ ou cliquez "
+"Si vous voulez changer le fichier dans lequel les messages sont enregistrés,"
+" entrez le chemin et le nom du fichier dans le champ ou cliquez "
 "<i>Parcourir</i> pour naviguer jusqu'à votre fichier d'historique."
 
 #. type: Content of: <html><body><ol><li>
@@ -210,3 +206,5 @@ msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
 "Cliquez <i>Enregistrer les options</i> pour sauvegarder le chemin du "
 "Journal."
+
+
diff --git a/fr/netview.po b/fr/netview.po
index e699176..6333e1f 100644
--- a/fr/netview.po
+++ b/fr/netview.po
@@ -1,11 +1,12 @@
 # 
+# Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:05+0000\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
diff --git a/fr/running.po b/fr/running.po
index 491946b..00b1cfd 100644
--- a/fr/running.po
+++ b/fr/running.po
@@ -1,28 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -81,13 +72,13 @@ 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 ""
 "Si Vidalia ne peut pas démarrer Tor, l'application affichera un message "
 "d'erreur indiquant ce qui n'a pas fonctionné. Vous pouvez également "
-"consulter <a href=\"log.html\">le journal des messages</a> pour voir si Tor a "
-"émis plus d'information sur ce qui ne s'est pas correctement déroulé."
+"consulter <a href=\"log.html\">le journal des messages</a> pour voir si Tor "
+"a émis plus d'information sur ce qui ne s'est pas correctement déroulé."
 
 #. type: Content of: <html><body><p>
 #: en/running.html:43
@@ -115,13 +106,13 @@ 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 ""
 "Si Vidalia ne peut pas arrêter Tor, l'application affichera un message "
 "d'erreur indiquant ce qui n'a pas fonctionné. Vous pouvez également "
-"consulter <a href=\"log.html\">le journal des messages</a> pour voir si Tor a "
-"émis plus d'information sur ce qui ne s'est pas correctement déroulé."
+"consulter <a href=\"log.html\">le journal des messages</a> pour voir si Tor "
+"a émis plus d'information sur ce qui ne s'est pas correctement déroulé."
 
 #. type: Content of: <html><body>
 #: en/running.html:57
@@ -146,7 +137,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 ""
 "Tor est arrêté. Sélectionnez <i>Démarrer</i> depuis le menu Vidalia pour "
 "démarrer Tor."
@@ -157,22 +149,22 @@ 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 est en cours de démarrage. Vous pouvez consultez <a href=\"log.html\">le "
-"journal des évènements</a> pour obtenir une information sur l'état de Tor au "
-"cours de son démarrage."
+"Tor est en cours de démarrage. Vous pouvez consultez <a href=\"log.html\">le"
+" journal des évènements</a> pour obtenir une information sur l'état de Tor "
+"au cours de son démarrage."
 
 #. 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 fonctionne. Si vous désirez l'arrêter, sélectionnez <i>Arrêt</i> depuis "
 "le menu Vidalia. Tor affichera ses messages d'informations dans <a "
-"href=\"log.html\">le journal des évènements</a> si vous désirez voir ce qu'il "
-"fait."
+"href=\"log.html\">le journal des évènements</a> si vous désirez voir ce "
+"qu'il fait."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:92
@@ -183,12 +175,14 @@ msgstr "Tor est en cours d'arrêt."
 #: 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 ""
 "Si Tor se termine prématurément, Vidalia changera son icône en oignon noir "
 "avec une croix rouge et affichera un message d'erreur vous permettant de "
 "savoir ce qui n'a pas fonctionné. Vous pouvez également vérifier dans <a "
-"href=\"log.html\">le journal des évènements</a> pour trouver plus de détails "
-"sur les problèmes que Tor a rencontré avant de se terminer."
+"href=\"log.html\">le journal des évènements</a> pour trouver plus de détails"
+" sur les problèmes que Tor a rencontré avant de se terminer."
+
+
diff --git a/fr/server.po b/fr/server.po
index 3ff8520..899a2b9 100644
--- a/fr/server.po
+++ b/fr/server.po
@@ -1,28 +1,20 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed by
-#   the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified, propagated, or
-#   distributed except according to the terms described in the LICENSE
-#   file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
+# skhaen <skhaen@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -38,8 +30,8 @@ msgid ""
 msgstr ""
 "Le réseau Tor est constitué par des bénévoles du monde entier qui donnent "
 "une partie de leur bande passante perdue en installant un relais Tor. "
-"Vidalia vous aide à participer au réseau Tor en facilitant l'installation de "
-"votre propre relais.  <a name=\"basic\"/>"
+"Vidalia vous aide à participer au réseau Tor en facilitant l'installation de"
+" votre propre relais.  <a name=\"basic\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:24
@@ -52,8 +44,8 @@ msgid ""
 "If you decide you want to help the Tor network grow by running a relay, you "
 "can follow these steps to get started:"
 msgstr ""
-"Si vous décidez de participer à la croissance du réseau Tor en installant un "
-"relais, vous pouvez suivre la procédure suivante."
+"Si vous décidez de participer à la croissance du réseau Tor en installant un"
+" relais, vous pouvez suivre la procédure suivante."
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:31
@@ -78,15 +70,15 @@ 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 ""
 "Précisez si vous souhaitez installer un relais Tor normal ou un relais "
 "<i>passerelle</i> (Tor 0.2.0.8-alpha ou plus récent). Une passerelle permet "
-"d'aider les utilisateurs de Tor bloqués par la censure et qui ne peuvent pas "
-"accéder directement au réseau Tor. Cochez la case <i>Relayer le trafic pour "
-"le réseau Tor</i> si vous voulez installer un relais Tor normal ou <i>Aider "
-"les utilisateurs censurés à accéder au réseau Tor</i> si vous voulez "
+"d'aider les utilisateurs de Tor bloqués par la censure et qui ne peuvent pas"
+" accéder directement au réseau Tor. Cochez la case <i>Relayer le trafic pour"
+" le réseau Tor</i> si vous voulez installer un relais Tor normal ou <i>Aider"
+" les utilisateurs censurés à accéder au réseau Tor</i> si vous voulez "
 "installer un relais passerelle."
 
 #. type: Content of: <html><body><ol><li>
@@ -100,8 +92,8 @@ msgid ""
 "<b>Nickname</b>: The name which your relay will be known as on the Tor "
 "network. An example of a relay nickname is \"MyVidaliaRelay\"."
 msgstr ""
-"<b>Surnom (nickname)</b>: Le nom qui permettra à votre relais d'être connu "
-"sur le réseau Tor. Il s'agit par exemple de \"MonRelaisVidalia\"."
+"<b>nickname</b>: Le nom qui permettra à votre relais d'être connu sur le "
+"réseau Tor. Il s'agit par exemple de \"MyVidaliaRelay\"."
 
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:50
@@ -119,27 +111,27 @@ 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 ""
-"<b>Port du relais</b>: Le port par lequel votre relais écoutera le trafic de "
-"clients ou d'autres relais Tor."
+"<b>Port du relais</b>: Le port par lequel votre relais écoutera le trafic de"
+" clients ou d'autres relais Tor."
 
 #. 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 ""
 "Si vous voulez également installer un miroir de l'annuaire Tor des relais, "
 "cochez la case <i>Servir de miroir à l'annuaire des relais</i>.  Si vous "
 "disposez d'une bande passante limitée, décochez cette case. Si vous décidez "
-"malgré tout d'installer un miroir de l'annuaire, assurez-vous que le <i>port "
-"de l'annuaire</i> est différent du <i>port du relais</i> que vous avez "
+"malgré tout d'installer un miroir de l'annuaire, assurez-vous que le <i>port"
+" de l'annuaire</i> est différent du <i>port du relais</i> que vous avez "
 "indiquez plus haut. Les passerelles <i>doivent</i> avoir un miroir de "
 "l'annuaire des relais."
 
@@ -158,11 +150,11 @@ msgstr "Limites de la bande passante"
 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 ""
-"Un relais Tor peut consommer une grande quantité de bande passante. C'est la "
-"raison pour laquelle Tor vous permet de préciser le niveau de bande "
+"Un relais Tor peut consommer une grande quantité de bande passante. C'est la"
+" raison pour laquelle Tor vous permet de préciser le niveau de bande "
 "passante que vous souhaitez accorder au réseau Tor. Cela vous permet de "
 "faire fonctionner un relais Tor tout en conservant une connexion suffisante "
 "pour votre propre usage."
@@ -187,11 +179,11 @@ msgstr "Limites personnalisées"
 #: 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 ""
@@ -209,8 +201,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 ""
@@ -224,18 +216,18 @@ 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>."
 msgstr ""
 "Il est important de se rappeler que Tor mesure la bande passante en "
-"<b>octets</b> et non en bits. En outre, Tor comptabilise les octets entrants "
-"et non les octets sortants. De ce fait, si votre relais est également un "
-"miroir de l'annuaire des relais, vous enverrez davantage de données que vous "
-"n'en recevrez. Si vous constatez que cela constitue une contrainte trop "
+"<b>octets</b> et non en bits. En outre, Tor comptabilise les octets entrants"
+" et non les octets sortants. De ce fait, si votre relais est également un "
+"miroir de l'annuaire des relais, vous enverrez davantage de données que vous"
+" n'en recevrez. Si vous constatez que cela constitue une contrainte trop "
 "forte pour votre bande passante, vous devrez penser à décocher la case "
 "<i>Servir de miroir à l'annuaire des relais</i>."
 
@@ -262,8 +254,8 @@ msgstr ""
 "Internet auxquelles les utilisateurs du réseau Tor peuvent accéder par le "
 "biais de votre relais. Par défaut, Tor utilise une liste de politiques de "
 "sortie qui empêche l'utisation de certains services, notamment l'envoi de "
-"courriels (afin d'éviter les spams) et certains ports de partage de fichiers "
-"(afin de réduire l'usage abusif du réseau Tor)."
+"courriels (afin d'éviter les spams) et certains ports de partage de fichiers"
+" (afin de réduire l'usage abusif du réseau Tor)."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:121
@@ -277,8 +269,8 @@ msgid ""
 msgstr ""
 "Chaque case représente un type de ressources. Vous pouvez permettre ou "
 "refuser aux utilisateurs de Tor de passer par votre relais pour y accéder. "
-"Si vous décocher une case, les utilisateurs de Tor ne seront pas autorisés à "
-"accéder à la ressource correspondante à travers votre relais. Si la case "
+"Si vous décocher une case, les utilisateurs de Tor ne seront pas autorisés à"
+" accéder à la ressource correspondante à travers votre relais. Si la case "
 "<i>Autres services</i> est cochée, les utilisateurs de Tor pourront accéder "
 "aux services non couverts par les autres cases à cocher ou par la politique "
 "de sortie par défaut de Tor."
@@ -288,8 +280,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 ""
 "Pour information, le tableau suivant liste les numéros de ports des "
 "politiques de sortie. La colonne <b>Description</b> signale les ressources "
@@ -368,7 +360,8 @@ msgstr "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888"
 
 #. 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 ""
 "Applications de messageries instantanées telles que Jabber, MSN Messenger, "
 "AIM et ICQ"
@@ -446,18 +439,18 @@ msgstr "Transfert de Ports"
 #: 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 ""
-"De nombreux utilisateurs se connectent à Internet par un <i>routeur</i>, qui "
-"permet plusieurs ordinateurs sur un réseau local de partager la même "
+"De nombreux utilisateurs se connectent à Internet par un <i>routeur</i>, qui"
+" permet plusieurs ordinateurs sur un réseau local de partager la même "
 "connexion Internet.  Certains utilisateurs peuvent également être derrière "
 "un <i>pare-feu</i> qui bloque les connexions à votre ordinateur à partir "
-"d'autres ordinateurs d'Internet. Si vous voulez, toutefois, opérer un relais "
-"Tor, d'autres clients et relais Tor doivent être en mesure de se connecter "
+"d'autres ordinateurs d'Internet. Si vous voulez, toutefois, opérer un relais"
+" Tor, d'autres clients et relais Tor doivent être en mesure de se connecter "
 "à votre relais à travers votre routeur ou votre pare-feu."
 
 #. type: Content of: <html><body><p>
@@ -472,25 +465,25 @@ msgstr ""
 "Pour rendre votre relais publiquement accessible, votre routeur ou pare-feu "
 "doit savoir quels ports autoriser pour votre ordinateur, la mise en place "
 "est connu sous le nom de <i> transfert de ports </i>. Le transfert de ports "
-"configure votre routeur ou pare-feu pour \"rediriger\" toutes les connexions "
-"de certains ports de votre routeur ou pare-feu locaux vers les ports ouverts "
-"correspondants de votre ordinateur."
+"configure votre routeur ou pare-feu pour \"rediriger\" toutes les connexions"
+" de certains ports de votre routeur ou pare-feu locaux vers les ports "
+"ouverts correspondants de votre ordinateur."
 
 #. type: Content of: <html><body><p>
 #: 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."
 msgstr ""
 "Si vous cochez la case <i>Tenter de configurer automatiquement le transfert "
 "de ports</i>, Vidalia tentera de mettre en place automatiquement le "
-"transfert de port sur votre connexion réseau pour que les autres Tor clients "
-"puissent se connecter à votre relais. Mais, tous les routeurs ne supportent "
-"pas le transfert automatique de ports.  Vous pouvez utiliser le "
+"transfert de port sur votre connexion réseau pour que les autres Tor clients"
+" puissent se connecter à votre relais. Mais, tous les routeurs ne supportent"
+" pas le transfert automatique de ports.  Vous pouvez utiliser le "
 "bouton<i>Test</i> à côté de la case à cocher pour savoir si Vidalia est en "
 "mesure de mettre en place automatiquement le transfert de port pour vous."
 
@@ -504,27 +497,27 @@ 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/\";>http://192.168.0.1</a> or <a "
-"href=\"http://192.168.1.1/\";>http://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/\";>http://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
 "Si le <i>Test</i> estime que Vidalia n'est pas en mesure de mettre en place "
 "le transfert de port pour vous, vous pouvez activer cette fonctionalité sur "
 "votre routeur ou paramétrer la redirection de port manuellement. Certains "
-"périphériques réseau ont une fonction appelée <i>Universal Plug-and-Play</i> "
-"(UPnP). Si vous pouvez accéder à votre routeur interface d'administration, "
+"périphériques réseau ont une fonction appelée <i>Universal Plug-and-Play</i>"
+" (UPnP). Si vous pouvez accéder à votre routeur interface d'administration, "
 "vous devriez chercher à activer une option UPnP. Le interface "
 "d'administration de la plupart des routeurs peut être accessible en ouvrant "
 "<a href=\"http://192.168.0.1/\";>http://192.168.0.1</a> ou <a "
 "href=\"http://192.168.1.1/\";>http://192.168.1.1</a> dans votre navigateur. "
-"Vous devriez consulter le manuel d'instruction de votre routeur pour de plus "
-"amples informations."
+"Vous devriez consulter le manuel d'instruction de votre routeur pour de plus"
+" amples informations."
 
 #. 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\";> "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" 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 "
@@ -533,12 +526,15 @@ msgid ""
 "default on all operating systems."
 msgstr ""
 "Si vous devez configurer manuellement le transfert de port, le site <a href "
-"= \"http://www.portforward.com/english/routers/port_forwarding/routerindex.ht";
-"m\"> portforward.com </a> contient des instructions sur la manière de mettre "
-"en place la redirection de port pour de nombreux types de routeurs et pare-"
-"feu.  Au minimum, vous aurez besoin de transférer <i>votre Port Relais</i>, "
-"qui par défaut est le port 443 sur Windows et 9001 sur tous les autres "
-"systèmes d'exploitation. Si vous avez aussi coché la case <i>Servir de "
-"miroir à l'annuaire des relais</i>, vous devrez également trasferrer votre "
-"<i> Port Annuaire</i>. Le <i> Port Annuaire</i> est le port 9030 par défaut "
-"sur tous les les systèmes d'exploitation."
+"= "
+"\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" portforward.com </a> contient des instructions sur la manière de mettre en "
+"place la redirection de port pour de nombreux types de routeurs et pare-feu."
+"  Au minimum, vous aurez besoin de transférer <i>votre Port Relais</i>, qui "
+"par défaut est le port 443 sur Windows et 9001 sur tous les autres systèmes "
+"d'exploitation. Si vous avez aussi coché la case <i>Servir de miroir à "
+"l'annuaire des relais</i>, vous devrez également trasferrer votre <i> Port "
+"Annuaire</i>. Le <i> Port Annuaire</i> est le port 9030 par défaut sur tous "
+"les les systèmes d'exploitation."
+
+
diff --git a/fr/services.po b/fr/services.po
index e97907f..5792cb0 100644
--- a/fr/services.po
+++ b/fr/services.po
@@ -1,28 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed by
-#   the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified, propagated, or
-#   distributed except according to the terms described in the LICENSE
-#   file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -43,8 +34,8 @@ msgstr ""
 "votre configuration des services cachées. Donc, ne comptez pas sur cette "
 "fonctionnalité, ou plutôt, ne pas nous blâmez pas si quelque chose ne va "
 "pas.  Si vous trouvez des bogues ou vous avez des commentaires sur cette "
-"nouvelle fonctionnalité, merci de nous le faire savoir! Nous avons besoin de "
-"vos commentaires.  <a name=\"about\"/>"
+"nouvelle fonctionnalité, merci de nous le faire savoir! Nous avons besoin de"
+" vos commentaires.  <a name=\"about\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:26
@@ -112,9 +103,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 ""
 "Il y a un bon tutoriel sur le site web de Tor "
 "(https://www.torproject.org/docs/tor-hidden-service.html) qui décrit ces "
@@ -143,32 +133,32 @@ 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 ""
-"Addresse Oignon(générée): L'adresse du service (ou adresse oignon) est créée "
-"par Tor pour identifier de manière unique votre service. Donnez cette "
+"Addresse Oignon(générée): L'adresse du service (ou adresse oignon) est créée"
+" par Tor pour identifier de manière unique votre service. Donnez cette "
 "adresse au personnes qui doivent accèder à votre service. Vous pouvez "
-"utiliser le bouton \"Copier dans le presse-papiers\" pour eviter les erreur de "
-"saisie.Si vous avez juste créé, le champ affiche \"[Créé par Tor]\"; afin de "
-"lui faire afficher l'adresse oignon réelle, vous devez sauver votre "
+"utiliser le bouton \"Copier dans le presse-papiers\" pour eviter les erreur "
+"de saisie.Si vous avez juste créé, le champ affiche \"[Créé par Tor]\"; afin"
+" de lui faire afficher l'adresse oignon réelle, vous devez sauver votre "
 "configuration et réouvrir la fenêtre des paramètres."
 
 #. 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."
 msgstr ""
-"Port Virtuel(obligatoire): C'est le port TCP que les clients auront besoin à "
-"savoir pour avoir accès à votre service. En règle générale, vous voudrez "
+"Port Virtuel(obligatoire): C'est le port TCP que les clients auront besoin à"
+" savoir pour avoir accès à votre service. En règle générale, vous voudrez "
 "utiliser le port de servicespécifique, par ex port 80 pour HTTP.  Notez que "
 "le port virtuel a généralement rien à voir avec les paramètres de pare-feu, "
 "car il n'est utilisé que par Tor de manière locale."
@@ -186,12 +176,12 @@ msgid ""
 msgstr ""
 "Destination (facultatif): Pratique si vous souhaitez que Tor relaie les "
 "demandes de connexion locale sur un port différent que celui que vous avez "
-"indiqué dans \"Port virtuel\". Par conséquent, vous pouvez spécifier une cible "
-"composée de adresse physique et le port où les demandes de votre service "
-"caché sont redirigés, par ex à localhost:5222 (ou sur n'importe quel port "
-"votre serveur est à l'écoute). Si vous ne spécifiez pas aucune cible, Tor va "
-"rediriger les demandes vers le port spécifié dans \"port virtuel\" de votre "
-"machine locale (localhost)."
+"indiqué dans \"Port virtuel\". Par conséquent, vous pouvez spécifier une "
+"cible composée de adresse physique et le port où les demandes de votre "
+"service caché sont redirigés, par ex à localhost:5222 (ou sur n'importe quel"
+" port votre serveur est à l'écoute). Si vous ne spécifiez pas aucune cible, "
+"Tor va rediriger les demandes vers le port spécifié dans \"port virtuel\" de"
+" votre machine locale (localhost)."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:81
@@ -210,13 +200,13 @@ msgid ""
 "location, enable the service again, and save the new configuration."
 msgstr ""
 "Répertoire du Service (obligatoire): Tor a besoin pour de stocker certains "
-"fichiers des services cachés dans un répertoire séparé, par ex la clé privée "
-"et le fichier nom d'hôte contenant l'adresse oignon. Ce répertoire devrait "
+"fichiers des services cachés dans un répertoire séparé, par ex la clé privée"
+" et le fichier nom d'hôte contenant l'adresse oignon. Ce répertoire devrait "
 "être doit être distinct du répertoire contenant le contenu du service "
 "fourni. Une bonne chose ce peut être un service de répertoire ce peut être "
-"un sous répertoire du répertoire Tor de données. -- Notez que vous ne pouvez "
-"pas changer le répertoire d'un service actif (cela n'aurait pas beaucoup de "
-"sens de permettre cela, car Vidalia n'est pas censé déplacer les "
+"un sous répertoire du répertoire Tor de données. -- Notez que vous ne pouvez"
+" pas changer le répertoire d'un service actif (cela n'aurait pas beaucoup de"
+" sens de permettre cela, car Vidalia n'est pas censé déplacer les "
 "répertoires sur votre disque dur !). Si vous souhaitez déplacer un service "
 "caché dans un autre répertoire, merci de procéder comme suit: Commencez par "
 "désactiver le service dans Vidalia et sauver la configuration.  Puis "
@@ -228,12 +218,12 @@ 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 ""
-"Activé: Si cette case à cocher est désactivée, Vidalia ne configurera pas le "
-"service caché correspondant dans Tor. Cela peut être utile pour garder une "
+"Activé: Si cette case à cocher est désactivée, Vidalia ne configurera pas le"
+" service caché correspondant dans Tor. Cela peut être utile pour garder une "
 "configuration d'un service non utilisée actuellement pour une utilisation "
 "ultérieure. Tous services inactives sont stockées dans le fichier de "
 "configuration spécifique de Vidalia vidalia.conf."
@@ -256,8 +246,8 @@ msgstr "Ajouter un service: Crée une nouvelle configuration de services."
 #. 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 ""
 "Supprimer un service: Supprime de façon permanente une configuration de "
 "service caché.  (Si vous voulez temporairement retirer un service, décochez "
@@ -270,8 +260,8 @@ msgid ""
 "can tell it to whoever shall be able to use your service."
 msgstr ""
 "Copie dans le presse-papier: Copie l'adresse oignon dans le presse-papiers, "
-"de sorte que vous puissiez l'annoncer à tous ceux qui doivent être en mesure "
-"d'utiliser votre service."
+"de sorte que vous puissiez l'annoncer à tous ceux qui doivent être en mesure"
+" d'utiliser votre service."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:114
@@ -293,13 +283,13 @@ msgstr "Comment configurer les paramètres avancés des services cachés ?"
 #. 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 ""
 "Tor permet la configuration des paramètres plus spécifiques pour les "
-"services cachés, par ex forçer à utiliser (ou éviter), certains noeuds comme "
-"des points d'introduction, ou Fournir de multiples ports virtuels pour le "
+"services cachés, par ex forçer à utiliser (ou éviter), certains noeuds comme"
+" des points d'introduction, ou Fournir de multiples ports virtuels pour le "
 "même service."
 
 #. type: Content of: <html><body><p>
@@ -307,13 +297,13 @@ 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 ""
 "Toutefois, nous avons décidé de simplifier les choses dans Vidalia et de "
-"fournir seulement les paramètres les plus communs. Si vous voulez configurer "
-"les paramètres avancés, vous devez le faire Tor dans le fichier torrc. "
+"fournir seulement les paramètres les plus communs. Si vous voulez configurer"
+" les paramètres avancés, vous devez le faire Tor dans le fichier torrc. "
 "Vidalia ne supprimera pas ces paramètres, même lorsque vous modifiez vos "
 "services cachés. Si vous spécifier plus d'un port virtuel port, seule le "
 "premièr sera affiché et sera modifiable."
@@ -341,3 +331,5 @@ msgstr ""
 "votre navigateur (ou dans le client approprié si ce n'est pas un service "
 "web), et Tor fait le reste pour vous. Il n'est pas nécessaire de configurer "
 "Tor spécifiquement pour cela."
+
+
diff --git a/fr/troubleshooting.po b/fr/troubleshooting.po
index d94cc91..6495b87 100644
--- a/fr/troubleshooting.po
+++ b/fr/troubleshooting.po
@@ -1,29 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: 2010-08-23 20:52+0200\n"
-"Last-Translator: Médéric <mederic.ribreux@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 # type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -41,7 +31,8 @@ msgstr ""
 "Voici une liste de quelques problèmes et de questions rencontrées lors de "
 "l'utilisation de Tor. Si vous ne trouvez rien sur votre problème en "
 "particulier, consultez notre site web sur <i>www.vidalia-project.net</i> "
-"pour plus d'information et pour un support plus complet.  <a name=\"start\"/>"
+"pour plus d'information et pour un support plus complet.  <a "
+"name=\"start\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:25
@@ -53,21 +44,21 @@ msgstr "Je ne peux pas démarrer Tor"
 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 ""
-"La raison principale pour laquelle Vidalia ne peut pas lancer Tor est lié au "
-"fait que Vidalia n'arrive pas à localiser correctement où est installé Tor. "
-"Vous pouvez indiquer cet emplacement à Vidalia en mettant à jour l'option "
-"<i>Exécutable Tor</i> dans les <a name=\"start\"/>paramètres de configuration "
-"générale</a>."
+"La raison principale pour laquelle Vidalia ne peut pas lancer Tor est lié au"
+" fait que Vidalia n'arrive pas à localiser correctement où est installé Tor."
+" Vous pouvez indiquer cet emplacement à Vidalia en mettant à jour l'option "
+"<i>Exécutable Tor</i> dans les <a name=\"start\"/>paramètres de "
+"configuration générale</a>."
 
 # 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 ""
 "Une autre raison de non-démarrage de Tor est le fait qu'il existe déjà un "
 "processus Tor qui fonctionne. Vérifiez votre liste de processus en cours et "
@@ -76,13 +67,14 @@ 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 ""
-"Si ça ne fonctionne toujours pas, vérifiez votre <a href=\"log.html\">journal "
-"d'évènements</a> pour voir si Tor a inscrit des informations sur les erreurs "
-"qu'il a rencontré lors de sa tentative de lancement."
+"Si ça ne fonctionne toujours pas, vérifiez votre <a "
+"href=\"log.html\">journal d'évènements</a> pour voir si Tor a inscrit des "
+"informations sur les erreurs qu'il a rencontré lors de sa tentative de "
+"lancement."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:43
@@ -96,7 +88,8 @@ msgstr "Vidalia ne peut pas se connecter à Tor"
 
 # 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 ""
 "Vidalia gère Tor en communiquant avec lui via <i>le port de contrôle</i>."
 
@@ -108,8 +101,8 @@ msgid ""
 "your <a href=\"log.html\">message log</a> to see if Tor reported any errors "
 "while it started."
 msgstr ""
-"La raison principale du fait que Vidalia ne peut se connecter à Tor est liée "
-"à un arrêt prématuré de ce dernier. Vous devriez consulter votre <a "
+"La raison principale du fait que Vidalia ne peut se connecter à Tor est liée"
+" à un arrêt prématuré de ce dernier. Vous devriez consulter votre <a "
 "href=\"log.html\">journal des évènements</a> pour voir si Tor a remonté des "
 "erreurs lors de son lancement."
 
@@ -119,12 +112,12 @@ 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 ""
-"Si Tor écoute sur un port différent de celui qui est configuré dans Vidalia, "
-"ce dernier ne pourra pas se connecter à Tor. Vous aurez rarement besoin de "
+"Si Tor écoute sur un port différent de celui qui est configuré dans Vidalia,"
+" ce dernier ne pourra pas se connecter à Tor. Vous aurez rarement besoin de "
 "modifier ce paramètre. Néanmoins, si un service de votre machine utilise "
 "déjà le port de contrôle de port, vous aurez besoin d'indiquer un autre "
 "port. Vous pouvez modifier ce paramètre dans les <a "
@@ -178,15 +171,15 @@ msgid ""
 msgstr ""
 "Vous avez déjà lancé Vidalia et Tor. Par exemple, cette situation survient "
 "lorsque vous avez installé le Pack Vidalia et que vous lancez le Pack de "
-"navigation Tor. Dans ce cas, vous aurez besoin de fermer l'ancienne instance "
-"de Vidalia et de Tor avant de lancer la nouvelle."
+"navigation Tor. Dans ce cas, vous aurez besoin de fermer l'ancienne instance"
+" de Vidalia et de Tor avant de lancer la nouvelle."
 
 # 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 ""
 "Vidalia a échoué mais Tor continue à fonctionner avec l'ancien mot de passe "
 "aléatoire. Une fois que vous aurez redémarrez Vidalia, un nouveau mot de "
@@ -223,11 +216,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 ""
 "Vous avez précédemment configuré Tor pour fonctionner en tant que service. "
 "Lorsque Tor est un service, il se lance lors du démarrage de la machine. Si "
@@ -243,14 +236,14 @@ 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\";> "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
 "Vous aurez besoin de reconfigurer Tor pour qu'il ne fonctionne pas en tant "
-"que service. Consultez la page du wiki sur la gestion de <a href=\"https://wi";
-"ki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">Tor en tant "
-"que service</a> pour plus d'information ou pour découvrir comment supprimer "
-"le service Tor."
+"que service. Consultez la page du wiki sur la gestion de <a "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>Tor"
+" en tant que service</a> pour plus d'information ou pour découvrir comment "
+"supprimer le service Tor."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:122
@@ -265,27 +258,25 @@ msgstr "Tor s'est terminé prématurément"
 # 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 ""
 "Si Tor échoue immédiatement après avoir été lancé, vous avez de grandes "
 "chances qu'un processus Tor soit déjà en fonctionnement. Vérifiez <a "
-"href=\"log.html\">le journal des évènements</a> pour voir si un des derniers "
-"messages de la liste est surligné en jaune et contient un message proche de "
-"ce qui suit:"
+"href=\"log.html\">le journal des évènements</a> pour voir si un des derniers"
+" messages de la liste est surligné en jaune et contient un message proche de"
+" ce qui suit:"
 
 # 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 ""
-"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"
 
 # type: Content of: <html><body><p>
@@ -297,8 +288,8 @@ msgid ""
 "operating systems, the <i>ps</i> command can help you find the other Tor "
 "process."
 msgstr ""
-"Si vous trouvez un message d'erreur comme celui du dessus, vous aurez besoin "
-"d'arrêter le processus Tor avant d'en lancer un nouveau à l'aide de "
+"Si vous trouvez un message d'erreur comme celui du dessus, vous aurez besoin"
+" d'arrêter le processus Tor avant d'en lancer un nouveau à l'aide de "
 "Vidalia. Sur Windows, vous aurez besoin de chercher après <i>tor.exe</i> "
 "dans votre gestionnaire des tâches. Sur la plupart des autres systèmes "
 "d'exploitation, la commande <i>ps</i> peut vous aider à trouver l'autre "
@@ -308,8 +299,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 ""
 "Si Tor a fonctionné correctement depuis quelquetemps (plus que quelques "
@@ -338,3 +329,5 @@ msgstr ""
 "Si Vidalia ne peut pas arrêter Tor, vous devriez vérifier <a "
 "href=\"log.html\">le journal des évènements</a> pour voir si Tor a rapporté "
 "d'autres erreurs lors de sa tentative de fermeture."
+
+
diff --git a/he/links.po b/he/links.po
index ae5540e..21f489a 100644
--- a/he/links.po
+++ b/he/links.po
@@ -47,27 +47,27 @@ msgstr ""
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:31 links.html:58
 msgid "Wiki and Bugtracker"
-msgstr ""
+msgstr "×?×?ק×? ×?×?×?×?×?×? ×?×?×?×?×?"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:33
 msgid "<a href=\"http://trac.torproject.org/\";> http://trac.torproject.org/</a>"
-msgstr ""
+msgstr "<a href=\"http://trac.torproject.org/\";> http://trac.torproject.org/</a>"
 
 #. type: Content of: <html><body><h3>
 #: links.html:39
 msgid "Tor"
-msgstr ""
+msgstr "Tor"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:45
 msgid "<a href=\"https://www.torproject.org/\";>https://www.torproject.org/</a>"
-msgstr ""
+msgstr "<a href=\"https://www.torproject.org/\";>https://www.torproject.org/</a>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:50
 msgid "FAQ"
-msgstr ""
+msgstr "ש×?\"ת"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:52
@@ -75,10 +75,13 @@ msgid ""
 "<a href=\"https://www.torproject.org/docs/faq.html\";> "
 "https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
+"<a href=\"https://www.torproject.org/docs/faq.html\";> "
+"https://www.torproject.org/docs/faq.html</a>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
+"<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 
 
diff --git a/hu/config.po b/hu/config.po
index 6b2c94b..45410ba 100644
--- a/hu/config.po
+++ b/hu/config.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-10-08 11:56+0000\n"
+"PO-Revision-Date: 2011-10-11 23:30+0000\n"
 "Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -27,6 +27,10 @@ msgid ""
 "of Vidalia and Tor. It also lets you set up and manage a <a "
 "href=\"server.html\">Tor relay</a> so you can help the Tor network grow."
 msgstr ""
+"A Vidalia lehetÅ?vé teszi, hogy beállítsa a leggyakrabban módosított "
+"beállításait a Vidalia-nak és a Tor-nak. Továbbá lehetÅ?vé teszi, hogy <a "
+"href=\"server.html\">Tor Elosztót</a> üzemeltessen, ezáltal hozzájáruljon a "
+"Tor hálózat növekedéséhez."
 
 #. type: Content of: <html><body>
 #: en/config.html:26
@@ -36,13 +40,15 @@ msgstr "<a name=\"general\"/>"
 #. type: Content of: <html><body><h3>
 #: en/config.html:27
 msgid "General Settings"
-msgstr ""
+msgstr "�ltalános beállítások"
 
 #. 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 ""
+"A beállítások az <i>�ltalános</i> fülön a leggyakrabban módosított "
+"beállítások."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:32
@@ -53,6 +59,11 @@ msgid ""
 "by clicking the <i>Browse</i> button and navigating to the particular Tor "
 "installation you want."
 msgstr ""
+"<b>Tor</b>: Itt található a Tor futtatható állomány, amit a Vidalia elindít,"
+" ha kiválasztja az <i>Indítás</i> opciót a tálca menübÅ?l. Ha több Tor verzió"
+" van a gépére telepítve, itt megmondható a Vidalia-nak, hogy melyiket "
+"használja, a  <i>Tallóz</i> gombra kattintással és a használni kívánt  "
+"állomány kikeresésével."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:39
@@ -61,6 +72,10 @@ msgid ""
 "automatically start Tor when Vidalia starts. You can also configure Vidalia "
 "to run when your system starts (<i>Windows only</i>)."
 msgstr ""
+"<b>Indítási beállítások</b>: Ezek a beállítás lehetÅ?vé teszik, hogy a "
+"Vidalia automatikusan indítsa a Tor-t, amikor elindul. Az is beállítható, "
+"hogy a Vidali a rendszer indulásával együtt elinduljon (<i>csak Windows "
+"esetén</i>)."
 
 #. type: Content of: <html><body>
 #: en/config.html:46
@@ -78,6 +93,8 @@ msgid ""
 "The <i>Network</i> settings page lets you change how Tor connects to the Tor"
 " network."
 msgstr ""
+"A <i>Hálózat</i> fülön beállíthatja, hogy kapcsolódjon a Tor a Tor "
+"hálózathoz."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:53
@@ -90,6 +107,13 @@ 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>Proxy-t használok az Internetre való kapcsolódáshoz</b>: Ha az Internet "
+"csatlakozásához HTTP proxy szükséges, akkor beállíthatja, hogy a Tor a "
+"proxy-n keresztül küldje a címtár kéréseket, és az Elosztó forgalmat. Itt "
+"meg kell adnia a proxy host nevét vagy címétés a portot, ahol a proxy vár a "
+"kapcsolatokra. Ha proxy azonosítást is vár, akkor beírhatja a "
+"<i>FElhasználónév</i> és a <i>Jelszó</i> mezÅ?kbe, azt, egyébként ezeket a "
+"mezÅ?ket üresen kell hagynia."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:62
@@ -101,6 +125,12 @@ msgid ""
 "list of ports permitted by your firewall or proxy, separated by commas. "
 "(<i>Example: 80,443,8080</i>)"
 msgstr ""
+"<b>A tűzfalam csak néhány proton engedélyez kapcsolódást</b>: Ha egy "
+"korlátozó tűzfal vagy proxy mögött van a számítógépe, ami csak néhány porton"
+" teszi lehetÅ?vé a kapcsolódást, akkor beállíthatja a Tor-t, hogy csak olyan "
+"elosztókhoz csatlakozzon, amelyek ezeken a portokon keresztül szolgáltatnak."
+" Csak írjon be egy port felsorolást vesszÅ?vel elválasztva azon portokról, "
+"amelyek engedélyezve vannak a t(<i>Példa: 80,443,8080</i>)"
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:69
@@ -112,6 +142,12 @@ msgid ""
 "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>A szolgáltatom blokkolja a Tor-t</b>: Ha az internet szolgáltatója "
+"blokkolja a kapcsolódást a Tor hálózathoz, akkor a Tor képes a kiszűrést "
+"meggátolni a címtár kéréske titkosításával, és a Tor-hoz Hídkapcsolati "
+"Elosztókon (<i> Hidak</i>) keresztüli csatlakozással (a Tor 0.2.0.3-alpha "
+"verziótól felfelé). Megadhatja a a hídkapcsolatokat a címükkel és "
+"portszámukkal vagy a címükkel, port számukkal és ujjlenyomatukkal."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:77
@@ -145,6 +181,14 @@ msgid ""
 "relays</a> for more information on how to learn new bridge relay addresses "
 "and fingerprints."
 msgstr ""
+"Még ha nem is rendelkezik hídkapcsolati címekkel, ennek a beállításnak a "
+"címe hasznos lehet. A Tor titkosítja a címtár lekérést, ami megakadályozhat "
+"néhány szűrési módszert, amely azon alapul, hogy a Tor kéréseket a többi "
+"Elosztó felé szűri. Ha a kapcsolatok a normál Elosztók felé blokkoltak, "
+"akkor szüksége van néhány Híd címére, és itt hozzá kell adnia azokat. "
+"Tekintse meg a <a href=\"bridges.html#finding\">hídkapcsolati elosztók "
+"beszerzése</a> szakaszt, hogy több információt kapjon az ilyen címek és "
+"ujjlenyomatok beszerzésérÅ?l."
 
 #. type: Content of: <html><body>
 #: en/config.html:100
@@ -208,9 +252,8 @@ msgid ""
 "whichever interface style you prefer from the dropdown box."
 msgstr ""
 "<b>Stílus</b>: A legtöbb esetben a Vidalia a rendszerének beállított "
-"megjelenését használja. Ha nem szereti azt a megjelenést, akkor kiválaszthat"
-" egy megjelenési  If you dislike the default, you can choose whichever "
-"interface style you prefer from the dropdown box."
+"megjelenését használja. Ha nem szereti ezt a megjelenést, akkor kiválaszthat"
+" egy másik stílust a lenyíló listából."
 
 #. type: Content of: <html><body>
 #: en/config.html:131
@@ -220,7 +263,7 @@ msgstr "<a name=\"advanced\"/>"
 #. type: Content of: <html><body><h3>
 #: en/config.html:132
 msgid "Advanced Settings"
-msgstr "Speciális beállítások"
+msgstr "Haladó beállítások"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:134
@@ -228,6 +271,8 @@ msgid ""
 "The settings on the <i>Advanced</i> page should generally only be modified "
 "by more experienced users."
 msgstr ""
+"A beállítások módosítása a <i>Haladó</i> fülön többnyire csak a haladó "
+"felhasználók számára lehetnek szükségesek."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:138
@@ -237,6 +282,8 @@ msgid ""
 "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>VezérlÅ? cím &amp; Port</b>: A <i>vezérlÅ? port</i> az amit a Vidalia használ arra ,hogy a Tor-ral kapcsolódjon.\n"
+"  Ennek nem szükséges a cseréje, csak akkor, ha másik szolgáltatással ütközik, vagy a Vidali másik gépen fut, mint a Tor."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:144
@@ -245,6 +292,10 @@ msgid ""
 "limit the applications on your machine that can connect to and reconfigure "
 "your Tor installation. The available authentication methods are:"
 msgstr ""
+"<b>VezérlÅ? port authetnikáció</b>: A vezérlÅ? port authentikáció arra "
+"használható, hogy meggátolja a számítógépen található alkalmazásokat, hogy "
+"átkonfigurálja a Tor alkalmazását. Az elérhetÅ? azonosítási lehetÅ?ségek a "
+"következÅ?k:"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:150
@@ -253,6 +304,8 @@ msgid ""
 "<b>strongly</b> discouraged. Any application or user on your computer can "
 "reconfigure your Tor installation."
 msgstr ""
+"<b>Nincs</b> -- Nincs azonosítás. Az opció használata <b>nagyon NEM</b> "
+"javasolt. Bármilyen alkalmazás a gépén át tudja konfigurálni a Tor-t."
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:155
@@ -263,6 +316,11 @@ msgid ""
 "Vidalia randomly generate a new password each time it starts Tor by checking"
 " the <i>Randomly Generate</i> checkbox."
 msgstr ""
+"<b>Jelszó</b> <i>(alapértelmezett)</i> -- Ha ez kerül kiválasztásara, akkor "
+"megadható egy jelszó, amit a Tor minden alkalommal elkér, ha csatlakoznak a "
+"vezérlÅ? portjára. Ha a Vidalia indítja a Tor-t, akkor a hagyhatja a "
+"Vidaliá-t minden egyes alkalommal új jelszót generálni, a  <i>Jelszó "
+"véletlenszerű létrehozása</i> jelölÅ? négyzet beállításával."
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:162
@@ -272,6 +330,10 @@ msgid ""
 "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>Süti</b> -- Ha sütis azonosítás van beállítva, akkor a Tor egy fájlt ír "
+"(vagy <i>sütit</i>) véletlen adatokkal az adatkönyvtárába, és bármilyen "
+"alklmazás vagy felhasználó, aki meg próbál csatlakozni, meg kell tudnia adni"
+" a süti tartalmát."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:170
@@ -281,6 +343,10 @@ msgid ""
 "file. If you leave this field blank, Tor will uses its own default torrc "
 "location."
 msgstr ""
+"<b>Tor Konfigurációs Fájl</b> <i>(opcionális)</i>: Ez alatt az opció alatt "
+"adható meg, hogy a Vidalia a Tor-t egy másik  <i>torrc</i> Tor konfigurációs"
+" állománnyal indítsa. Ha ez a mezÅ? üres, akkor az alapértelmezett helyrÅ?l "
+"veszi azt."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:175
@@ -290,6 +356,10 @@ 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>Adat könyvtár</b> <i>(opcionális)</i>: Megadhatja a könyvtárat, hogy a a "
+"Tor hova tárolja a mentett adatai, mint például gyorsítótárazott Elosztó "
+"információk, Elosztó kulcsok, konfigurációs állományok. Ha ez a mezÅ? üres, "
+"akkor az alapértelmezett helyre teszi azt."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:181
@@ -299,6 +369,12 @@ msgid ""
 " 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>Jogosultság</b> <i>(opcionális, nem elérhetÅ? Windows rendszeren)</i>: Ha "
+"beír egy értéket a <b>Futtatás mint</b> mezÅ?be, a Tor a megadott "
+"felhasználóra állítja be a <i>setuid</i> segítségével a jogosultságot az "
+"induláskor. Ha  megad egy értéket a <b>Futtatás mint csoport </b> mezÅ?be , a"
+" Tor a megadott csoportra állítja be a <i>setgid</i> segítségével a "
+"jogosultságot az induláskor."
 
 #. type: Content of: <html><body>
 #: en/config.html:189
@@ -316,5 +392,8 @@ 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 ""
+"A rejtett szolgáltatások lehetÅ?vé teszik, hogy TCP alapú szolgáltatást "
+"nyújtson  pl. egy HTTP szolgáltatást másoknak, úgy, hogy nem derül ki, hogy "
+"milyen IP címet biztosít erre."
 
 
diff --git a/hu/server.po b/hu/server.po
index 4d9edcf..ef8fce2 100644
--- a/hu/server.po
+++ b/hu/server.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-10-02 15:17+0000\n"
+"PO-Revision-Date: 2011-10-14 07:40+0000\n"
 "Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -43,6 +43,8 @@ msgid ""
 "If you decide you want to help the Tor network grow by running a relay, you "
 "can follow these steps to get started:"
 msgstr ""
+"Ha szeretne segíteni a Tor hálózat növekedésében egy Elosztó futtatásával, "
+"ez elinduláshoz a következÅ? lépéseket kell megtennie:"
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:31
@@ -51,11 +53,14 @@ msgid ""
 "tray menu or <i>Preferences</i> from your system menubar on Macintosh "
 "systems."
 msgstr ""
+"Nyissa meg a <i>Beállítások ablakot</i> a <i>Beállítások</i> kiválasztásával"
+" a tálca menübÅ?l, vagy <i>Beállítások</i>at a rendszer menüsávból a "
+"Macintosh rendszereken."
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:35
 msgid "Select the <i>Relay</i> configuration page."
-msgstr ""
+msgstr "Válassza ki az <i>Elosztó</i> fület.."
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:37
@@ -67,6 +72,14 @@ msgid ""
 "relay or <i>Help censored users reach the Tor network</i> if you want to run"
 " a bridge relay."
 msgstr ""
+"Döntse el hogy normál Tor Elosztóként vagy mint  <i>híd</i> elosztó (Tor "
+"0.2.0.8-alpha vagy újabb) futtatja. A Híd Elosztók lehetÅ?vé teszik azon "
+"korlátozott, cenzorált felhasználók Tor elérést, akiknek korlátozott az "
+"elérése közvetlenül a Tor hálózat felé.  Jelölje a <i>A Tor hálózat "
+"forgalmának közvetítése (Elosztás) </i> opciót ha normál Elosztóként "
+"szeretné futtatni, vagy <i>A korlátozott felhasználók segítése a Tor "
+"hálózathoz való kapcsolódáshoz</i> opciót, ha Híd Elosztóként szeretné "
+"futtatni"
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:44
@@ -90,6 +103,10 @@ msgid ""
 "goes wrong with your relay. You might also include your PGP or GPG key ID "
 "and fingerprint."
 msgstr ""
+"<b>Kapcsolat infó</b>: Az email címe. Ez csak abban az esetben kerül "
+"felhasználásra,, ha fontos Tor biztonsági frissítés jelent meg, vagy valami "
+"gond van az Elosztójával. Megadhat ide PGP vagy GPG kulcsazonosítót és "
+"ujjlenyomatot."
 
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:56
@@ -97,6 +114,8 @@ msgid ""
 "<b>Relay Port</b>: The port on which your relay will listen for traffic from"
 " clients or other Tor relays."
 msgstr ""
+"<b>KözvetítÅ? port</b>: A port, amin keresztül az Elosztó a a forgalmat várja"
+" a többi Tor Elosztótól."
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:62
@@ -108,6 +127,11 @@ msgid ""
 " than the <i>Relay port</i> you entered above. Bridge relays <i>must</i> "
 "mirror the relay directory."
 msgstr ""
+"Ha szeretné a Tor Elosztó címtárat tükrözni, akkor jelölje be <i>Az Elosztó "
+"címtár tükrözése</i> opciót.  Ha nincs túl sok sávszélessége, vegye ki a "
+"jelölést. Ha úgy döntött, hogy tükrözi, ellenÅ?rizze, hogy a <i>Címtár "
+"port</i> eltér a <i>KözvetítÅ? port</i> fent beírt értékétÅ?l. A Hídkapcsolati"
+" Elosztóknak <i>kötelezÅ?</i> a címtár tükrözése."
 
 #. type: Content of: <html><body>
 #: en/server.html:71
@@ -127,6 +151,10 @@ msgid ""
 "contribute to the Tor network. You can run a relay, while still keeping your"
 " network connection usable for your own use."
 msgstr ""
+"A Tor Elosztó futtatása magas sávszélességet vihet, azonban a Tor lehetÅ?vé "
+"teszi, hogy korlátozza a sávszélességet, amivel hozzá szeretne járulni a Tor"
+" hálózatához. �gy futtathat egy Elosztót, hogy közben az Internet is "
+"használható marad."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:80
@@ -135,11 +163,14 @@ msgid ""
 "connection speed. If you select <i>Custom</i>, you will be able to specify "
 "your own limits."
 msgstr ""
+"Ki kell választania a lenyíló listából a sávszélességének megfelelÅ? "
+"sebességet. Ha az <i>Egyéni</i>t választja, megadhatja a saját "
+"korlátozásait."
 
 #. type: Content of: <html><body><h4>
 #: en/server.html:84
 msgid "Custom Limits"
-msgstr ""
+msgstr "Egyéni korlátozások"
 
 #. type: Content of: <html><body><p>
 #: en/server.html:86
@@ -153,6 +184,15 @@ msgid ""
 "exceed the specified rate. Your <i>maximum rate</i> must always be greater "
 "than or equal to your <i>average rate</i>."
 msgstr ""
+"A <i>maximum sebesség</i> egy olyan bájt mennyiség, ami olyan kérések "
+"kiszolgálására szolgál, amelyek rövid idÅ?n keresztül meghaladják a "
+"beállított <i>átlagos sebesség</i>et, de hosszú távon tartják az átlagot. "
+"Egy alacsony átlag, de magas maximum az átlagot állítják be hosszú távra, de"
+" lehetÅ?vé teszik csúcsidÅ?kben, hogy magasabb forgalmat bonyolítson, amíg az "
+"átlag nem került elérésre. Ha az átlag megegyezik a <i>maximum "
+"sebességgel</i>, akkor a Tor sosem fogja átlépni a megadott értéket. A "
+"<i>maximum sebesség</i> mindig magasabb, vagy egyenlÅ? kell egyen az <i>átlag"
+" sebesség</i>gel."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:96
@@ -163,6 +203,11 @@ msgid ""
 "connection). Tor requires a minimum of 20 kilobytes per second to run a "
 "relay."
 msgstr ""
+"Az <i>átlagos sebesség</i> a maximum hosszútávú átlagsebesség, ami "
+"engedélyezett (kilobájt /másodperc). Választhat akár 2 megabájt/másodperc "
+"(2048 KB/s), akár 50 kilobájt/másodperc sebességet (közepes sebességű "
+"kábeles kapcsolat). A Tor számára minimum 20 kilobájt/másodperc szükséges "
+"egy Elosztó futtatásához."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:103
@@ -174,16 +219,22 @@ msgid ""
 "too much strain on your bandwidth, you should consider unchecking the "
 "checkbox labeled <i>Mirror the relay directory</i>."
 msgstr ""
+"Fontos, hogy megjegyezzük, hogy a Tor a sávszélességet bájtokban méri, nem "
+"bitekben. Továbbá a Tor csak a bejövÅ? bájtokra figyel a kimenÅ? bájtok "
+"helyett. Például, ha a beállítottuk a címtár tükrözést, akkor több lesz a "
+"kimenÅ? forgalma, mint a bejövÅ?. Ha ez túl nagy terhelést ad a "
+"sávszélességének, akkor el kell gondolkozni a <i>Az Elosztó címtár "
+"tükrözése</i> opció kikapcsolásán."
 
 #. type: Content of: <html><body>
 #: en/server.html:111
 msgid "<a name=\"exitpolicy\"/>"
-msgstr ""
+msgstr "<a name=\"exitpolicy\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:112
 msgid "Exit Policies"
-msgstr ""
+msgstr "Kilépési szabályok"
 
 #. type: Content of: <html><body><p>
 #: en/server.html:114
@@ -194,6 +245,12 @@ msgid ""
 "as mail to prevent spam and some default file sharing ports to reduce abuse "
 "of the Tor network."
 msgstr ""
+"A kilépési szabályok megadják a módját annak, hogy milyen erÅ?forrásokhoz "
+"engedi a Tor felhasználókat hozzáférni a Tor Elosztójáról.  Tor egy "
+"alapértelmezett listát használ a kilépési szabályokhoz, ami megakadályoz "
+"néhány szolgáltatást, mint például a levelezés, hogy megakadályozza a spam "
+"küldést, vagy néhány fájlmegosztási port, mindezt azért, hogy csökkentse a "
+"hálózati visszaélést a Tor hálózattal."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:121
@@ -205,6 +262,12 @@ msgid ""
 "checked, Tor users will be able to access other services not covered by the "
 "other checkboxes or Tor's default exit policy."
 msgstr ""
+"Minden jelölÅ?négyzet egy erÅ?forrás, amit  engedélyezhet a Tor felhasználók "
+"számára az Elosztóján keresztül. Ha egy kijelölést eltávolít, a "
+"Torfelhasználók olyan kérést nem küldhetnek keresztül az elosztóján. Ha az "
+"<i>Egyéb Szolgáltatások</i> jelölve van, akkor a Tor felhasználók elérhetnek"
+" olyan szolgáltatásokat is, amelyeket a jelölÅ?négyzetek vagy az "
+"alapértelmezett Tor kilépÅ? szabályok nem fednek le."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:130
@@ -214,26 +277,30 @@ msgid ""
 "column describes the resources Tor clients will be allowed to access through"
 " your relay, if the associated box is checked."
 msgstr ""
+"A teljesség kedvéért az alábbi tábla bemutatja, hogy mely portok felelnek "
+"meg az egyes kilépési szabályok jelölÅ?négyzeteinek. A <b>Leírás</b> oszlop "
+"ismerteti az elérhetÅ? szolgáltatásokat, ha a jelölÅ?négyzet bekapcsolt "
+"állapotú."
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:138
 msgid "<b>Checkbox</b>"
-msgstr ""
+msgstr "<b>JelölÅ?négyzet</b>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:139
 msgid "<b>Ports</b>"
-msgstr ""
+msgstr "<b>Portok</b>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:140
 msgid "<b>Description</b>"
-msgstr ""
+msgstr "<b>Leírás</b>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:143
 msgid "Websites"
-msgstr ""
+msgstr "Weboldalak"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:144
@@ -320,7 +387,7 @@ msgstr "*"
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:170
 msgid "All other applications that aren't covered by the previous checkboxes"
-msgstr ""
+msgstr "Minden más alkalmazás, amit nem fedtek az elÅ?zÅ? jelölÅ?négyzetek."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:175
@@ -331,6 +398,12 @@ msgid ""
 "network.  Your relay will allow other Tor users to connect to the Tor "
 "network and will help relay traffic between other Tor relays."
 msgstr ""
+"Ha nem szeretné, hogy a Tor felhasználók kapcsolatokat csináljanak kifelé a "
+"Tor hálózatból a gépérÅ?l, akkor vegye ki a pipát az összes jelölÅ? "
+"négyzetbÅ?l. Még ha ki is vette az összest, akkor is hasznos tagja lehet a "
+"gépe a Tor hálózatnak.  Az Elosztója a többi Tor felhasználónak lehetÅ?vé "
+"teszi a csatlakozást, és a forgalom elosztására fog szolgálni más Tor "
+"Elosztók között."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:182
@@ -339,6 +412,9 @@ msgid ""
 "grayed out, since bridge relays do not allow exit connections. Bridges are "
 "only used by Tor clients to connect to the Tor network."
 msgstr ""
+"Ha Hídkapcsolati Elosztót üzemeltet a <i>Kilépési szabályok</i> fül "
+"kiszürkítésre kerül, mert a Hídkapcsolatok nem lehetne kilépési pontok. A "
+"hidak csak a Tor kliensek hálózatra kapcsolódását teszik lehetÅ?vé."
 
 #. type: Content of: <html><body>
 #: en/server.html:188
@@ -360,6 +436,12 @@ msgid ""
 "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 ""
+"Sok otthoni felhasználó kapcsolódik az Internetre egy  <i>router</i>rel, ami"
+" lehetÅ?vé teszi több, a helyi hálózaton található számítógép kapcsolódását "
+"az Internetre.  Néhány felhasználó <i>tűzfal</i> mögött található, amely "
+"meggátolja a bejövÅ? kapcsolatokat az Internet felöl.  Ha szeretne Tor "
+"Elosztót futtatni, a Tor klienseknek és Elosztóknak szükségük van a "
+"kapcsolódás a routeren vagy a tűzfalon keresztül."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:200
@@ -370,6 +452,11 @@ msgid ""
 "firewall to \"forward\" all connections to certain ports on your router or "
 "firewall to local ports on your computer."
 msgstr ""
+"Ahhoz, hogy elérhetÅ? legyen, a routernak vagy tűzfalnak tudnia kell, hogy "
+"mely portokat engedje keresztül a számítógépéhez a <i>port továbbítás (port "
+"forwarding)</i> beállításával. E Port továbbítás az egy adott portra "
+"(portokra) érkezÅ? kapcsolatokat egy számítógép helyi portjai felé küldi "
+"tovább."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:208
@@ -381,6 +468,12 @@ msgid ""
 "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."
 msgstr ""
+"Ha beállította a <i>Kísérlet a Port továbbítás automatikus beállítására</i> "
+"opciót, akkor a Vidali megpróbálja beállítani a Port továbbítást a helyi "
+"hálózaton, így az elosztóját a Tor kliensek elérik. Nem minden router "
+"támogatja azonban az automata port továbbítás beállítását. Használhatja a "
+"<i>Teszt</i> gombot a jelölÅ?négyzet mellett, hogy megtudja, képes-e rá a "
+"Vidalia vagy sem."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:217
@@ -395,6 +488,15 @@ msgid ""
 "href=\"http://192.168.1.1/\";>http://192.168.1.1</a> in your Web browser. You"
 " should consult your router's instruction manual for more information."
 msgstr ""
+"Ha a <i>Teszt</i> gomb úgy találja, hogy a Vidalia képtelen beállítani a "
+"port továbbítást, akkor ezt a beállítást kézzel kell megtennie. Néhány "
+"eszköz tartalmaz egy szolgáltatást amit <i>Universal Plug-and-Play</i>-nek "
+"(UPnP) hívnak. Ha hozzáfér a routerja kezelÅ?felületéhez, akkor érdemes az  "
+"UPnP opció negedélyezését megkeresnie. Ã?ltalában a router kezelÅ? felülete a "
+"következÅ? címeken érhetÅ? el web böngészÅ?n keresztül: <a "
+"href=\"http://192.168.0.1/\";>http://192.168.0.1</a> vagy <a "
+"href=\"http://192.168.1.1/\";>http://192.168.1.1</a>. A további "
+"információkért a router beállítási útmutatóját érdemes áttekintenie."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:229
@@ -409,5 +511,14 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+"Ha kézzel kell beálIítania a port továbbítást, a <a "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" portforward.com</a> oldal segíthet abban, amely számos routerhez és "
+"tűzfalhoz tartalmaz beállítási tanácsokat. Legalább az <i>Elosztó Port</i> "
+"továbbítása szükséges, ami a 443 porton található  Windows rendszereken és a"
+" 9001 porton, minden más operációs rendszeren. Ha bejelölte a <i>Az Elosztó "
+"címtár tükrözése</i> opciót is, akkor a <i>Címtár Port</i> továbbítására is "
+"szükség van, ez alapértelmezetten a 9030-as porton dolgozik, minden "
+"operációs rendszeren."
 
 
diff --git a/hu/services.po b/hu/services.po
index 695b9bc..045157e 100644
--- a/hu/services.po
+++ b/hu/services.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-10-02 15:45+0000\n"
+"PO-Revision-Date: 2011-10-12 06:57+0000\n"
 "Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -29,6 +29,12 @@ msgid ""
 "goes wrong. If you find bugs or have comments on this new feature, please "
 "let us know! We need your feedback.  <a name=\"about\"/>"
 msgstr ""
+"Megyjegyzés: A rejtett szolgáltatások támogatása új funkció a Vidalia-ban. "
+"ElképzelhetÅ?, hogy hibára fut, elképzelhetÅ?, hogy elrontja a rejtett "
+"szolgáltatás konfigurációját. Szóval ne függjön tÅ?le, és méginkább ne "
+"savazzon minket érte, ha valami elromlik. Ha hibát talál, vagy valamilyen "
+"hozzászólása van ehhez az új szolgáltatáshoz, jelezze nekünk. Szükségünk van"
+" a visszajelzésére.  <a name=\"about\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:26
@@ -43,6 +49,11 @@ msgid ""
 "provide a hidden service is built on top of the same circuits that Tor uses "
 "for anonymous browsing and roughly has similar anonymity properties."
 msgstr ""
+"A rejtett szolgáltatások lehetÅ?vé teszik, hogy bármilyen TCP alapú "
+"szolgáltatást, például egy HTTP szolgáltatást, biztosítson, anélkül, hogy "
+"kiderülne az IP címe. A protokoll egy rejtett szolgáltatást biztosít "
+"ugyanazon az áramkörön, amit a Tor a névtelen böngészésre használ, és "
+"hasonló névtelenségi tulajdonságai vannak."
 
 #. type: Content of: <html><body><p>
 #: en/services.html:35
@@ -51,6 +62,10 @@ msgid ""
 "Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous "
 "Specification (doc/spec/rend-spec.txt)."
 msgstr ""
+"A további információkért a rejtett szolgáltatásokról érdemes elolvasnia a "
+"Tor fejlesztÅ?i dokumentációjának 5. fejezetét (doc/design-paper/tor-"
+"design.pdf) vagy a Rendezvous (randi) Specifikációt (doc/spec/rend-"
+"spec.txt)."
 
 #. type: Content of: <html><body>
 #: en/services.html:40
@@ -91,6 +106,8 @@ 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."
 msgstr ""
+"Van egy király oktatóanyag a Tor weboldalán (https://www.torproject.org/docs";
+"/tor-hidden-service.html) ami részletesen leírja ezt."
 
 #. type: Content of: <html><body>
 #: en/services.html:55
@@ -108,6 +125,8 @@ msgid ""
 "The services table contains five columns containing data about configured "
 "hidden services:"
 msgstr ""
+"A szolgáltatások tábla öt oszlopot tartalmaz a konfigurált rejtett "
+"szolgáltatásokról:"
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:61
@@ -120,6 +139,13 @@ msgid ""
 "display the real onion address, you need to save your configuration and re-"
 "open the settings window."
 msgstr ""
+"Onion cím (generált): A szolgáltatás (vagy onion) cím a Tor által kerül "
+"generálásra, hogy egyedileg azonosítsa a szolgáltatását. Adja meg ezt az "
+"oinion címet azoknak, akik elérhetik a szolgáltatását. Lehet, hogy érdemes "
+"használni a  \"Vágolapra másolás\" gombot az elgépelések elkerülésére. Ha "
+"éppen csak létrehozott egy rejtett szolgáltatást, a mezÅ? a  \"[létrehozta a "
+"Tor]\" adatot tartlmazza, a valós cím megjelenítéséhez le kell mentenie a "
+"beállításait, majd újranyitnia a beállítások ablakot."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:68
@@ -130,6 +156,11 @@ msgid ""
 "port usually has nothing to do with firewall settings, because it is only "
 "used Tor-internally."
 msgstr ""
+"Virtuális Port (szükséges): Ez a TCP, amit a klienseknek ismerniük kell, "
+"hogy elérjék a szolgáltatását. Tipikusan egy szolgáltatás specifikus portot "
+"szeretne itt használni, például 80-as portot a HTTP-hez. MegjegyzendÅ?, hogy "
+"a virtuális port beállítása nem szükséges a tűzfalakon, mert csak a Tor-on "
+"belül kerül használatra."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:73
@@ -142,6 +173,12 @@ msgid ""
 "specify any target, Tor will redirect requests to the port specified in "
 "\"Virtual Port\" on localhost."
 msgstr ""
+"Cél (opcionális): Többnyire úgyis egy másik portra szeretné irányítani a "
+"szolgáltatását a helyi gépen belül, mint amit a \"Virtuális port\" opciónál "
+"beállított. Ezért beállítható, hogy egy fizikia port cím, amire a kérések "
+"tovább lesznek irányítva, például localhost:5222 (vagy bármilyen port, amin "
+"a szervere várja a forgalmat). Ha nem ad meg cél portot, akkor az a port "
+"kerül felhasználásra, amit a \"Virtuális Port\" opcióban adott meg."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:81
@@ -159,6 +196,18 @@ msgid ""
 "disk to the new place. Finally, change the directory in Vidalia to the new "
 "location, enable the service again, and save the new configuration."
 msgstr ""
+"Szolgáltatás könyvtár (szükséges): A Tor-nak szüksége van arra, hogy néhány "
+"rejtett szolgáltatás specifikus fájlt egy külön könyvtárban tároljon, mint "
+"például a privát kulcsok, a hostnév állomány az onion címmel. Ez a könyvtár "
+"egy a nyújtott szolgáltatástól független könyvtár kell legyen. Egy jó hely "
+"ennek a szolgáltatás könyvtárnak a Tor adat könyvtárának egy alkönyvtára. --"
+" MegjegyzendÅ?, hogy futó szolgáltatásnál ez a könyvtár nem változtatható meg"
+" (az se lenne megoldás, ha meg lehetne, mert a Vidalia nem jogosult fájlok "
+"mozgatására a merevlemezen!). Ha szeretné átmozgatni egy másik könyvtárba, a"
+" következÅ?képpen tegyeI: Tiltsa le a szolgáltatást a Vidalia-ban, és mentse "
+"le a konfigurációt. Ezután mozgassa a könyvtárat a merevlemezen az új "
+"helyre. Végül állítsa be az új könyvtárat a Vidalia-ban, engedélyezze a "
+"szolgáltatás újra, majd mentse az új konfigurációt."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:95
@@ -168,6 +217,11 @@ msgid ""
 " currently unused service for later use. All non-enabled services are stored"
 " in the Vidalia-specific configuration file vidalia.conf."
 msgstr ""
+"Engedélyezett: Ha a jelölÅ?négyzet kikapcsolt, akkor a Vidalia nem fogja "
+"beállítani a rejtett szolgáltatást a Tor-ban. Ez akkor lehet jó, ha meg "
+"akarja tartani egy jelenleg nem használt szolgáltatás beállítási adatait "
+"késÅ?bbre. Minden nem engedélyezett szolgáltatás a Vidalia specifikus "
+"konfigurációs állományban a vidalia.conf-ban kerül tárolásra."
 
 #. type: Content of: <html><body>
 #: en/services.html:103
@@ -182,7 +236,7 @@ msgstr "Mire használható az öt gomb?"
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:107
 msgid "Add service: Creates a new empty service configuration."
-msgstr ""
+msgstr "Szolgáltatás hozzáadása: Létrehoz egy üres szolgáltatás  bejegyzést."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:108
@@ -190,6 +244,9 @@ msgid ""
 "Remove service: Permanently removes a hidden service configuration.  (If you"
 " want to temporarily remove a service, uncheck its Enabled checkbox.)"
 msgstr ""
+"Szolgáltatás eltávolítása: Véglegesen eltávolít egy szolgáltatás bejegyzést."
+"   (Ha csak átmenetileg akarja eltávolítani, akkor vegye ki a jelölést az "
+"Engedélyezett jelölÅ?négyzetbÅ?l.)"
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:111
@@ -197,11 +254,13 @@ msgid ""
 "Copy to clipboard: Copies the onion address to the clipboard, so that you "
 "can tell it to whoever shall be able to use your service."
 msgstr ""
+"Másolás a vágólapra: A szolgáltatás oinon címét másolja a vágólapra, így "
+"bárkinek megadhatja az elérését a szolgáltatásnak."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:114
 msgid "Browse: Lets you browse to find a local hidden service directory."
-msgstr ""
+msgstr "Tallóz: LehetÅ?vé teszi a a szolgáltatás könyvtárának kitallózását."
 
 #. type: Content of: <html><body>
 #: en/services.html:119
@@ -211,7 +270,7 @@ msgstr "<a name=\"advanced\"/>"
 #. type: Content of: <html><body><h3>
 #: en/services.html:120
 msgid "How can I configure advanced hidden service settings?"
-msgstr ""
+msgstr "Hogyan állíthatok be haladó rejtett szolgáltatás beállításokat?"
 
 #. type: Content of: <html><body><p>
 #: en/services.html:122
@@ -220,6 +279,9 @@ msgid ""
 " forcing to use (or avoiding) certain nodes as introduction points, or "
 "providing multiple virtual ports for the same service."
 msgstr ""
+"A Tor lehetÅ?vé teszi a szolgáltatások mgé pontosabb konfigurálást, mint "
+"például az erÅ?ltetése (vagy korlátozása) hozzáférési pontoknak, vagy "
+"többszörös port hozzárendelés a szolgáltatásokhoz."
 
 #. type: Content of: <html><body><p>
 #: en/services.html:128
@@ -230,6 +292,12 @@ msgid ""
 " are editing your hidden services. If you specify more than one virtual "
 "port, only the first will be displayed and be editable."
 msgstr ""
+"Szeretnénk egyszerűsíteni a dolgokat a Vidalia-ban, így csak a legfontosabb "
+"beállításokat biztosítjuk. Ha szeretné részletesebben beállítani ezeket, "
+"szükséges lehet a Tor torrc konfigurációs állományának szerkesztése. A "
+"Vidalia ezeket a beállításokat nem módosítja meg, akkor sem, ha szerkeszti a"
+" rejtett szolgáltatásokat. Ha több virtuális portot hozott létre, csak az "
+"elsÅ? kerül megjelenítésre és szerkeszthetÅ?."
 
 #. type: Content of: <html><body>
 #: en/services.html:135
@@ -240,6 +308,7 @@ msgstr "<a name=\"client\"/>"
 #: en/services.html:136
 msgid "How does Vidalia help me to access other hidden services?"
 msgstr ""
+"Hogyan segít a Vidalia abban, hogy elérhessem mások rejtett szolgáltatásait?"
 
 #. type: Content of: <html><body><p>
 #: en/services.html:138
@@ -249,5 +318,9 @@ 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 ""
+"Szívesen. Nincs rá szükség. Ha el szeretne érni egy rejstet szolgáltatást, "
+"gépelje be a szolgáltatás onion címét a böngészÅ?jébe (vagy használja a "
+"megfelelÅ? klienst, ha nem web szolgáltatásról van szó) és a Tor elintézi a "
+"háttérben a többit. Nincs speciális konfigurációra szükség."
 
 
diff --git a/it/bridges.po b/it/bridges.po
index d542321..013fea2 100644
--- a/it/bridges.po
+++ b/it/bridges.po
@@ -1,12 +1,13 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian <None>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -97,3 +98,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/it/config.po b/it/config.po
index 537a346..6228c1b 100644
--- a/it/config.po
+++ b/it/config.po
@@ -1,33 +1,24 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# zfrns84 <silviazaf@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-05-06 12:30+0000\n"
+"Last-Translator: zfrns84 <silviazaf@xxxxxxxxx>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/config.html:16
 msgid "Configuring Vidalia and Tor"
-msgstr ""
+msgstr "Come configurare Vidalia e Tor"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:20
@@ -36,31 +27,43 @@ msgid ""
 "of Vidalia and Tor. It also lets you set up and manage a <a "
 "href=\"server.html\">Tor relay</a> so you can help the Tor network grow."
 msgstr ""
+"Vidalia ti permette di configurare alcuni degli aspetti di Vidalia e di Tor "
+"più personalizzati dagli utenti. Consente, inoltre, di impostare e gestire "
+"un <a href=\"server.html\"> relay Tor</a> in modo da agevolare la crescita "
+"della rete Tor."
 
 #. type: Content of: <html><body>
 #: en/config.html:26
 msgid "<a name=\"general\"/>"
-msgstr ""
+msgstr "<a name=\"general\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:27
 msgid "General Settings"
-msgstr ""
+msgstr "Impostazioni generali"
 
 #. 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 ""
+"Le impostazioni nella pagina <i>Generali</i> sono le impostazioni più "
+"modificate."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:32
 msgid ""
-"<b>Tor Executable</b>: This is the Tor executable that Vidalia will run when "
-"you select <i>Start</i> from the tray menu. If you have multiple versions of "
-"Tor installed, you can tell Vidalia which version you would like to run by "
-"clicking the <i>Browse</i> button and navigating to the particular Tor "
+"<b>Tor Executable</b>: This is the Tor executable that Vidalia will run when"
+" you select <i>Start</i> from the tray menu. If you have multiple versions "
+"of Tor installed, you can tell Vidalia which version you would like to run "
+"by clicking the <i>Browse</i> button and navigating to the particular Tor "
 "installation you want."
 msgstr ""
+"<b>Eseguibile Tor</b>: è l'eseguibile Tor che Vidalia esegue quando si "
+"seleziona <i>Avvio</i> dal menu area di notifica. Se si possiedono diverse "
+"versioni di Tor, è possibile indicare quale versione si vuole eseguire "
+"facendo clic sul pulsante <i>Sfoglia</i> e navigando nell'installazione Tor "
+"desiderata."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:39
@@ -69,23 +72,27 @@ msgid ""
 "automatically start Tor when Vidalia starts. You can also configure Vidalia "
 "to run when your system starts (<i>Windows only</i>)."
 msgstr ""
+"<b>Opzioni di avvio</b>: tali impostazioni permettono di eseguire "
+"automaticamente Tor all'avvio di Vidalia (<i>solo con Windows</i>)."
 
 #. type: Content of: <html><body>
 #: en/config.html:46
 msgid "<a name=\"network\"/>"
-msgstr ""
+msgstr "<a name=\"network\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:47
 msgid "Network Settings"
-msgstr ""
+msgstr "Impostazioni di rete"
 
 #. 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 ""
+"Le pagina delle impostazioni <i>di rete</i> permette di cambiare il modo in "
+"cui Tor si collega alla rete Tor."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:53
@@ -98,6 +105,14 @@ 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>Utilizzo un proxi per l'accesso a internet</b>: se la connessione "
+"internet in uso richiede un proxy HTTP, è possibile configurare Tor in "
+"maniera che invii tutte le directory richieste e i collegamenti relay Tor "
+"attraverso il proxy personale. Si deve specificare almeno un nome host o "
+"l'indirizzo del proxy personale, e la porta dalla quale il proprio proxy "
+"attende la connessione. Se il proxy richiede l'autenticazione è necessario "
+"inserire anche <i>Username</i> e <i>Password</i> utilizzati per il "
+"collegamento al proxy; diversamente lasciare i campi vuoti."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:62
@@ -106,9 +121,15 @@ 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>Il mio firewall si collega solo a determinate porte</b>: se si possiede "
+"un firewall restrittivo o un proxy che limita le porte alle quali è "
+"possibile collegarsi, bisogna configurare Tor per connettersi in modo "
+"diretto solo a relay in attesa di porte autorizzate dal firewall e dal proxy"
+" personale. Immettere un elenco di porte autorizzate dal firewall e dal "
+"proxy, separate da una virgola. (<i>Ad esempio: 80,443,8080</i>)"
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:69
@@ -117,69 +138,90 @@ msgid ""
 "Service Provider) blocks connections to the Tor network, Tor can attempt to "
 "avoid being filtered by encrypting its directory connections and connecting "
 "to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha "
-"or newer only). You can add bridge relays by specifying either their address "
-"and port number, or their address, port number, and fingerprint."
+"or newer only). You can add bridge relays by specifying either their address"
+" and port number, or their address, port number, and fingerprint."
 msgstr ""
+"<b>Il mio ISP blocca i collegamenti alla rete Tor</b>: se l'ISP (Internet "
+"Service Provider - Fornitore di servizi internet) blocca i collegamenti alla"
+" rete Tor, è possibile evitare di essere filtrati criptando i collegamenti "
+"di directory e collegandsi alla rete Tor attraverso relay chiamati "
+"<i>bridge</i> (solo per Tor 0.2.0.3-alpha o versioni successive). Sarà "
+"possibile aggiungere dei relay bridge specificando sia l'indirizzo sia il "
+"numero di porta, o indirizzo, numero di porta e la fingerprint."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:77
 msgid "Below are examples of valid bridge address formats:"
 msgstr ""
+"Di seguito sono riportati alcuni esempi di formati di indirizzi di bridge "
+"validi:"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:80
 msgid "128.213.48.13:8080"
-msgstr ""
+msgstr "128.213.48.13:8080"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:83
 msgid "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
-msgstr ""
+msgstr "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:86
 msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
-msgstr ""
+msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:89
 msgid ""
 "Even if you do not know any bridge relay addresses, checking this checkbox "
 "may still be helpful. Tor will encrypt its directory requests, which can "
-"defeat blocking mechanisms that try to filter Tor's requests for information "
-"about other relays. If connections to normal Tor relays are also blocked, "
-"then you will need to learn a bridge relay address somehow and add it "
-"here. See the help topic on <a href=\"bridges.html#finding\">finding bridge "
+"defeat blocking mechanisms that try to filter Tor's requests for information"
+" about other relays. If connections to normal Tor relays are also blocked, "
+"then you will need to learn a bridge relay address somehow and add it here. "
+"See the help topic on <a href=\"bridges.html#finding\">finding bridge "
 "relays</a> for more information on how to learn new bridge relay addresses "
 "and fingerprints."
 msgstr ""
+"Anche se non si conosce alcun indirizzo relay bridge, constrassegnare questa"
+" casella di controllo potrebbe rivelarsi utile. Tor crittograferà le "
+"richieste di directory che impediscono il meccanismo di blocco che tenta di "
+"filtrare le richieste di Tor relative alle informazioni su altri relay. Se "
+"vengono bloccati anche i collegamenti a relay Tor normali, occorrerà "
+"ottenere in qualche modo un indirizzo di relay bridge e aggiungerlo. Vedere "
+"l'argomento della guida <a href=\"bridges.html#finding\">Come trovare relay "
+"bridge</a> per ulteriori informazioni su come ottenere nuovi indirizzi relay"
+" bridge e fingerprint."
 
 #. type: Content of: <html><body>
 #: en/config.html:100
 msgid "<a name=\"relay\"/>"
-msgstr ""
+msgstr "<a name=\"relay\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:101
 msgid "Relay Settings"
-msgstr ""
+msgstr "Impostazioni relay"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:103
 msgid ""
-"<i> See <a href=\"server.html\">this help topic</a> for detailed information "
-"about setting up and managing a Tor relay.  </i>"
+"<i> See <a href=\"server.html\">this help topic</a> for detailed information"
+" about setting up and managing a Tor relay.  </i>"
 msgstr ""
+"<i> Per informazioni dettagliate sulla configurazione e sulla gestione di un"
+" relay Tor, fare riferimento al seguente argomento della guida <a "
+"href=\"server.html\"></a> </i>"
 
 #. type: Content of: <html><body>
 #: en/config.html:109
 msgid "<a name=\"appearance\"/>"
-msgstr ""
+msgstr "<a name=\"appearance\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:110
 msgid "Appearance Settings"
-msgstr ""
+msgstr "Impostazioni relative all'aspetto"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:112
@@ -187,17 +229,25 @@ msgid ""
 "The settings on the <i>Appearance</i> page allow you to customize the look "
 "and feel of Vidalia."
 msgstr ""
+"Le impostazioni della pagina <i>Aspetto</i> consentono di personalizzare "
+"l'aspetto di Vidalia."
 
 #. 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."
-msgstr ""
+"<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>Lingua</b>: l'interfaccia di Vidalia è stata tradotta in diverse lingue "
+"da volontari. Quando la si esegue per la prima volta, Vidalia tenterà di "
+"riconoscere la lingua in uso dal computer. Se il riconoscimento non è "
+"corretto o se si preferisce utilizzare una lingua diversa, è possibile "
+"scegliere una lingua differente nella casella a discesa. Dopo il cambio di "
+"lingua, per salvare le modifiche effettuate occorrerà riavviare Vidalia."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:124
@@ -206,16 +256,18 @@ msgid ""
 "default interface style. If you dislike the default, you can choose "
 "whichever interface style you prefer from the dropdown box."
 msgstr ""
+"<b>Stile</b>: nella maggior parte dei casi Vidalia visualizzerà lo stile di interfaccia predefinito.\n"
+"Se non lo si desidera, sarà possibile scegliere lo stile di interfaccia preferito dalla casella a discesa."
 
 #. type: Content of: <html><body>
 #: en/config.html:131
 msgid "<a name=\"advanced\"/>"
-msgstr ""
+msgstr "<a name=\"advanced\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:132
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Impostazioni avanzate"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:134
@@ -223,15 +275,23 @@ msgid ""
 "The settings on the <i>Advanced</i> page should generally only be modified "
 "by more experienced users."
 msgstr ""
+" Si consiglia di modificare le impostazioni della pagina  <i>Avanzate</i> "
+"solo se si è un utente esperto."
 
 #. 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>Indirizzo di controllo &amp; Porta</b>: la <i>porta di controllo </i> è "
+"la porta che utilizza Vidalia per \"parlare\" con Tor. Non occorre "
+"modificare tale porta a meno che si verifichi un conflitto con un altro "
+"servizio presente nel dispositivo in uso o nel caso si stia utilizzando "
+"Vidalia per controllare e monitorare l'esecuzione di Tor su un altro "
+"dispositivo."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:144
@@ -240,6 +300,10 @@ msgid ""
 "limit the applications on your machine that can connect to and reconfigure "
 "your Tor installation. The available authentication methods are:"
 msgstr ""
+"<b>Autenticazione della porta di controllo</b>: l'autenticazione della porta"
+" di controllo viene usata per limitare le applicazioni che potrebbero "
+"collegarsi e riconfigurare l'installazione di Tor. I metodi di "
+"autenticazione disponibili sono i seguenti:"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:150
@@ -248,6 +312,9 @@ msgid ""
 "<b>strongly</b> discouraged. Any application or user on your computer can "
 "reconfigure your Tor installation."
 msgstr ""
+"<b>Nessuna</b> -- non è richiesta alcuna autenticazione. Tale opzione è "
+"<b>fortemente</b> sconsigliata: qualsiasi applicazione o qualunque utente "
+"potrebbero riconfigurare l'installazione Tor personale."
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:155
@@ -255,18 +322,29 @@ 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>Password</b> <i>(autenticazione predefinita)</i> -- se si sceglie questo "
+"metodo, è possibile specificare una password che Tor richiederà ogni volta "
+"che un utente o un'applicazione si collega alla porta di controllo di Tor. "
+"Se Vidalia avvia Tor sarà possibile far generare una nuova password in "
+"ordine casuale  ad ogni avvio di Tor, constrassegnando la casella di "
+"controllo <i>Genera in ordine casuale</i>."
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:162
 msgid ""
-"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file "
-"(or, <i>cookie</i>) containing random bytes to its data directory when it "
+"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file"
+" (or, <i>cookie</i>) containing random bytes to its data directory when it "
 "starts. Any user or application that tries to connect to Tor's control port "
 "must be able to provide the contents of this cookie."
 msgstr ""
+"<b>Cookie</b> -- se si seleziona l'autenticazione cookie, all'avvio, Tor "
+"scriverà un file (o <i>cookie</i>) contenente byte in ordine casuale sulla "
+"directory data. Qualsiasi utente o applicazione che tenterà di collegarsi "
+"alla porta di controllo di Tor sarà in grado di fornire i contenuti del "
+"cookie."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:170
@@ -276,6 +354,10 @@ msgid ""
 "file. If you leave this field blank, Tor will uses its own default torrc "
 "location."
 msgstr ""
+"<b>File di configurazione di Tor</b> <i>(opzionale)</i>: è possibile usare "
+"questa opzione per permettere a Vidali di utilizzare un  <i>torrc</i> "
+"speifico, cioè un file di configurazione di Tor. Se il campo viene lasciato "
+"vuoto Tor utilizzerà il percorso torrc predefinito."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:175
@@ -285,29 +367,44 @@ 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>Directory dati di Tor</b> <i>(opzionale)</i>: è possibile specificare la "
+"directory nella quale Tor conserverà i dati salvati, come le informazioni "
+"dei relay Tor memorizzate nella cache, le chiavi del relay di Tor e i file "
+"di configurazione. Se il campo viene lasciato vuoto Tor utilizzerà il "
+"percorso di dati directory predefinito."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:181
 msgid ""
-"<b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter "
-"a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it "
-"starts.  If you enter a value for <b>Run as Group</b>, Tor will "
+"<b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter"
+" a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it"
+" starts.  If you enter a value for <b>Run as Group</b>, Tor will "
 "<i>setgid</i> to this group when it starts."
 msgstr ""
+"<b>Autorizzazioni</b> <i>(opzionale, non disponibile per Windows)</i>: se si"
+" immette un valore per <b>Esegui come utente</b>, Tor <i>assegnerà un "
+"indirizzo utente </i> all'utente, al momento dell'avvio.  Se si immette un "
+"valore per <b>Esegui come gruppo</b>, Tor <i>assegnerà l'identificativo di "
+"gruppo</i> al gruppo, al momento dell'avvio."
 
 #. type: Content of: <html><body>
 #: en/config.html:189
 msgid "<a name=\"services\"/>"
-msgstr ""
+msgstr "<a name=\"services\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:190
 msgid "Hidden Service Settings"
-msgstr ""
+msgstr "Impostazioni di servizio nascoste"
 
 #. 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 ""
+"Le impostazioni di servizio nascoste consentono di fornire ad altri "
+"qualsiasi servizio basato su TCP, ad es. un servizio HTTP, senza rivelare "
+"l'indirizzo IP personale."
+
+
diff --git a/it/index.po b/it/index.po
index 45d25be..332d6ed 100644
--- a/it/index.po
+++ b/it/index.po
@@ -1,33 +1,24 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# zfrns84 <silviazaf@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-05-02 20:18+0000\n"
+"Last-Translator: zfrns84 <silviazaf@xxxxxxxxx>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/index.html:16
 msgid "Vidalia Help"
-msgstr ""
+msgstr "Guida Vidalia"
 
 #. type: Content of: <html><body><p>
 #: en/index.html:20
@@ -35,6 +26,9 @@ 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 ""
+"Per cercare attraverso tutti gli argomenti disponibili della guida, "
+"selezionare un argomento dal menu ad albero sul lato sinistro o fare clic "
+"sul pulsante Trova al di sopra dell'elenco degli argomenti."
 
 #. type: Content of: <html><body><p>
 #: en/index.html:25
@@ -42,11 +36,15 @@ msgid ""
 "You can use the <i>Find</i> button on the toolbar above to search within a "
 "particular help topic."
 msgstr ""
+"Per effettuare una ricerca all'interno di un preciso argomento della guida, "
+"utilizzare il pulsante <i>Trova</i>"
 
 #. 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 ""
+"Il pulsante <i>Pagina iniziale</i> situato in alto consente di tornare alla "
+"pagina iniziale personale."
 
 #. type: Content of: <html><body><p>
 #: en/index.html:34
@@ -54,3 +52,7 @@ 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 ""
+"Per trovare ulteriori guide e informazioni su Vidalia e Tor, consultare la "
+"voce <a href=\"links.html\">Link utili</a>."
+
+
diff --git a/it/links.po b/it/links.po
index 3f70289..a204d05 100644
--- a/it/links.po
+++ b/it/links.po
@@ -1,10 +1,12 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -78,3 +80,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/it/log.po b/it/log.po
index b5d3761..a1dfcaa 100644
--- a/it/log.po
+++ b/it/log.po
@@ -1,28 +1,18 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,11 +22,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 +38,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 +60,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 +96,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 +113,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 +141,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 +157,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/it/netview.po b/it/netview.po
index 6e62a78..6bc0769 100644
--- a/it/netview.po
+++ b/it/netview.po
@@ -1,10 +1,11 @@
 # 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/it/running.po b/it/running.po
index e28fa1b..fe354d0 100644
--- a/it/running.po
+++ b/it/running.po
@@ -1,28 +1,18 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -74,8 +64,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 +90,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 +114,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 +128,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 +143,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/it/server.po b/it/server.po
index bbd257f..d9061c8 100644
--- a/it/server.po
+++ b/it/server.po
@@ -1,28 +1,18 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -69,8 +59,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 +87,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 +117,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 +138,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 +151,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 +160,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 +204,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 +280,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 +346,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 +367,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 +384,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/\";>http://192.168.0.1</a> or <a "
-"href=\"http://192.168.1.1/\";>http://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/\";>http://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\";> "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" 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 +401,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/it/services.po b/it/services.po
index 1090190..1e16a35 100644
--- a/it/services.po
+++ b/it/services.po
@@ -1,28 +1,18 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -93,9 +83,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 +108,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 +159,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 +182,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 +211,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 +221,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 +244,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/it/troubleshooting.po b/it/troubleshooting.po
index 5214888..9fbfde6 100644
--- a/it/troubleshooting.po
+++ b/it/troubleshooting.po
@@ -1,28 +1,18 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 # type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -48,23 +38,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 +70,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 +89,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 +135,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 +162,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 +174,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\";> "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
 
 # type: Content of: <html><body>
@@ -200,18 +191,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 +219,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 +241,5 @@ msgid ""
 "href=\"log.html\">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+
+
diff --git a/my/bridges.po b/my/bridges.po
index 54acf18..cab1293 100644
--- a/my/bridges.po
+++ b/my/bridges.po
@@ -1,10 +1,12 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -128,3 +130,5 @@ msgstr ""
 "á?¡á??á??á?¹á?? á?¡á??á?ºá?­á?³á??á?±á??á?¬ bridges á??á?ºá?¬á?¸á??á??á?¹ á??á?±á??á?¬á??á?¹á??á?½á?­á??á?­á?¯á??á?¹á?»á??á??á?¹á??á?²á?·á??á?½á?ºá??á?¹ bridge á??á?­á??á?¹á??á?¬ "
 "á??á??á?¹á??á?¯á??á??á?¹á??á?­á?¯á??á?­á?¯ á?»á??á??á?¹á??á??á?¹á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á?¬á?¸á?»á??á??á?¹á?¸á??á??á?¹ Tor á??á?­á?¯á??á??á?ºá?­á??á?¹á??á??á?¹á??á??á??á?­á?¯ á??á?­á?¯á??á?­á?¯ "
 "á??á??á?¹á?»á??á?­á??á?¹á?±á??á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? "
+
+
diff --git a/my/config.po b/my/config.po
index 5abc139..c378a86 100644
--- a/my/config.po
+++ b/my/config.po
@@ -1,28 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-12-21 22:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -53,7 +44,8 @@ msgstr "á?¡á?±á??á?¼á?±á??á?¼ Settings á??á?ºá?¬á?¸"
 
 #. 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 ""
 "<i>á?¡á?±á??á?¼á?±á??á?¼</i> á??á?¬á??á?ºá??á?¹á??á?½á?¬á?±á??á??á??á?½ settings á??á?ºá?¬á?¸á??á??á?¹ á?¡á??á?ºá?¬á?¸á?¡á?¬á?¸á?»á??á??á?¹á?· "
 "á?»á??á?³á?»á??á??á?¹á??á?¼á??á?¹á?¸á??á?¶á??á?­á?¯á??á?¹á?±á??á?¬ settings á??á?ºá?¬á?¸ á?»á??á??á?¹á?¾á??á??á?«á??á??á?¹á??"
@@ -61,14 +53,14 @@ 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 ""
-"<b>Tor Executable</b> : tray menu á??á?½ <i>Start</i> á??á?­á?¯ á??á??á?¹á?±á??á?¼á?¸á??á?ºá??á?¹á??á?­á?¯á??á?¹á??á?²á?·á?¡á??á?« "
-"Vidalia á??á?­á?¯ run á??á??á?¹á?· Tor executable á?»á??á??á?¹á??á?«á??á??á?¹á?? á?¡á??á??á?¹á?? Tor multiple "
+"<b>Tor Executable</b> : tray menu á??á?½ <i>Start</i> á??á?­á?¯ á??á??á?¹á?±á??á?¼á?¸á??á?ºá??á?¹á??á?­á?¯á??á?¹á??á?²á?·á?¡á??á?«"
+" Vidalia á??á?­á?¯ run á??á??á?¹á?· Tor executable á?»á??á??á?¹á??á?«á??á??á?¹á?? á?¡á??á??á?¹á?? Tor multiple "
 "á??á?¬á?¸á??á?½á??á?¹á?¸á??á?ºá?¬á?¸á??á?­á?¯ install á??á?¯á??á?¹á??á?¬á?¸á??á??á?¹ á??á?­á?¯á??á??á?¹ <i>Browse</i> button á??á?­á?¯ "
 "á??á?½á?­á??á?¹á?»á??á??á?¹á?¸á?¡á?¬á?¸á?»á??á??á?¹á?· á??á??á?¹á??á??á?¹á?· Vidalia á??á?¬á?¸á??á?½á??á?¹á?¸á??á?­á?¯á??á?¬ á?±á?»á??á?¬á?»á??á??á?­á?¯á??á?¹á?»á??á?®á?¸ "
 "á??á??á?¹á??á?­á?¯á??á?ºá??á?¹á?±á??á?¬ á??á?¶á?¯á??á?½á??á?¹ Tor installation á??á?­á?¯ á??á?¼á?¬á?¸á??á?­á?¯á??á?¹á??á?«á??á??á?¹á??"
@@ -80,8 +72,8 @@ msgid ""
 "automatically start Tor when Vidalia starts. You can also configure Vidalia "
 "to run when your system starts (<i>Windows only</i>)."
 msgstr ""
-"<b>Startup Options</b>: Vidalia á??á??á??á?¹á??á?­á?¯á??á?¹á??á?¬á??á?²á?? Tor á??á?­á?¯ á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹ á??á??á??á?¹á?±á??á??á?½á?¬ "
-"á?»á??á??á?¹á??á?«á??á??á?¹á?? á??á??á?¹á?? system á??á??á??á?¹á??á?¬á??á?²á?? run á??á?­á?¯á?? Vidalia á??á?­á?¯ á?»á??á??á?¹á??á??á?¹á??á?? á?»á??á?³á??á?¯á??á?¹á??á?¬á?¸ "
+"<b>Startup Options</b>: Vidalia á??á??á??á?¹á??á?­á?¯á??á?¹á??á?¬á??á?²á?? Tor á??á?­á?¯ á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹ á??á??á??á?¹á?±á??á??á?½á?¬"
+" á?»á??á??á?¹á??á?«á??á??á?¹á?? á??á??á?¹á?? system á??á??á??á?¹á??á?¬á??á?²á?? run á??á?­á?¯á?? Vidalia á??á?­á?¯ á?»á??á??á?¹á??á??á?¹á??á?? á?»á??á?³á??á?¯á??á?¹á??á?¬á?¸ "
 "á??á?­á?¯á??á?¹á??á?«á?±á??á?¸á??á??á?¹á?? (<i>Windows á??á?¼á??á?¹á??á?¬</i>)"
 
 #. type: Content of: <html><body>
@@ -97,8 +89,8 @@ msgstr "Network Settings"
 #. 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 ""
 "<i>Network</i> settings á??á?¬á??á?ºá??á?¹á??á?½á?¬á??á??á?¹ á??á??á?¹á?·á??á?­á?¯ Tor á??á?¼á??á?¹á??á??á?¹á??á?­á?¯á?? Tor "
 "á??á??á?¹á??á?­á?¯á??á?ºá?­á??á?¹á??á??á?¹á??á??á??á?¹á??á?­á?¯á??á?¬á??á?­á?¯ á?»á??á?³á?»á??á??á?¹á??á?¼á??á?¹á?·á?»á??á?³á??á?¬á?¸á??á?«á??á??á?¹á??"
@@ -118,8 +110,8 @@ msgstr ""
 "á?¡á??á?¹á??á?¬á??á??á?¹á??á??á?¹á??á?¼á??á?¹á??á??á??á??á?¹ HTTP proxy á??á?­á?¯á?¡á??á?¹á??á??á?¹á??á?­á?¯á??á?½á?ºá??á?¹ Tor relay á??á??á?¹á??á?¼á??á?¹á??á??á?? á??á??á?¹á?· "
 "proxy á??á?­á?¯á?»á??á??á?¹á?? á?±á??á?¬á??á?¹á?¸á??á?­á?¯á??á??á??á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?¸á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á?¯á??á?±á??á?¸á??á??á?¹ Tor á??á?­á?¯ "
 "á?»á??á??á?¹á??á??á?¹á??á?­á?¯á??á?¹á??á?«á??á??á?¹á?? á??á??á?¹á?·á?¡á?±á??á??á?²á?? á?¡á??á??á?¹á?¸á??á?¶á?¯á?¸ hostname á??á?­á?¯á??á??á??á?¯á??á?¹ á??á??á?¹á?? proxy "
-"á??á?ºá?¬á?¸á??á?­á?¯ á??á??á?¹á??á?½á??á?¹á??á??á?«á??á??á?¹á?? á??á?­á?¯á??á?±á??á?¬á??á?¹ á??á??á?¹á??á?¼á??á?¹á??á??á??á?ºá?¬á?¸á?¡á??á?¼á??á?¹ á??á??á?¹á??á??á?¹á?· port á?±á??á??á??á?½ proxy "
-"á?? á?¾á??á?¬á?¸á??á?¬á?±á??á??á??á?¹á??á?­á?¯ á??á??á?¹á??á?­á?¯á??á??á?¹á?¸ á??á??á?¹á??á?½á??á?¹á??á??á?«á??á??á?¹á??  á?¡á??á??á?¹á?? á??á??á?¹á?· proxy á??á??á?¹ "
+"á??á?ºá?¬á?¸á??á?­á?¯ á??á??á?¹á??á?½á??á?¹á??á??á?«á??á??á?¹á?? á??á?­á?¯á??á?±á??á?¬á??á?¹ á??á??á?¹á??á?¼á??á?¹á??á??á??á?ºá?¬á?¸á?¡á??á?¼á??á?¹ á??á??á?¹á??á??á?¹á?· port á?±á??á??á??á?½ proxy"
+" á?? á?¾á??á?¬á?¸á??á?¬á?±á??á??á??á?¹á??á?­á?¯ á??á??á?¹á??á?­á?¯á??á??á?¹á?¸ á??á??á?¹á??á?½á??á?¹á??á??á?«á??á??á?¹á??  á?¡á??á??á?¹á?? á??á??á?¹á?· proxy á??á??á?¹ "
 "authentication á??á?­á?¯á?¡á??á?¹á??á??á?¹á??á?­á?¯á??á?½á?ºá??á?¹ proxy á??á?­á?¯á??á?ºá?­á??á?¹á??á??á?¹á??á?­á?¯á??á?¡á??á?¼á??á?¹ <i>Username</i> "
 "á??á?½á??á?¹á?· <i>Password</i> á??á??á?¹á?·á??á?¬ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?­á?¯á??á?¹á??á?«á??á??á?¹á?? á?¡á?»á??á?¬á?¸á??á??á??á?¹á?¸á??á?±á??á?¬á?· "
 "á?¤á?»á??á??á?¹á?·á??á??á?¬á??á?ºá?¬á?¸á??á?­á?¯ á??á?¼á??á?¹á??á??á?¹á??á?¬á?¸á??á?²á?·á??á?­á?¯á??á??á??á?«á??á??á?¹á??"
@@ -131,8 +123,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 ""
 "<b>á??á?½á?¼á??á?¹á?±á??á?¬á?¹á?? firewall á??á??á?¹ á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ ports á??á?ºá?¬á?¸á??á?­á?¯á??á?¬ "
 "á??á??á?¹á??á?¼á??á?¹á??á?¼á??á?¹á?·á?»á??á?³á??á??á?¹á??</b>: á?¡á??á??á?¹á?? á??á??á?¹á??á??á??á?¹á??á?¬á?¸á?±á??á?¬ firewall á??á?­á?¯á??á??á??á?¯á??á?¹ "
@@ -149,8 +141,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 ""
 "<b>á??á?½á?¼á??á?¹á?±á??á?¬á?¹á?? ISP á??á??á?¹ Tor á??á?¼á??á?¹á??á??á?¹á??á?­á?¯á?? á??á?ºá?­á??á?¹á??á??á?¹á?»á??á??á?¹á?¸á??á?­á?¯ "
 "á??á?­á??á?¹á??á?­á?¯á??á??á?¬á?¸á??á?«á??á??á?¹á??</b>: á?¡á??á??á?¹á?? á??á??á?¹á?? ISP (Internet Service Provider) á??á??á?¹ Tor "
@@ -187,10 +179,10 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
 msgid ""
 "Even if you do not know any bridge relay addresses, checking this checkbox "
 "may still be helpful. Tor will encrypt its directory requests, which can "
-"defeat blocking mechanisms that try to filter Tor's requests for information "
-"about other relays. If connections to normal Tor relays are also blocked, "
-"then you will need to learn a bridge relay address somehow and add it "
-"here. See the help topic on <a href=\"bridges.html#finding\">finding bridge "
+"defeat blocking mechanisms that try to filter Tor's requests for information"
+" about other relays. If connections to normal Tor relays are also blocked, "
+"then you will need to learn a bridge relay address somehow and add it here. "
+"See the help topic on <a href=\"bridges.html#finding\">finding bridge "
 "relays</a> for more information on how to learn new bridge relay addresses "
 "and fingerprints."
 msgstr ""
@@ -202,8 +194,8 @@ msgstr ""
 "á??á?­á??á?¹á??á?­á?¯á??á??á?¶á??á?­á?¯á??á?¹á??á??á?½á?ºá??á?¹ bridge relay á??á?­á??á?¹á??á?¬ á??á??á?¹á??á?­á?¯á??á??á?¹á?¸á??á?²á?? á?¤á?±á??á??á?¬á??á?¼á??á?¹ "
 "á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á??á??á?¹ á??á?­á?¯á??á?¬á??á?­á?¯ á?±á??á?·á??á?¬á??á??á?«á??á?­á??á?¹á?·á??á??á?¹á?? bridge relay á??á?­á??á?¹á??á?¬á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?½á??á?¹á?· "
 "fingerprints á??á?ºá?¬á?¸ á?¡á?±á?¾á??á?¬á??á?¹á?¸ á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ <a "
-"href=\"bridges.html#finding\">bridge relaysá??á?ºá?¬á?¸á??á?½á?¬á?±á??á?¼á?»á??á??á?¹á?¸</a> á??á?½á?­ á?¡á??á?°á?¡á??á?®á??á??á??á?­á?¯ "
-"á?¾á??á??á?¹á?·á??á??á??á?«á??"
+"href=\"bridges.html#finding\">bridge relaysá??á?ºá?¬á?¸á??á?½á?¬á?±á??á?¼á?»á??á??á?¹á?¸</a> á??á?½á?­ "
+"á?¡á??á?°á?¡á??á?®á??á??á??á?­á?¯ á?¾á??á??á?¹á?·á??á??á??á?«á??"
 
 #. type: Content of: <html><body>
 #: en/config.html:100
@@ -218,11 +210,12 @@ msgstr "Relay Settings"
 #. type: Content of: <html><body><p>
 #: en/config.html:103
 msgid ""
-"<i> See <a href=\"server.html\">this help topic</a> for detailed information "
-"about setting up and managing a Tor relay.  </i>"
+"<i> See <a href=\"server.html\">this help topic</a> for detailed information"
+" about setting up and managing a Tor relay.  </i>"
 msgstr ""
 "<i>Tor relay á??á??á?¹á??á?¯á??á?­á?¯ á?»á??á??á?¹á??á??á?¹á?»á??á??á?¹á?¸á??á?½á??á?¹á?· á??á?®á??á?¶á??á??á?¹á??á??á?¼á?²á?»á??á??á?¹á?¸á??á?ºá?¬á?¸ á??á?­á?¯á??á?¹á??á?¬ "
-"á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ <a href=\"server.html\">á?¡á??á?°á?¡á??á?® á??á??</a></i>á??á?¼á??á?¹ á?¾á??á??á?¹á?·á??á??á??á?«á??"
+"á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ <a href=\"server.html\">á?¡á??á?°á?¡á??á?® á??á??</a></i>á??á?¼á??á?¹ "
+"á?¾á??á??á?¹á?·á??á??á??á?«á??"
 
 #. type: Content of: <html><body>
 #: en/config.html:109
@@ -246,12 +239,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 ""
 "<b>á??á?¬á??á?¬á??á??á?¬á?¸</b>: Vidalia á?? interface á??á?­á?¯ á?±á??á??á??á?¬á?·á??á??á?¹á??á??á?¹á?¸á??á?ºá?¬á?¸á?? "
 "á??á?¬á??á?¬á??á??á?¬á?¸á??á?ºá?­á?³á?¸á??á?¶á?¯á??á?­á?¯á?? á??á?°á??á?®á??á?¬á??á?¬á?»á??á??á?¹á??á?­á?¯á??á?¬á?¸á?»á??á?®á?¸ á?»á??á??á?¹á??á?«á??á??á?¹á?? Vidalia á??á?­á?¯á??á??á??á?¹ run "
@@ -270,9 +263,9 @@ msgid ""
 "default interface style. If you dislike the default, you can choose "
 "whichever interface style you prefer from the dropdown box."
 msgstr ""
-"<b>á?¡á??á?¼á??á?¹á?¡á?»á??á??á?¹</b>: á?¡á??á?ºá?¬á?¸á?¡á?¬á?¸á?»á??á??á?¹á?· Vidalia á??á?¬ á??á??á?¹á?· platform á?? á??á?°á??á??á?¹á?¸ interface "
-"á?¡á??á?¼á??á?¹á?»á??á??á?¹á??á?­á?¯á??á?² á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á??á??á?¹á?? á?¡á??á??á?¹á?? á??á?°á??á??á?¹á?¸á??á?¶á?¯á??á?¶á??á?¼á??á?¹á?»á??á??á?¹á??á?­á?¯ á??á?¾á??á?­á?³á??á?¹á??á?°á?¸á??á?­á?¯á??á??á?¹ "
-"dropdown box á??á?²á?? á?¾á??á?­á?³á??á?¹á??á?½á??á?¹á??á??á?¹á??á?¬ interface á?¡á??á?¼á??á?¹á?»á??á??á?¹á??á?­á?¯ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?­á?¯á??á?¹á??á?«á??á??á?¹á??"
+"<b>á?¡á??á?¼á??á?¹á?¡á?»á??á??á?¹</b>: á?¡á??á?ºá?¬á?¸á?¡á?¬á?¸á?»á??á??á?¹á?· Vidalia á??á?¬ á??á??á?¹á?· platform á?? á??á?°á??á??á?¹á?¸ interface"
+" á?¡á??á?¼á??á?¹á?»á??á??á?¹á??á?­á?¯á??á?² á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á??á??á?¹á?? á?¡á??á??á?¹á?? á??á?°á??á??á?¹á?¸á??á?¶á?¯á??á?¶á??á?¼á??á?¹á?»á??á??á?¹á??á?­á?¯ á??á?¾á??á?­á?³á??á?¹á??á?°á?¸á??á?­á?¯á??á??á?¹"
+" dropdown box á??á?²á?? á?¾á??á?­á?³á??á?¹á??á?½á??á?¹á??á??á?¹á??á?¬ interface á?¡á??á?¼á??á?¹á?»á??á??á?¹á??á?­á?¯ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?­á?¯á??á?¹á??á?«á??á??á?¹á??"
 
 #. type: Content of: <html><body>
 #: en/config.html:131
@@ -296,14 +289,14 @@ 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>Control Address &amp; Port</b>: <i>Control Port</i> á??á??á?¹ Vidalia á?? Tor "
-"á??á?­á?¯á?±á?»á??á?¬á??á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹á?· port á?»á??á??á?¹á??á??á?¹á?? á??á??á?¹á?·á??á??á?¹á??á?²á??á?½á?¬ á?¡á?»á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á?±á??á?¼á??á?²á?? "
-"á??á??á?­á??á??á?¡ á??á?»á??á??á?¹á??á?°á?¸á??á?­á?¯á??á??á?¹  á??á?«á??á?½á??á??á?¯á??á?¹ á??á??á?¹á?»á??á?¬á?¸ á??á??á?¹á??á?²á??á?½á?¬ Tor process "
+"á??á?­á?¯á?±á?»á??á?¬á??á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹á?· port á?»á??á??á?¹á??á??á?¹á?? á??á??á?¹á?·á??á??á?¹á??á?²á??á?½á?¬ á?¡á?»á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á?±á??á?¼á??á?²á??"
+" á??á??á?­á??á??á?¡ á??á?»á??á??á?¹á??á?°á?¸á??á?­á?¯á??á??á?¹  á??á?«á??á?½á??á??á?¯á??á?¹ á??á??á?¹á?»á??á?¬á?¸ á??á??á?¹á??á?²á??á?½á?¬ Tor process "
 "á?¡á??á?¯á??á?¹á??á?¯á??á?¹á?±á??á??á?¬á??á?­á?¯ á?±á??á?¬á??á?¹á?·á?¾á??á??á?¹á?·á??á?­á?¯á??á??á?²á?? á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á?­á?¯á?? Vidalia "
 "á??á?­á?¯á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á??á?¬á??á?­á?¯á??á??á?¹ á??á??á?­á?¯ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?­á?¯á?? á??á??á?­á?¯á?¡á??á?¹á??á?«á??á?°á?¸á??"
 
@@ -336,8 +329,8 @@ 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>Password</b> <i>(Default)</i> -- á?¡á??á??á?¹á?? á??á?®á??á??á?¹á?¸á??á??á?¹á?¸á??á?­á?¯ á?±á??á?¼á?¸á??á?ºá??á?¹á??á?²á?·á??á?½á?ºá??á?¹ "
 "á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?°á??á?²á?»á??á??á?¹á?»á??á??á?¹ application á??á?²á?»á??á??á?¹á?»á??á??á?¹ Tor á??á?²á?? control port á??á?­á?¯ "
@@ -349,8 +342,8 @@ 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 ""
@@ -383,8 +376,8 @@ 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 Data Directory</b> <i>(optional)</i>: Tor á??á?²á?? á?¡á??á?ºá??á?¹á?¡á??á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹á?· "
-"directory á??á?­á?¯ á??á??á?¹á?·á??á??á?¹á??á?½á??á?¹á??á?­á?¯á??á?¹á??á??á?¹á?? Tor relay á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á??Tor relay "
+"<b>Tor Data Directory</b> <i>(optional)</i>: Tor á??á?²á?? á?¡á??á?ºá??á?¹á?¡á??á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹á?·"
+" directory á??á?­á?¯ á??á??á?¹á?·á??á??á?¹á??á?½á??á?¹á??á?­á?¯á??á?¹á??á??á?¹á?? Tor relay á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á??Tor relay "
 "keys á??á?½á??á?¹á?· configuration á??á?­á?¯á??á?¹á??á?ºá?¬á?¸ á??á?­á?¯ á??á?­á??á?¹á?¸á??á?¬á?¸á?»á??á??á?¹á?¸á??á?ºá?­á?³á?¸á??á?²á?·á??á?­á?¯á?? á?»á??á??á?¹á??á??á?¹á?? "
 "á?¡á??á??á?¹á?? á??á?®á?±á??á??á?¬á??á?­á?¯ á??á?¼á??á?¹á??á??á?¹á??á?¬á?¸á??á?²á?·á??á?½á?ºá??á?¹ Tor á?? á??á?°á??á?²á?? á??á?­á?¯á??á?¹á??á?­á?¯á??á?¹ "
 "á??á?°á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?­á??á?¹á?¸á??á?²á?·á?±á??á??á?¬ á??á?­á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?½á?¬á?»á??á??á?¹á??á?«á??á??á?¹á??"
@@ -392,9 +385,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 ""
 "<b>á??á?¼á??á?¹á?·á?»á??á?³á??á?ºá??á?¹á??á?ºá?¬á?¸</b> <i>(optional, Windows á??á?¼á??á?¹á??á??á??á?«)</i>: <b>Run as "
@@ -416,9 +409,11 @@ msgstr "Hidden Service Settings"
 #. type: Content of: <html><body><p>
 #: en/config.html:192
 msgid ""
-"Hidden services allow you to provide any kind of TCP-based service, e.g.  an "
-"HTTP service, to others without revealing your IP address."
+"Hidden services allow you to provide any kind of TCP-based service, e.g.  an"
+" HTTP service, to others without revealing your IP address."
 msgstr ""
 "á??á?­á?¯á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸á?? á??á??á?¹á??á??á?¹á?· TCP-based á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸á?»á??á??á?¹á?·á??á??á?­á?¯ "
 "á?±á??á?¬á??á?¹á??á?°á?±á??á?¸á??á??á?¹ á??á?¼á??á?¹á?·á?»á??á?³á??á?«á??á??á?¹á?? á?¥á??á??á?¬ HTTP á??á??á?¹á?±á??á?¬á??á?¹á??á??á?? á??á??á?¹á?? IP á??á?­á??á?¹á??á?¬á??á?­á?¯ "
 "á??á??á?¹á??á?°á??á?­á?¯á??á?½ á??á?¯á??á?¹á?±á??á?¬á?¹ á??á?»á??á?»á??á??á?¹á?¸á??á?ºá?­á?³á?¸ á?»á??á??á?¹á??á??á?¹á??"
+
+
diff --git a/my/index.po b/my/index.po
index 90e2591..8747048 100644
--- a/my/index.po
+++ b/my/index.po
@@ -1,28 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -62,3 +53,5 @@ msgid ""
 msgstr ""
 "Vidalia á??á?½á??á?¹á?· Tor á??á?­á?¯á??á?? á?¡á??á?­á?¯á?±á??á?¬á??á?¹á?¸ á?¡á??á?°á??á?®á??á?½á??á?¹á?· á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ "
 "á??á?½á?¬á?±á??á?¼á??á??á?¹ <a href=\"links.html\">á?¡á??á?¯á?¶á?¸á??á??á?¹á?±á??á?¬ Links á??á?ºá?¬á?¸</a>á??á?? á??á?­á?¯á?¾á??á??á?¹á?·á??á?«á??"
+
+
diff --git a/my/links.po b/my/links.po
index 0158a30..4aa33fa 100644
--- a/my/links.po
+++ b/my/links.po
@@ -1,10 +1,12 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -78,3 +80,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/my/log.po b/my/log.po
index a1ad413..526e23b 100644
--- a/my/log.po
+++ b/my/log.po
@@ -1,28 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -32,18 +23,19 @@ msgstr "Message Log"
 #. 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 ""
 "message log á??á??á?¹ Tor process run á?±á??á?±á??á?¬ á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹ status á??á?­á?¯ "
 "á?¾á??á??á?¹á?·á??á??á??á?¼á??á?¹á?·á?±á??á?¸á??á??á?¹á?? <a name=\"basic\"/>message "
 "á??á??á?¹á??á?¯á??á?ºá??á?¹á?¸á??á?®á??á?¼á??á?¹<b>á?¡á??á?½á?¬á?¸</b>(á?¡á?±á??á?¬á?¹á?±á??á?¸) á??á?½ <b>Debug</b>(á??á?­á?¯á??á?­á?¯á??á?ºá?¬á?¸á?»á??á?¬á?¸á??á??á?¹) "
 "á?¡á??á?­ á??á?®á??á?®á??á?¬á?¸á?»á??á?®á?¸ á??á??á?½á??á?¹á?· á??á??á?¹á??á??á?¹á??á?½á?ºá??á?¹á??á?½á?­á?±á??á?¬ <i>severity</i> á??á?½á?­á?¾á??á??á??á?¹á?? "
 "á??á?­á?¯á??á?­á?¯á??á?­á??á?­á?¯á?±á??á?¬ á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á?¡á??á?¼á??á?¹ á?¡á??á?°á?¡á??á?®á??á??á??á?½á?­ <a "
-"href=\"#severities\">message severities</a> á??á?­á?¯ á?¾á??á??á?¹á?·á??á?«á??<a name=\"severities\"/>"
+"href=\"#severities\">message severities</a> á??á?­á?¯ á?¾á??á??á?¹á?·á??á?«á??<a "
+"name=\"severities\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/log.html:28
@@ -54,9 +46,9 @@ msgstr "Message Severities"
 #: 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 ""
 "message á?? severity á?? á??á??á?¹á?·á??á?­á?¯ message á??á??á?¹á??á??á?¹á??á?½á?º á?¡á?±á??á?¸á?¾á??á?®á?¸á?±á?¾á??á?¬á??á?¹á?¸ "
 "á?±á?»á??á?¬á?»á??á??á?­á??á?·á?¹á??á??á?¹á?? á?¡á??á??á?¹á?·á?»á??á??á?¹á?·á?±á??á?¬ severity message á?±á??á?¼á??á?¬ Tor á?? á?»á??á??á?¹á?±á??á??á??á?¬á?±á??á?¬ "
@@ -66,7 +58,8 @@ 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 "á?¡á?±á??á?¸á?¡á?¾á??á?®á?¸á??á?¶á?¯á?¸á??á?½ á??á?? á?¡á??á?¥á?¹á?¡á??á?­á?¯á??á?¹á?¸á??á?®á??á?¬á?¸á?±á??á?¬ message á??á?ºá?¬á?¸:"
 
 #. type: Content of: <html><body><ul><li>
@@ -76,16 +69,16 @@ msgid ""
 "Tor cannot proceed. These messages will be highlighted in <i>red</i> in the "
 "message log."
 msgstr ""
-"<b>Error</b>: á?±á??á?¬á?¹á?±á??á?¬á?¹á?±á??á?¸ á?¡á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á?»á??á??á?¹á?±á??á?? message á?±á??á??á??á?¬á??á?²á?·á?¡á??á?«á??á?½á?¬á?±á??á?¬á?· Tor á?? "
-"á??á??á?¹á??á??á?¹ á?¡á??á?¯á??á?¹á??á?¯á??á?¹á??á?­á?¯á??á?¹á?±á??á?¬á?·á??á?½á?¬ á??á??á?¯á??á?¹á??á?«á??á?°á?¸á?? á?¡á?²á?·á??á?­á??á?­á?¯ message á??á?ºá?­á?³á?¸á??á?­á?¯ message "
+"<b>Error</b>: á?±á??á?¬á?¹á?±á??á?¬á?¹á?±á??á?¸ á?¡á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á?»á??á??á?¹á?±á??á?? message á?±á??á??á??á?¬á??á?²á?·á?¡á??á?«á??á?½á?¬á?±á??á?¬á?· Tor á??"
+" á??á??á?¹á??á??á?¹ á?¡á??á?¯á??á?¹á??á?¯á??á?¹á??á?­á?¯á??á?¹á?±á??á?¬á?·á??á?½á?¬ á??á??á?¯á??á?¹á??á?«á??á?°á?¸á?? á?¡á?²á?·á??á?­á??á?­á?¯ message á??á?ºá?­á?³á?¸á??á?­á?¯ message "
 "log á??á?²á??á?¼á??á?¹ <i>á?¡á??á?®</i>á?»á??á??á?¹á?· á??á?ºá?¥á?¹á?¸á??á?¬á?¸ á?»á??á??á??á?¬á?¸á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á??"
 
 #. 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 ""
 "<b>á??á??á?­á?±á??á?¸á??á?ºá??á?¹</b>: Tor á??á?¼á??á?¹ á??á??á?¹á??á?¯á??á?¯ á?¡á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?· á?±á??á??á??á?¬á?±á??á?¬ messages "
 "á?±á??á?¼á??á?¬ á??á?ºá??á?¹á??á?®á?¸á?±á??á??á?½á?¬ á??á??á?¯á??á?¹á??á?² Tor á?? á??á??á?¹á??á??á?¹ run á?±á??á??á?«á??á?­á??á?¹á?·á??á??á?¹á?? á?¡á?²á?·á??á?­ messages "
@@ -94,8 +87,8 @@ 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 ""
 "<b>á?¡á??á?­á?±á??á?¸á??á?ºá??á?¹</b>: á??á?¶á?¯á??á?½á??á?¹ Tor operation á?¡á??á?¼á??á?¹á?¸ á??á?¾á??á?¬á??á??á??á??á?¯á??á?¹á??á?² á?±á??á??á??á?¬á?±á??á?¬ "
 "messages á?±á??á?¼á??á?¬ errors á?±á??á?¼á??á?­á?¯ á?¡á??á?¶á?¯á?¸á?¡á?»á??á??á?¹á??á?±á??á?¸á??á?­á?¯á??á?¹á?±á??á?¸á??á??á?¹á?· á??á??á?¹á?¡á?±á??á??á?²á?? "
@@ -104,8 +97,8 @@ 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 ""
 "<b>Info</b>: á??á?¶á?¯á??á?½á??á?¹ Tor operation á?¡á??á?¼á??á?¹á?¸ á??á?¾á??á?¬á??á?? á?±á??á??á??á?¬á?±á??á?¬ messages á?±á??á?¼á??á?¬ "
 "á??á?¬á??á??á?¹á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?°á?±á??á?¼á??á?­á?¯ á??á?­á??á?¹á??á??á??á?¹á??á?¬á?¸ á?±á??á??á?«á??á?°á?¸á??"
@@ -114,8 +107,8 @@ msgstr ""
 #: 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 ""
 "<b>Debug</b>:á?¡á??á?¼á??á?¹á??á?½á??á?¹á??á?ºá?¬á?¸á?±á??á?¬ message á?±á??á?¼á??á?¬ developers á??á?ºá?¬á?¸á??á?­á?¯ á?¡á??á?­á?? "
 "á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á?±á??á??á?«á??á??á?¹á?? á??á??á?¹á??á?¬á??á?¯á??á?¹á??á??á??á?¹á??á?­á?¯á??á?¬ á??á??á?­á??á??á?¹á?±á??á?¬á??á?¹ á??á?¶á?¯á??á?½á??á?¹á?¡á?¬á?¸á?»á??á??á?¹á?· debug á??á?­á?¯ "
@@ -132,7 +125,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 "á?»á??á??á?¹á??á?ºá??á?¹á?±á??á?¬ message á??á?­á?¯ á?±á??á?¼á?¸á??á?ºá??á?¹á??á??á?¹ á?±á?¡á?¬á??á?¹á??á?«á?¡á??á?­á?¯á??á?¹á?¸á?»á??á?³á??á?¯á??á?¹á??á?«á??"
 
 #. type: Content of: <html><body><ol><li>
@@ -148,8 +142,8 @@ msgstr "message log window á?¡á?±á??á??á??á??á?¹á??á?½á?­ <i>Settings</i> á??á?­
 #. 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 ""
 "á??á??á?¹á??á??á?¹á?»á??á??á?¹á?¸á??á?½á?­ Message Filter group á??á?½ á?»á??á??á?¹á??á?ºá??á?¹á?±á??á?¬ message á??á?­á?¯ check  "
 "á??á?¯á??á?¹á?»á??á?®á?¸á??á?»á??á??á?¹á??á?ºá??á?¹á?±á??á?¬ message á??á?­á?¯ uncheck á??á?¯á??á?¹á??á?«á??"
@@ -182,7 +176,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 ""
 "<i>log messages á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á?¯á??á?¹á?¡á?»á??á??á?¹ á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹á??á?­á??á?¹á?¸á??á?«á??</i>á??á?­á?¯á??á??á?¹á?· "
 "á??á?¬á??á??á?¹á??á??á?¹á??á?¬á?¸á?±á??á?¬ box á??á?­á?¯ check á??á?¯á??á?¹á??á?«á?? "
@@ -202,3 +197,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr "á??á??á?¹á?? log á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?¹á?¸á??á??á?¹ <i>Save Settings</i>á??á?­á?¯ á??á?½á?­á??á?¹á??á?«á??"
+
+
diff --git a/my/netview.po b/my/netview.po
index cb126fe..05334a7 100644
--- a/my/netview.po
+++ b/my/netview.po
@@ -1,11 +1,12 @@
 # 
+# Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
diff --git a/my/running.po b/my/running.po
index ebc24ce..d4b6b02 100644
--- a/my/running.po
+++ b/my/running.po
@@ -1,28 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -81,8 +72,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 ""
 "á?¡á??á??á?¹á?? Vidalia á??á??á?¹ Tor á??á?­á?¯ á??á??á??á??á?¹á??á?­á?¯á??á?¹á??á?°á?¸ á??á?­á?¯á??á?½á?ºá??á?¹ á??á?¬á??á?½á?¬á?¸á?±á??á??á??á?¹á??á?­á?¯á??á?²á?· error "
 "message á??á?­á?¯ Vidalia á?? á?»á??á??á?±á??á?¸á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? á??á?¬á??á?½á?¬á?¸á?±á??á??á??á?¹á??á?­á?¯á??á?²á?· "
@@ -115,13 +106,13 @@ 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 ""
 "á?¡á??á??á?¹á?? Vidalia á??á??á?¹ Tor á??á?­á?¯ á??á??á??á?¹á??á??á?¹á??á??á?­á?¯á??á?¹á??á?²á?·á??á?½á?ºá??á?¹ Vidalia á??á??á?¹ "
 "á??á?¬á??á?½á?¬á?¸á?±á??á??á??á?¹á??á?­á?¯á??á?²á?· error message á??á?­á?¯ á?»á??á??á?±á??á?¸á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? á?¡á??á??á?¹á?? Tor á?? "
-"á??á?¬á??á?½á?¬á?¸á?±á??á??á??á?¹á??á?­á?¯á??á?²á?· á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?±á??á?¬á?¹á?»á??á??á?²á?·á??á?½á?ºá??á?¹ <a href=\"log.html\">message "
-"log</a> á??á?½á?¬á??á??á?¹á?¸ á?¾á??á??á?¹á?·á??á??á??á?­á?¯á??á?¹á??á?«á?±á??á?¸á??á??á?¹á??"
+"á??á?¬á??á?½á?¬á?¸á?±á??á??á??á?¹á??á?­á?¯á??á?²á?· á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?±á??á?¬á?¹á?»á??á??á?²á?·á??á?½á?ºá??á?¹ <a "
+"href=\"log.html\">message log</a> á??á?½á?¬á??á??á?¹á?¸ á?¾á??á??á?¹á?·á??á??á??á?­á?¯á??á?¹á??á?«á?±á??á?¸á??á??á?¹á??"
 
 #. type: Content of: <html><body>
 #: en/running.html:57
@@ -147,7 +138,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 ""
 "Tor á??á??á?¹á??á??á?¹á??á??á?¼á?¬á?¸á??á?«á?»á??á?®á?? Tor á??á?­á?¯ á??á??á??á?¹á??á??á?¹ Vidalia menu á??á?½ <i>Start</i>á??á?­á?¯ "
 "á?±á??á?¼á?¸á??á?«á??"
@@ -164,8 +156,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 ""
@@ -183,11 +175,13 @@ msgstr "Tor á??á?¬ shut down á?»á??á?³á??á?¯á??á?¹á?±á??á??á?² á?¡á?±á?»á??á?¡
 #: 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 á??á?¬ red X á??á?½á??á?¹á?· á?¡á??á?²á?±á??á?¬á??á?¹ "
 "onion á??á?­á?¯á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?¼á?¬á?¸á??á?½á?¬ á?»á??á??á?¹á?»á??á?®á?¸ á??á?¬á??á?½á?¬á?¸á??á?¼á?¬á?¸á??á??á?¹á??á?­á?¯á??á?²á?· error message á??á?­á?¯ "
 "á?»á??á??á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? á??á??á?¼á??á?¹á??á??á?¹á??á?½á?¬ Tor á??á?¬ á?»á??á??á??á?¬á??á??á?¹á??á?¯á??á?¯á??á?½á??á?¹á?· á?¾á??á?¶á?³á?±á??á?¼á??á??á?²á?· á?¡á?±á??á?¸á??á?­á??á?¹ "
 "á?¡á?±á?¾á??á?¬á??á?¹á?¸á??á?­á?¯ <a href=\"log.html\">message log</a> á??á?½á?¬ á??á??á?¹á?±á??á?¸á??á?­á?¯á??á?¹á??á?«á??á??á?¹á??"
+
+
diff --git a/my/server.po b/my/server.po
index 2af52d7..b8357e1 100644
--- a/my/server.po
+++ b/my/server.po
@@ -1,28 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -78,8 +69,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 ""
 "á??á??á?¹á??á??á?¹á?· á??á?¶á?¯á??á?½á??á?¹ Tor relay á??á?­á?¯á??á??á??á?¯á??á?¹ <i>bridge</i> relay (Tor 0.2.0.8-alpha "
 "á??á?­á?¯á??á??á??á?¯á??á?¹ á??á?¬á?¸á??á?½á??á?¹á?¸á?¡á??á??á?¹á??á?ºá?¬á?¸) á??á?­á?¯ á??á??á?¹ run á??á?­á?¯á??á??á?¹á??á?­á?¯á??á?¬á??á?­á?¯ á??á?¶á?¯á?¸á?»á??á??á?¹á??á?«á?? Bridge "
@@ -113,15 +104,15 @@ msgid ""
 "and fingerprint."
 msgstr ""
 "<b>á??á??á?¹á??á?¼á??á?¹á??á??á?¹á?¡á??á?ºá??á?¹á?¡á??á??á?¹</b>: á??á??á?¹á?·á?¡á?®á?¸á?±á??á?¸á??á?¹á??á?­á??á?¹á??á?¬á?? á??á??á?­á??á?¹á??á?¬á??á?­á?¯ á?¡á?±á??á?¸á?¾á??á?®á?¸á?±á??á?¬ Tor "
-"á??á?¶á?¯á?»á??á?¶á?³á?±á??á?¸á??á?­á?¯á??á?¹á??á?¬ update á??á?ºá?¬á?¸ á??á?­á?¯á??á??á??á?¯á??á?¹ á??á??á?¹á?· relay á??á??á?¹á??á?¯á??á?¯ á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á?±á??á??á??á?¹á??á?²á?· "
-"á??á?­á??á?¥á??á??á?¹á??á?ºá?¬á?¸ á??á?½á?­á??á?²á?·á??á??á?¹ á??á??á?¹á??á?¼á??á?¹á??á?­á?¯á?? á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?½á?¬á??á?«á??  PGP á??á?­á?¯á??á??á??á?¯á??á?¹ GPG key ID "
+"á??á?¶á?¯á?»á??á?¶á?³á?±á??á?¸á??á?­á?¯á??á?¹á??á?¬ update á??á?ºá?¬á?¸ á??á?­á?¯á??á??á??á?¯á??á?¹ á??á??á?¹á?· relay á??á??á?¹á??á?¯á??á?¯ á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á?±á??á??á??á?¹á??á?²á?·"
+" á??á?­á??á?¥á??á??á?¹á??á?ºá?¬á?¸ á??á?½á?­á??á?²á?·á??á??á?¹ á??á??á?¹á??á?¼á??á?¹á??á?­á?¯á?? á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?½á?¬á??á?«á??  PGP á??á?­á?¯á??á??á??á?¯á??á?¹ GPG key ID "
 "á??á?½á??á?¹á?· fingerprint á??á?­á?¯á?? á??á?«á??á?½á?­á??á??á?«á??á??á?¹á??"
 
 #. 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 ""
 "<b>Relay Port</b>: á??á??á?¹á?· relay á?±á??á??á??á?½á?­ á?? port á??á??á?¹ clients á??á?ºá?¬á?¸á??á?®á?? á??á?­á?¯á??á??á??á?¯á??á?¹ "
 "á?¡á?»á??á?¬á?¸ Tor relays á??á?ºá?¬á?¸á??á?®á?? á??á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?¸á??á?ºá?¬á?¸á??á?­á?¯ á??á?¬á?¸á?±á??á?¬á??á?¹á??á?«á??á?­á??á?¹á?·á??á??á?¹á??"
@@ -130,18 +121,18 @@ msgstr ""
 #: 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 ""
 "á?¡á??á??á?¹á?? á??á?¼á??á?¹á??á??á?¹á?±á??á??á??á?½á?­ á?¡á?»á??á?¬á?¸á??á?°á??á?ºá?¬á?¸ á?¡á??á?¼á??á?¹ relays á??á?ºá?¬á?¸á?? mirror Tor's directory "
 "á?»á??á?³á??á?¯á??á?¹á??á?­á?¯á??á?½á?ºá??á?¹ <i>Mirror the Relay Directory</i> box á??á?­á?¯ check á??á?¯á??á?¹á??á?«á?? "
 "á?¡á??á??á?¹á?? bandwidth á??á?ºá?¬á?¸á??á?ºá?¬á?¸á??á?¬á?¸á??á?¬á?¸ á??á??á?½á?­á??á?°á?¸á??á?­á?¯á??á??á?¹á?±á??á?¬á?· á??boxá??á?­á?¯ uncheck á??á?¯á??á?¹á??á?«á?? "
 "á?¡á??á??á?¹á?? relay directory á??á?­á?¯ mirror á?»á??á?³á??á?¯á??á?¹á??á?­á?¯á?? á??á?¶á?¯á?¸á?»á??á??á?¹á??á??á?¹á??á?­á?¯á??á??á?¹ á??á??á?¹á?¡á??á??á?¹á??á?¼á??á?¹ "
-"á??á??á?¹á?·á??á?¬á?¸á?±á??á?¬ <i>Relay port</i> á??á?½á??á?¹á?· <i>Directory Port</i> á??á?­á?¯á?? á??á?¼á?²á?»á??á?¬á?¸á?±á??á??á?«á?±á??á?? "
-"Bridge relay á?±á??á?¼á??á?¬ <i>á??á?»á??á??á?¹á??á?±á??</i> relay directory á??á?­á?¯ mirror á?»á??á?³á??á?¯á??á?¹á??á?­á?¯á?? "
+"á??á??á?¹á?·á??á?¬á?¸á?±á??á?¬ <i>Relay port</i> á??á?½á??á?¹á?· <i>Directory Port</i> á??á?­á?¯á?? á??á?¼á?²á?»á??á?¬á?¸á?±á??á??á?«á?±á??á??"
+" Bridge relay á?±á??á?¼á??á?¬ <i>á??á?»á??á??á?¹á??á?±á??</i> relay directory á??á?­á?¯ mirror á?»á??á?³á??á?¯á??á?¹á??á?­á?¯á?? "
 "á??á?­á?¯á??á?«á??á??á?¹á??"
 
 #. type: Content of: <html><body>
@@ -159,8 +150,8 @@ msgstr "Bandwidth á??á??á?¹á??á??á??á?¹á??á?ºá??á?¹á??á?ºá?¬á?¸"
 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 ""
 "Tor relay á??á?­á?¯ run á?»á??á??á?¹á?¸á??á??á?¹ bandwidth á?? á?¾á??á?®á?¸á??á?¬á?±á??á?¬ á??á??á?¬á??á??á?­á?¯ á??á?¯á??á?¹á?±á??á??á?«á??á??á?¹á?? "
 "á??á??á?¹á??á?­á?¯á??á?²á?»á??á??á?¹á?»á??á??á?¹ Tor á??á?¬ á??á??á?¹ Tor network á??á?­á?¯ á??á?°á?¸á?±á??á?«á??á?¹á?¸á??á?«á??á??á?¹á??á?ºá??á?¹á?±á??á?¬ "
@@ -188,11 +179,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 ""
@@ -201,8 +192,8 @@ msgstr ""
 "á?¡á?±á??á?¬á??á?¼á??á?¹á?¸ á?±á??á?¬á??á?¹á?¸á??á?­á?¯á??á??á??á?ºá?¬á?¸á??á?­á?¯ á?»á??á??á?¹á?·á??á??á?¹á?¸á?±á??á?¸á??á??á?¹ á?¡á??á?¼á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹á?? á??á?­á?¯á??á?±á??á?¬á?¹ "
 "á??á?¬á??á??á?½á??á?¹á??á?ºá?¬á?¸á??á?¼á??á?¹ á??á?ºá??á?¹á?¸á??á?½á?ºá??á??á??á?¹á?¸á??á?­á?¯ á?»á??á?³á?»á??á??á?¹á?±á??á??á?² á?»á??á??á?¹á??á??á?¹á?? á?¡á??á??á?¹á?? á??á?ºá??á?¹á?¸á??á?½á?ºá??á??á?¹ "
 "á?±á??á?¬á??á?¹á??á?ºá?»á??á?®á?¸ á??á?±á??á?¬á??á?¹á??á?²á?·á??á?°á?¸á??á?­á?¯á??á?½á?ºá??á?¹ peak times á?¡á?±á??á?¬á?¡á??á?¼á??á?¹á?¸ "
-"á??á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?¸á?¡á??á?ºá?¬á?¸á?»á??á?¬á?¸á??á?­á?¯ á??á?¼á??á?¹á?·á?»á??á?³á?±á??á??á?ºá?­á??á?¹á??á?½á?¬á??á?² á??á?­á??á?¹á?·á?±á??á?¬ á??á?ºá??á?¹á?¸á??á?½á?ºá??á??á??á?¹á?¸ á??á?«á?±á??á??á??á?¹á?· "
-"á?»á??á??á?¹á?·á?±á??á?¬ á?¡á?»á??á??á?¹á?·á??á?¶á?¯á?¸ á??á??á??á?¹á?¸á?±á??á?¼á??á?¬ á?±á??á??á?½á??á?¹á??á?¬á?? á??á?ºá??á?¹á?¸á??á?½á?ºá??á??á??á?¹á?¸ á?¡á??á?¼á??á?¹ á?¡á??á??á?¹á?»á??á?³á?±á??á?¸á??á?½á?¬ "
+"á??á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?¸á?¡á??á?ºá?¬á?¸á?»á??á?¬á?¸á??á?­á?¯ á??á?¼á??á?¹á?·á?»á??á?³á?±á??á??á?ºá?­á??á?¹á??á?½á?¬á??á?² á??á?­á??á?¹á?·á?±á??á?¬ á??á?ºá??á?¹á?¸á??á?½á?ºá??á??á??á?¹á?¸ á??á?«á?±á??á??á??á?¹á?·"
+" á?»á??á??á?¹á?·á?±á??á?¬ á?¡á?»á??á??á?¹á?·á??á?¶á?¯á?¸ á??á??á??á?¹á?¸á?±á??á?¼á??á?¬ á?±á??á??á?½á??á?¹á??á?¬á?? á??á?ºá??á?¹á?¸á??á?½á?ºá??á??á??á?¹á?¸ á?¡á??á?¼á??á?¹ á?¡á??á??á?¹á?»á??á?³á?±á??á?¸á??á?½á?¬ "
 "á?»á??á??á?¹á??á?«á??á??á?¹á?? á?¡á??á??á?¹á?? á??á??á?¹á?? á??á?ºá??á?¹á?¸á??á?½á?ºá??á??á??á?¹á?¸á??á??á?¹ <i>á?¡á?»á??á??á?¹á?·á??á?¶á?¯á?¸á??á??á??á?¹á?¸</i>á??á?½á??á?¹á?· "
 "á??á?°á??á?®á?±á??á??á?½á?ºá??á?¹ Tor á??á??á?¹ á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á??á?¹á?¸á??á??á?¹ á??á??á?¹á?±á??á?¬á?·á??á?½ á??á?­á?¯á??á?¼á??á?¹á??á?½á?¬ á??á??á?¯á??á?¹á??á?«á??á?°á?¸á?? "
 "á??á??á?¹á?? <i>á?¡á?»á??á??á?¹á?·á??á?¶á?¯á?¸á??á??á??á?¹á?¸</i> á??á??á?¹ á?¡á?»á??á?²á??á??á?¹á?¸ <i>á??á?ºá??á?¹á?¸á??á?½á?ºá??á??á??á?¹á?¸</i> á??á??á?¹ "
@@ -212,8 +203,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 ""
@@ -226,9 +217,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>."
@@ -261,12 +252,12 @@ msgid ""
 "as mail to prevent spam and some default file sharing ports to reduce abuse "
 "of the Tor network."
 msgstr ""
-"á??á?¼á??á?¹á??á?¶á?¯á??á?¼á??á?¹á??á??á?¹á?¸á??á?ºá?¬á?¸á??á??á?¹ á?¡á??á?¹á??á?¬á??á??á?¹á?±á??á??á?? á??á??á?¹á??á??á?¹á?· á?¡á??á??á?¹á?¸á?»á??á??á?¹á?¡á??á?ºá?­á?³á?¸á?¡á??á?¬á?¸ á??á?­á?¯ á??á??á?¹á?· Tor "
-"relay á??á?½ á?¡á?»á??á?¬á?¸á?±á??á?¬ Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?°á??á?ºá?¬á?¸ á??á??á?°á??á?¼á??á?¹á?·á?»á??á?³á??á??á?¹ á??á??á?¹á??á?½á??á?¹á?±á??á?¸á?±á??á?¬ "
+"á??á?¼á??á?¹á??á?¶á?¯á??á?¼á??á?¹á??á??á?¹á?¸á??á?ºá?¬á?¸á??á??á?¹ á?¡á??á?¹á??á?¬á??á??á?¹á?±á??á??á?? á??á??á?¹á??á??á?¹á?· á?¡á??á??á?¹á?¸á?»á??á??á?¹á?¡á??á?ºá?­á?³á?¸á?¡á??á?¬á?¸ á??á?­á?¯ á??á??á?¹á?· Tor"
+" relay á??á?½ á?¡á?»á??á?¬á?¸á?±á??á?¬ Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?°á??á?ºá?¬á?¸ á??á??á?°á??á?¼á??á?¹á?·á?»á??á?³á??á??á?¹ á??á??á?¹á??á?½á??á?¹á?±á??á?¸á?±á??á?¬ "
 "á??á??á?¹á?¸á??á??á?¹á?¸á?»á??á??á?¹á??á??á?¹á?? Tor á?? á?¡á?»á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸á??á?­á?¯ á??á??á?¹á??á??á??á?¹á??á?¬á?¸á??á?²á?· "
 "á??á?½á?­á?±á??á?»á??á?®á?¸á??á?¬á?¸á??á?°á??á?«á??á??á?ºá?¬á?¸ á??á?¬á??á??á?¹á?¸ á??á?°á??á??á?¹á?¸á??á?­á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹á?? á?±á??á?¸á??á?¹á?? spam á??á?ºá?¬á?¸á??á?­á?¯ "
-"á??á?¬á??á?¼á??á?¹á??á??á?¹á??á?½á??á?¹á?· á?¡á??á?ºá?­á?³á??á?±á??á?¬ á??á?°á??á??á?¹á?¸ á??á?­á?¯á??á?¹á?±á??á??á?½á?ºá?»á??á??á?¹á?¸ ports á??á?ºá?¬á?¸á??á??á?¹ Tor á??á?¼á??á?¹á??á??á?¹á??á?­á?¯ "
-"á?±á??á?½á?¬á??á?¹á?·á??á?½á??á?¹á?»á??á??á?¹á?¸á??á?­á?¯ á?±á??á?½á?ºá?¬á?·á??á?ºá?±á??á?¸á??á??á?²á?·á??á?­á?¯á?? á?»á??á??á?¹á??á??á?¹á??"
+"á??á?¬á??á?¼á??á?¹á??á??á?¹á??á?½á??á?¹á?· á?¡á??á?ºá?­á?³á??á?±á??á?¬ á??á?°á??á??á?¹á?¸ á??á?­á?¯á??á?¹á?±á??á??á?½á?ºá?»á??á??á?¹á?¸ ports á??á?ºá?¬á?¸á??á??á?¹ Tor á??á?¼á??á?¹á??á??á?¹á??á?­á?¯"
+" á?±á??á?½á?¬á??á?¹á?·á??á?½á??á?¹á?»á??á??á?¹á?¸á??á?­á?¯ á?±á??á?½á?ºá?¬á?·á??á?ºá?±á??á?¸á??á??á?²á?·á??á?­á?¯á?? á?»á??á??á?¹á??á??á?¹á??"
 
 #. type: Content of: <html><body><p>
 #: en/server.html:121
@@ -293,13 +284,13 @@ 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 ""
 "á??á?­á?¯á??á?­á?¯á?»á??á??á?¹á?·á??á?¶á?¯á??á??á?¹á?¡á??á?¼á??á?¹ á??á?½á?­á?»á??á?®á?¸á??á?¬á?¸ á??á?°á??á?«á?? checkboxes á??á?ºá?¬á?¸ á??á??á?¹á??á?¯á??á?ºá??á?¹á?¸á??á?®á??á?­á?¯ "
 "á?±á?¡á?¬á??á?¹á?±á??á?¬á?¹á?»á??á??á?« á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ port á??á?¶á??á?«á??á?¹á??á?ºá?¬á?¸ á??á??á?¬á?¸á??á?¼á??á?¹ á??á?¬á?¸á??á??á?¹á?¸á??á?ºá?¬á?¸á?? "
-"á??á?­á?¯á??á?¹á??á?¬á?¸á?»á??á?³á??á?«á??á??á?¹á?? <b>á?±á??á?¬á?¹á?»á??á??á?ºá??á?¹</b> á?±á??á?¬á?¹á??á?¶á??á?¼á??á?¹ á?¡á??á??á?¹á?? á??á??á?¹á??á??á?¹á?±á??á?¬ box á??á?­á?¯ check "
-"á??á?¯á??á?¹á??á?²á?·á??á??á?¹á??á?­á?¯á??á?½á?ºá??á?¹ Tor clients á??á?ºá?¬á?¸á?? á?¡á??á??á?¹á?¸á?»á??á??á?¹á??á?ºá?¬á?¸á?? á??á??á?¹á?· relay á??á?­á?¯ á?»á??á??á?¹á?? "
+"á??á?­á?¯á??á?¹á??á?¬á?¸á?»á??á?³á??á?«á??á??á?¹á?? <b>á?±á??á?¬á?¹á?»á??á??á?ºá??á?¹</b> á?±á??á?¬á?¹á??á?¶á??á?¼á??á?¹ á?¡á??á??á?¹á?? á??á??á?¹á??á??á?¹á?±á??á?¬ box á??á?­á?¯ check"
+" á??á?¯á??á?¹á??á?²á?·á??á??á?¹á??á?­á?¯á??á?½á?ºá??á?¹ Tor clients á??á?ºá?¬á?¸á?? á?¡á??á??á?¹á?¸á?»á??á??á?¹á??á?ºá?¬á?¸á?? á??á??á?¹á?· relay á??á?­á?¯ á?»á??á??á?¹á?? "
 "á??á??á?°á??á??á?¹ á??á?¼á??á?¹á?·á?»á??á?³á??á?¬á??á?­á?¯ á?±á??á?¬á?¹á?»á??á?±á??á?¸á??á??á?¹ á?»á??á??á?¹á??á??á?¹á??"
 
 #. type: Content of: <html><body><table><tr><td>
@@ -374,8 +365,10 @@ msgstr "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:160
-msgid "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
-msgstr "Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgid ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
+msgstr ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:163
@@ -420,9 +413,9 @@ msgid ""
 msgstr ""
 "á?¡á??á??á?¹á?? á??á??á?¹á?· relay á??á?±á?? Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?°á??á?ºá?¬á?¸á?? Tor á??á?¼á??á?¹á??á??á?¹ á?»á??á??á?¹á??á??á??á?¹á??á?¼á??á?¹á??á?? "
 "á?»á??á?³á??á?¯á??á?¹á??á??á?¹á??á?­á?¯ á??á?¼á??á?¹á?·á??á?»á??á?³á??á?°á?¸á??á?­á?¯á??á?½á?ºá??á?¹ checkboxes á?±á??á?¼á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?­á?¯ uncheck "
-"á??á?¯á??á?¹á??á?­á?¯á??á?¹á??á?«á??á??á?¹á?? á??á??á?¹ checkboxes á??á?­á?¯ uncheck á??á?¯á??á?¹á??á?²á?·á??á??á?¹á?±á??á?¬á??á?¹ á??á??á?¹á?· relay á??á?¬ Tor "
-"á??á?¼á??á?¹á??á??á?¹á??á?­á?¯ á?¡á??á?ºá?­á?³á?¸á?»á??á?³á?±á??á?¡á?¶á?¯á?¸á??á?½á?¬á??á?«á?? á??á??á?¹á?· relayá??á??á?¹ á?¡á?»á??á?¬á?¸á?±á??á?¬ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?°á??á?ºá?¬á?¸á?? Tor "
-"á??á?¼á??á?¹á??á??á?¹á??á?­á?¯ á??á??á?¹á??á?¼á??á?¹á??á??á?¹ á??á?¼á??á?¹á?·á?»á??á?³á??á?­á??á?¹á?·á??á??á?¹ á?»á??á??á?¹á?»á??á?®á?¸ á?¡á?»á??á?¬á?¸ Tor relays á??á?ºá?¬á?¸á?¡á?¾á??á?¬á?¸ "
+"á??á?¯á??á?¹á??á?­á?¯á??á?¹á??á?«á??á??á?¹á?? á??á??á?¹ checkboxes á??á?­á?¯ uncheck á??á?¯á??á?¹á??á?²á?·á??á??á?¹á?±á??á?¬á??á?¹ á??á??á?¹á?· relay á??á?¬ Tor"
+" á??á?¼á??á?¹á??á??á?¹á??á?­á?¯ á?¡á??á?ºá?­á?³á?¸á?»á??á?³á?±á??á?¡á?¶á?¯á?¸á??á?½á?¬á??á?«á?? á??á??á?¹á?· relayá??á??á?¹ á?¡á?»á??á?¬á?¸á?±á??á?¬ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?°á??á?ºá?¬á?¸á?? Tor"
+" á??á?¼á??á?¹á??á??á?¹á??á?­á?¯ á??á??á?¹á??á?¼á??á?¹á??á??á?¹ á??á?¼á??á?¹á?·á?»á??á?³á??á?­á??á?¹á?·á??á??á?¹ á?»á??á??á?¹á?»á??á?®á?¸ á?¡á?»á??á?¬á?¸ Tor relays á??á?ºá?¬á?¸á?¡á?¾á??á?¬á?¸ "
 "relay á??á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?¸á??á?­á?¯á??á??á?¹á?¸ á??á?°á??á?®á?±á??á?¸á??á?­á??á?¹á?·á??á??á?¹ á?»á??á??á?¹á??á??á?¹á??"
 
 #. type: Content of: <html><body><p>
@@ -432,8 +425,8 @@ msgid ""
 "grayed out, since bridge relays do not allow exit connections. Bridges are "
 "only used by Tor clients to connect to the Tor network."
 msgstr ""
-"á?¡á??á??á?¹á?? bridge relay á??á?­á?¯ run á??á?­á?¯á?? á?±á??á?¼á?¸á??á?ºá??á?¹á??á?­á?¯á??á?¹á??á??á?¹á??á?­á?¯á??á??á?¹á??bridge relays á??á?ºá?¬á?¸á??á??á?¹ "
-"á??á?½á?­á?±á??á?±á??á?¬ á??á??á?¹á??á?¼á??á?¹á??á??á??á?ºá?¬á?¸á??á?­á?¯ á??á?¼á??á?¹á?·á??á?»á??á?³á??á?°á?¸ á??á?­á?¯á??á??á??á?¹á?¸á?? <i>Exit Policies</i> tab "
+"á?¡á??á??á?¹á?? bridge relay á??á?­á?¯ run á??á?­á?¯á?? á?±á??á?¼á?¸á??á?ºá??á?¹á??á?­á?¯á??á?¹á??á??á?¹á??á?­á?¯á??á??á?¹á??bridge relays á??á?ºá?¬á?¸á??á??á?¹"
+" á??á?½á?­á?±á??á?±á??á?¬ á??á??á?¹á??á?¼á??á?¹á??á??á??á?ºá?¬á?¸á??á?­á?¯ á??á?¼á??á?¹á?·á??á?»á??á?³á??á?°á?¸ á??á?­á?¯á??á??á??á?¹á?¸á?? <i>Exit Policies</i> tab "
 "á??á??á?¹ á??á?®á?¸á??á?­á?¯á?¸á?±á??á?¬á??á?¹á?±á?»á??á?¬á??á?¹á?¸á??á?¼á?¬á?¸á??á?­á??á?¹á?·á??á??á?¹á??   Tor á??á?¼á??á?¹á??á??á?¹á??á?­á?¯ Tor clients á??á?ºá?¬á?¸ "
 "á??á?ºá?­á??á?¹á??á??á?¹á??á?½á??á?¬ Bridges á??á?ºá?¬á?¸á??á?­á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?­á?¯á??á?¹á??á??á?¹á??"
 
@@ -451,19 +444,19 @@ msgstr "Port Forwarding"
 #: 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 ""
 "á??á?ºá?¬á?¸á??á?¼á?¬á?±á??á?¬ á?¡á?­á??á?¹á??á?¼á??á?¹á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?°á??á?ºá?¬á?¸á??á??á?¹ local á??á?¼á??á?¹á??á??á?¹á?±á??á??á??á?½á?­ á?±á?»á??á?¬á??á?¹á?»á??á?¬á?¸á??á?¼á?¬á?±á??á?¬ "
 "á??á?¼á??á?¹á?»á??á?´á??á?¬á??á?ºá?¬á?¸á??á?­á?¯ á??á?°á??á?®á?±á??á?¬ á?¡á??á?¹á??á?¬á??á??á?¹á??á??á?¹á??á?¼á??á?¹á??á??á?¡á?¬á?¸ á??á?½á?ºá?±á??á?±á??á?¸á??á??á?¹ "
 "á??á?¼á??á?¹á?·á?»á??á?³á?±á??á?¬<i>router</i> á??á?½á??á??á??á?¹á?· á?¡á??á?¹á??á?¬á??á??á?¹á??á?­á?¯ á??á?ºá?­á??á?¹á??á??á?¹á?¾á??á??á??á?¹á?? á?¡á??á?ºá?­á?³á??á?±á??á?¬ "
 "á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?°á??á?ºá?¬á?¸á??á??á?¹ á?¡á??á?¹á??á?¬á??á??á?¹á?±á??á??á??á?½á?­ á?¡á?»á??á?¬á?¸á?±á??á?¬ á??á?¼á??á?¹á?»á??á?´á??á?¬á??á?ºá?¬á?¸á??á?½ á??á??á?¹á?·á??á?¼á??á?¹á?»á??á?´á??á?¬á??á?­á?¯á?? "
 "á??á??á?¹á?±á??á?¬á??á?¹á??á?¬á??á??á?¹á?· á??á??á?¹á??á?¼á??á?¹á??á??á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?¹á??á?­á?¯á??á??á??á?¹á?· <i>firewall</i> á?? "
-"á?¡á?±á??á?¬á??á?¹á??á?¼á??á?¹á??á??á?¹á?¸ á??á?½á?­á?±á??á??á??á?¹á??á??á?¹á?? á?¡á??á??á?¹á?? Tor relay á??á?­á?¯ run á??á?ºá??á?¹á??á??á?¹á??á?­á?¯á??á?½á?ºá??á?¹ á?¡á?»á??á?¬á?¸á?±á??á?¬ "
-"Tor clients á??á?ºá?¬á?¸á??á?½á??á?¹á?· relays á??á?ºá?¬á?¸á??á??á?¹ á?¡á?­á??á?¹á??á?¶á?¯á?¸ router á??á?­á?¯á??á??á??á?¯á??á?¹ firewall "
+"á?¡á?±á??á?¬á??á?¹á??á?¼á??á?¹á??á??á?¹á?¸ á??á?½á?­á?±á??á??á??á?¹á??á??á?¹á?? á?¡á??á??á?¹á?? Tor relay á??á?­á?¯ run á??á?ºá??á?¹á??á??á?¹á??á?­á?¯á??á?½á?ºá??á?¹ á?¡á?»á??á?¬á?¸á?±á??á?¬"
+" Tor clients á??á?ºá?¬á?¸á??á?½á??á?¹á?· relays á??á?ºá?¬á?¸á??á??á?¹ á?¡á?­á??á?¹á??á?¶á?¯á?¸ router á??á?­á?¯á??á??á??á?¯á??á?¹ firewall "
 "á??á?­á?¯á?»á??á??á?¹á??  á??á??á?¹á?? relay á??á?­á?¯ á??á?ºá?­á??á?¹á??á??á?¹á??á??á?«á??á?­á??á?¹á?·á??á??á?¹á??"
 
 #. type: Content of: <html><body><p>
@@ -479,23 +472,23 @@ msgstr ""
 "forwarding</i>á??á?­á?¯ á?»á??á??á?¹á??á??á?¹á?»á??á??á?¹á?¸ á?¡á?¬á?¸á?»á??á??á?¹á?· á??á??á?¹á?? router á??á?­á?¯á??á??á??á?¯á??á?¹ firewall á??á??á?¹ "
 "á??á??á?¹á?·á??á?¼á??á?¹á?»á??á?´á??á?¬á??á?­á?¯ á?»á??á??á?¹á?? á??á??á?¹á??á??á?¹á?· ports á??á?ºá?¬á?¸á??á?­á?¯ á??á?¼á??á?¹á?·á?»á??á?³á??á??á??á?¹á??á?­á?¯á??á?¬ á??á?­á??á?½á?­á??á??á?¹ "
 "á??á?­á?¯á?¡á??á?¹á??á?«á??á??á?¹á?? Port forwarding á?»á??á??á?¹á??á??á?¹á?»á??á??á?¹á?¸á??á??á?¹ á??á??á?¹á?? router á??á?­á?¯á??á??á??á?¯á??á?¹ firewall "
-"á?? á??á??á?¹á??á?¼á??á?¹á??á??á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?­á?¯ \"forward\" á?»á??á?³á??á?¯á??á?¹á??á??á?¹ á??á??á?¹á?? router á??á?­á?¯á??á??á??á?¯á??á?¹ firewall á?? "
-"á??á?¼á??á?¹á?»á??á?´á??á?¬á?±á??á??á??á?½á?­ local ports á??á?ºá?¬á?¸á??á?­á?¯ á??á??á?½á?­á??á??á?¹ á?¡á??á?¼á??á?¹ á?»á??á??á?¹á??á??á?¹á??"
+"á?? á??á??á?¹á??á?¼á??á?¹á??á??á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?­á?¯ \"forward\" á?»á??á?³á??á?¯á??á?¹á??á??á?¹ á??á??á?¹á?? router á??á?­á?¯á??á??á??á?¯á??á?¹ firewall "
+"á?? á??á?¼á??á?¹á?»á??á?´á??á?¬á?±á??á??á??á?½á?­ local ports á??á?ºá?¬á?¸á??á?­á?¯ á??á??á?½á?­á??á??á?¹ á?¡á??á?¼á??á?¹ á?»á??á??á?¹á??á??á?¹á??"
 
 #. type: Content of: <html><body><p>
 #: 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."
 msgstr ""
 "<i>port forwarding á?»á??á?³á??á?¯á??á?¹á??á??á?¹á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹ á?»á??á??á?¹á??á??á?¹á??á??á?¹ á?¾á??á?­á?³á?¸á??á?¬á?¸á?»á??á??á?¹á?¸</i> label "
 "á??á??á?¹á??á?¬á?¸á?±á??á?¬ box á??á?­á?¯ check á??á?¯á??á?¹á??á?²á?·á??á?½á?ºá??á?¹ á??á??á?¹á?? local á??á?¼á??á?¹á??á??á?¹ á??á??á?¹á??á?¼á??á?¹á??á??á??á?¼á??á?¹ "
-"Vidalia á??á??á?¹ á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹ port forwarding á?»á??á?³á??á?¯á??á?¹á??á??á?¹á?¡á??á?¼á??á?¹ á?»á??á??á?¹á??á??á?¹á??á?­á?¯á?? á?¾á??á?­á?³á?¸á??á?¬á?¸ "
-"á?±á??á?¸á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? á??á?­á?¯á??á?±á?¾á??á?¬á??á?¹á?· á??á??á?¹á?»á??á?¬á?¸ Tor clients á??á?ºá?¬á?¸á??á?¬ á??á??á?¹á?· relay á??á?­á?¯ "
+"Vidalia á??á??á?¹ á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹ port forwarding á?»á??á?³á??á?¯á??á?¹á??á??á?¹á?¡á??á?¼á??á?¹ á?»á??á??á?¹á??á??á?¹á??á?­á?¯á?? á?¾á??á?­á?³á?¸á??á?¬á?¸"
+" á?±á??á?¸á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? á??á?­á?¯á??á?±á?¾á??á?¬á??á?¹á?· á??á??á?¹á?»á??á?¬á?¸ Tor clients á??á?ºá?¬á?¸á??á?¬ á??á??á?¹á?· relay á??á?­á?¯ "
 "á??á??á?¹á??á?¼á??á?¹á??á?¯á?­á??á?¹á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? routers á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?±á??á?¬á?· á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹ port forwarding "
 "á?»á??á?³á??á?¯á??á?¹á?»á??á??á?¹á?¸á??á?­á?¯ á?¡á?±á??á?¬á??á?¹á??á?°á?±á??á?¸á??á?½á?¬ á??á??á?¯á??á?¹á??á?«á??á?°á?¸á??Vidalia á??á??á?¹ port forwarding á??á?­á?¯ "
 "á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹ set up á?»á??á?³á??á?¯á??á?¹á??á?²á?·á??á?½á?ºá??á?¹ <i>Test</i> button á?? á?±á??á?¸á??á?½á?­ checkbox á??á?­á?¯ "
@@ -511,8 +504,8 @@ 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/\";>http://192.168.0.1</a> or <a "
-"href=\"http://192.168.1.1/\";>http://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/\";>http://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
 "<i>Test</i> butons á??á??á?¹ port forwarding á??á?­á?¯ set up á?»á??á?³á??á?¯á??á?¹á??á??á?¹á?¡á??á?¼á??á?¹ Vidalia "
 "á??á??á?¹ unable á?»á??á??á?¹á?±á??á??á??á?¹á??á?­á?¯ á??á?½á?¬á?±á??á?¼á?±á??á?¼á??á??á?½á?­á??á?²á?·á??á?½á?ºá??á?¹ router á??á?½á?­ á?? feature á??á?¯á?­ "
@@ -531,8 +524,8 @@ msgstr ""
 #: 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\";> "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" 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 "
@@ -540,14 +533,16 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
-"port forwarding á??á?­á?¯ manual á?¡á?¬á?¸á?»á??á??á?¹á?· set up á??á?¯á??á?¹á??á?­á?¯á?? á??á?­á?¯á?¡á??á?¹á??á?²á?·á??á?½á?ºá??á?¹ <a href=\""
-"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";> "
-"portforward.com</a> á??á??á?¹á??á?¹á??á?­á?¯á??á?¹á??á?¼á??á?¹ routers á??á?½á??á?¹á?· firewalls á?¡á??á?ºá?­á?³á?¸á??á?¶á?¯á?¡á??á?¼á??á?¹ "
+"port forwarding á??á?­á?¯ manual á?¡á?¬á?¸á?»á??á??á?¹á?· set up á??á?¯á??á?¹á??á?­á?¯á?? á??á?­á?¯á?¡á??á?¹á??á?²á?·á??á?½á?ºá??á?¹ <a "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" portforward.com</a> á??á??á?¹á??á?¹á??á?­á?¯á??á?¹á??á?¼á??á?¹ routers á??á?½á??á?¹á?· firewalls á?¡á??á?ºá?­á?³á?¸á??á?¶á?¯á?¡á??á?¼á??á?¹ "
 "port forwarding á??á?­á?¯ á??á??á?¹á??á?­á?¯á?? set up á?»á??á?³á??á?¯á??á?¹á??á??á??á?¹á??á?­á?¯á?±á??á?¬ á??á??á?¹á?¸á??á??á??á?¹á??á?ºá??á?¹á??á?ºá?¬á?¸ "
 "á??á?½á?­á??á?«á??á??á?¹á?? á?¡á??á?­á??á?¹á?·á??á?¶á?¯á?¸á?¡á?±á??á??á?½á??á?¹á?· á?¡á?»á??á?¬á?¸á?±á??á?¬ Windows á??á?½á??á?¹á?· 9001 operating systems "
 "á??á?ºá?¬á?¸á??á?¼á??á?¹ á??á?°á??á??á?¹á?¸á??á??á?¹á??á?­á?¯á?¸ port 443 á?»á??á??á?¹á?±á??á?±á??á?¬<i>Relay Port</i> á??á?­á?¯ forward "
 "á?»á??á?³á??á?¯á??á?¹á?±á??á?¸á??á?­á?¯á?? á??á?­á?¯á?¡á??á?¹á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? <i>Mirror the relay directory</i> label "
 "á??á??á?¹á??á?¬á?¸á?±á??á?¬ checkbox á??á?­á?¯ check á??á?¯á??á?¹á?»á??á?®á?¸á?»á??á?® á??á?­á?¯á??á?½á?ºá??á?¹ <i>Directory "
 "Port</i>á??á?­á?¯á??á??á?¹á?¸ forward á?»á??á?³á??á?¯á??á?¹á?±á??á?¸á??á?­á?¯á?? á??á?­á?¯á?¡á??á?¹á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? <i>Directory "
-"Port</i> á??á??á?¹ opreating systems á??á?ºá?¬á?¸á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?¼á??á?¹ á??á?°á??á??á?¹á?¸á??á??á?¹á??á?­á?¯á?¸ port 9030 á?¡á?»á??á??á?¹ "
-"á??á?½á?­á?±á??á??á?½á?¬á??á?«á??"
+"Port</i> á??á??á?¹ opreating systems á??á?ºá?¬á?¸á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?¼á??á?¹ á??á?°á??á??á?¹á?¸á??á??á?¹á??á?­á?¯á?¸ port 9030 á?¡á?»á??á??á?¹"
+" á??á?½á?­á?±á??á??á?½á?¬á??á?«á??"
+
+
diff --git a/my/services.po b/my/services.po
index c46fe5e..2d26034 100644
--- a/my/services.po
+++ b/my/services.po
@@ -1,28 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -38,10 +29,10 @@ msgid ""
 "goes wrong. If you find bugs or have comments on this new feature, please "
 "let us know! We need your feedback.  <a name=\"about\"/>"
 msgstr ""
-"á??á??á?­á?»á??á?³á??á??á?¹á?? Vidalia á??á?½á?­ Hidden service á?¡á??á?¼á??á?¹ á?±á??á?¬á??á?¹á??á?¶á?·á??á??á??á??á?¹ á?¡á??á??á?¹á?»á??á??á?¹á??á?«á??á??á?¹á?? bug "
-"á??á?ºá?¬á?¸á??á??á?¹á?¸á??á?½á?­á?±á??á??á?­á?¯á??á?¹á?¿á??á?®á?¸ á??á??á?¹á?? hidden service configuration á??á?­á?¯á??á??á?¹á?¸ "
-"á?¡á?±á??á?½á?¬á??á?¹á?·á?¡á??á?½á??á?¹á?±á??á?¸á??á?­á?¯á??á?¹á??á??á?¹á?? á??á?­á?¯á??á?±á?¾á??á?¬á??á?¹á?· á??á?­á?¯á??á??á?¯á??á?²á??á?­á?¯ á??á?¶á?¯á?±á?¡á?¬á?¡á?¬á?¸á??á??á?­á?¯á?¸á??á?«á??á?½á??á?¹á?·á?? bug "
-"á??á?­á?¯á??á??á??á?¯á??á?¹ feature á?¡á??á??á?¹á?¡á??á?¼á??á?¹ á??á?½á??á?¹á??á?ºá??á?¹á??á?½á?­á??á?«á?? á?¡á??á?­á?±á??á?¸á??á?«á?? <a name=\"about\"/>"
+"á??á??á?­á?»á??á?³á??á??á?¹á?? Vidalia á??á?½á?­ Hidden service á?¡á??á?¼á??á?¹ á?±á??á?¬á??á?¹á??á?¶á?·á??á??á??á??á?¹ á?¡á??á??á?¹á?»á??á??á?¹á??á?«á??á??á?¹á?? bug"
+" á??á?ºá?¬á?¸á??á??á?¹á?¸á??á?½á?­á?±á??á??á?­á?¯á??á?¹á?¿á??á?®á?¸ á??á??á?¹á?? hidden service configuration á??á?­á?¯á??á??á?¹á?¸ "
+"á?¡á?±á??á?½á?¬á??á?¹á?·á?¡á??á?½á??á?¹á?±á??á?¸á??á?­á?¯á??á?¹á??á??á?¹á?? á??á?­á?¯á??á?±á?¾á??á?¬á??á?¹á?· á??á?­á?¯á??á??á?¯á??á?²á??á?­á?¯ á??á?¶á?¯á?±á?¡á?¬á?¡á?¬á?¸á??á??á?­á?¯á?¸á??á?«á??á?½á??á?¹á?·á?? bug"
+" á??á?­á?¯á??á??á??á?¯á??á?¹ feature á?¡á??á??á?¹á?¡á??á?¼á??á?¹ á??á?½á??á?¹á??á?ºá??á?¹á??á?½á?­á??á?«á?? á?¡á??á?­á?±á??á?¸á??á?«á?? <a name=\"about\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:26
@@ -108,9 +99,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 ""
 "Tor website (https://www.torproject.org/docs/tor-hidden-service.html)á??á?¼á??á?¹ "
 "á?¡á?±á??á?¸á??á?­á??á?¹á??á?­á?¯ á?¡á??á??á?¹á?·á??á?­á?¯á??á?¹á?»á??á??á?¬á?¸á?±á??á?¬ tutorial á?±á??á?¬á??á?¹á?¸á??á?ºá?¬á?¸á??á?½á?­á??á?«á??á??á?¹á?? "
@@ -137,17 +127,17 @@ 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 ""
 "Onion á??á?­á??á?¹á??á?¬ (á?±á??á?¬á?¹á?»á??á?»á??á?®á?¸): Tor á??á??á?¹ á??á??á?¹á?·á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?­á?¯ á?±á??á?¼á?¸á??á?¯á??á?¹á?»á??á??á?¹á?¸á?¡á?¬á?¸á?»á??á??á?¹á?· "
 "á??á??á?¹á?±á??á?¬á??á?¹á??á?? (á??á?­á?¯á??á??á??á?¯á??á?¹ onion) á??á?­á??á?¹á??á?¬á??á?­á?¯ á?±á??á?¬á?¹á?»á??á?±á??á?¸á??á?«á??á??á?¹á?? á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?­á?¯ "
-"á??á??á?°á??á?­á?¯á??á?¹á?±á??á?¬ á??á?°á?±á??á?¼á??á?­á?¯ onion á??á?­á??á?¹á??á?¬á??á?­á?¯ á?±á??á?¸á??á?«á?? \"Copy to clipboard\" button á??á?­á?¯ "
-"typos á?¡á?¬á?¸ á?±á??á?½á?¬á??á?¹á?¾á??á?¥á?¹á??á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?­á?¯á??á?¹á??á??á?¹á?? á?¡á??á??á?¹á?? á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?­á?¯ "
+"á??á??á?°á??á?­á?¯á??á?¹á?±á??á?¬ á??á?°á?±á??á?¼á??á?­á?¯ onion á??á?­á??á?¹á??á?¬á??á?­á?¯ á?±á??á?¸á??á?«á?? \"Copy to clipboard\" button á??á?­á?¯"
+" typos á?¡á?¬á?¸ á?±á??á?½á?¬á??á?¹á?¾á??á?¥á?¹á??á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?­á?¯á??á?¹á??á??á?¹á?? á?¡á??á??á?¹á?? á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?­á?¯ "
 "á??á??á?¹á??á?®á?¸á?»á??á?®á?¸á??á?¼á?¬á?¸á??á?²á?·á??á?½á?ºá??á?¹ \"[Created by Tor]\" á??á?­á?¯á?? á?±á?»á??á?¬á??á?­á??á?¹á?·á??á??á?¹á?? onion á??á?­á??á?¹á??á?¬ "
 "á?¡á??á??á?¹á??á?½á??á?¹á??á?­á?¯ á?»á??á??á??á??á?¹ á?¡á??á?­á?¯á??á??á?½á?¬ á??á??á?¹á?· á?»á??á??á?¹á??á??á?¹á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?¹á?¸á??á?¬á?¸á??á??á?¹ á??á?­á?¯á?¡á??á?¹á?»á??á?®á?¸ "
 "setting á??á?ºá?¬á?¸á?? window á??á?­á?¯ á?»á??á??á?¹á??á?¼á??á?¹á?·á?? á??á?­á?¯á?¡á??á?¹á??á??á?¹ á?»á??á??á?¹á??á??á?¹á??"
@@ -155,8 +145,8 @@ 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."
@@ -178,8 +168,8 @@ msgid ""
 "specify any target, Tor will redirect requests to the port specified in "
 "\"Virtual Port\" on localhost."
 msgstr ""
-"Target (optional): \"Virtual Port\" á??á?²á??á?½á?­ á??á??á?¹á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á??á??á?¹á?· á??á??á?¹á??á?¯á??á??á?¹ á??á??á?°á??á?®á?±á??á?¬ "
-"port á?±á??á??á??á?½á?­ localhost á??á?­á?¯ Tor á??á?®á??á?½ relay á??á??á?¹á??á?¼á??á?¹á??á?? request "
+"Target (optional): \"Virtual Port\" á??á?²á??á?½á?­ á??á??á?¹á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á??á??á?¹á?· á??á??á?¹á??á?¯á??á??á?¹ "
+"á??á??á?°á??á?®á?±á??á?¬ port á?±á??á??á??á?½á?­ localhost á??á?­á?¯ Tor á??á?®á??á?½ relay á??á??á?¹á??á?¼á??á?¹á??á?? request "
 "á??á?¶á?¯á??á?½á??á?¹á?»á??á?³á??á?¯á??á?¹á??á?­á??á?¹á?·á??á??á?¹á?? á??á?­á?¯á??á?±á?¾á??á?¬á??á?¹á?· á?¥á?®á?¸á??á??á?¹á??á?ºá??á?¹á??á?«á??á??á?¹á?±á??á?¬ physical á??á?­á??á?¹á??á?¬á??á?­á?¯ "
 "á??á??á?¹á??á??á?¹á??á?½á??á?¹á??á?­á?¯á??á?¹á?»á??á?®á?¸ port á??á?®á??á?½ á??á??á?¹á?·á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?®á??á?­á?¯á?? redirect "
 "á?»á??á?³á??á?¯á??á?¹á??á??á?¹ request á??á?¯á??á?¹á??á?­á?¯á??á?¹á??á??á?¹á?? á?¥á??á??á?¬ localhost:5222 á??á?­á?¯á?? (á??á?­á?¯á??á??á??á?¯á??á?¹ port "
@@ -222,14 +212,14 @@ 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 ""
 "Enabled: á?¡á??á??á?¹á?? checkbox á??á?­á?¯ disable á??á?¯á??á?¹á??á?¬á?¸á??á?½á?ºá??á?¹ Vidalia á??á??á?¹ Tor á??á?²á??á?½á?­ "
 "á??á?½á??á?¹á??á?¬á?¸á??á??á?¹á?· á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?­á?¯ á??á?»á??á??á?¹á??á??á?¹á??á?­á?¯á??á?¹á??á?«á?? á??á??á??á?¹ á??á??á?¹á??á?½á?­á?¡á??á?¶á?¯á?¸á??á??á?­á?¯á?±á??á?¬ "
-"á??á??á?¹á?±á??á?¬á??á?¹á??á??á?? á?»á??á??á?¹á??á??á?¹á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?¹á?¸á??á?¬á?¸ á?»á??á??á?¹á?¸á?¡á?¬á?¸á?»á??á??á?¹á?· á?±á??á?¬á??á?¹á??á?­á?¯á??á?¹á?¸á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹ "
-"á?¡á??á?¶á?¯á?¸á??á??á?¹á??á?­á?¯á??á?¹á??á??á?¹á?? enable á??á??á?¯á??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸ á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?­á?¯ "
+"á??á??á?¹á?±á??á?¬á??á?¹á??á??á?? á?»á??á??á?¹á??á??á?¹á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?¹á?¸á??á?¬á?¸ á?»á??á??á?¹á?¸á?¡á?¬á?¸á?»á??á??á?¹á?· á?±á??á?¬á??á?¹á??á?­á?¯á??á?¹á?¸á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹"
+" á?¡á??á?¶á?¯á?¸á??á??á?¹á??á?­á?¯á??á?¹á??á??á?¹á?? enable á??á??á?¯á??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸ á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?­á?¯ "
 "á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ Vidalia á?»á??á??á?¹á??á??á?¹á??á?ºá??á?¹ á??á?­á?¯á??á?¹ vidalia.conf á??á?²á??á?¼á??á?¹ á??á?­á??á?¹á?¸á??á?¬á?¸á??á??á?¹á??"
 
 #. type: Content of: <html><body>
@@ -251,8 +241,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 ""
 "á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸á??á?­á?¯á?»á??á?³á??á?¹á?»á??á??á?¹á?¸: á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á?? á?»á??á??á?¹á??á??á?¹á?»á??á??á?¹á?¸á??á?ºá?¬á?¸á??á?­á?¯ á??á?¬á??á?? "
 "á?»á??á?³á??á?¹á??á??á?¹á??á??á?¹á?? (á?¡á??á??á?¹á?? á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?­á?¯ á??á?¬á??á?®á?»á??á?³á??á?¹á??á?ºá??á?¹á??á?½á?ºá??á?¹ enable á??á?¯á??á?¹á??á?¬á?¸á?»á??á?®á?¸á??á?¬á?¸ "
@@ -285,8 +275,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 ""
 "Tor á??á??á?¹ á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?ºá?¬á?¸ á?¡á??á?¼á??á?¹ á??á??á?¹á??á?½á??á?¹á??á?¬á?¸á?±á??á?¬ setting á??á?ºá?¬á?¸á??á?­á?¯ "
@@ -299,9 +289,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 ""
 "á??á??á?¹á??á?­á?¯á??á?²á?»á??á??á?¹á?»á??á??á?¹ á??á?½á?¼á??á?¯á?¹á??á?¹á??á?­á?¯á??á??á??á?¹ á??á?¶á?¯ setting á??á?ºá?¬á?¸á??á?­á?¯á??á?¬ á?±á??á?¬á??á?¹á??á?¶á?·á?±á??á?¸á??á??á?¹ á??á?½á??á?¹á?· "
 "Vidalia á??á?²á??á?½á?­ á?¡á??á?¬á??á?ºá?¬á?¸á??á?­á?¯ á??á??á?¹á??á?½á??á?¹á??á??á?¹ á??á?¶á?¯á?¸á?»á??á??á?¹á??á?²á?·á??á?«á??á??á?¹á?? á?¡á??á??á?¹á?? á?¡á??á??á?¹á?·á?»á??á??á?¹á?· "
@@ -334,3 +324,5 @@ msgstr ""
 "(á??á?­á?¯á??á??á??á?¯á??á?¹ web á??á??á?¹á?±á??á?¬á??á?¹á??á?? á??á??á?¯á??á?¹á??á?½á?ºá??á?¹ á??á??á?¹á?·á?±á??á?½á?ºá?¬á?¹á?±á??á?¬ client application "
 "á??á?­á?¯á??á?¶á?¯á?¸á??á?«)á?? á??á?ºá??á?¹á??á?¬á??á?­á?¯ Tor á?? á?»á??á?³á??á?¯á??á?¹á?±á??á?¸á??á?«á??á??á?¹á?? á?¡á?²á?·á??á?­á?¡á??á?¼á??á?¹ Tor á??á?­á?¯ á?¡á?±á??á?¼á??á?°á?¸ "
 "á?»á??á??á?¹á??á??á?¹á??á??á?¹ á??á??á?­á?¯á?¡á??á?¹á??á?«á?? "
+
+
diff --git a/my/troubleshooting.po b/my/troubleshooting.po
index 25679c1..4490ce5 100644
--- a/my/troubleshooting.po
+++ b/my/troubleshooting.po
@@ -1,28 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 # type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -52,8 +43,8 @@ msgstr "Tor á??á?­á?¯ á??á??á??á??á?¹á??á?­á?¯á??á?¹á??á?«á??"
 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 ""
 "Vidalia á??á??á?¹ Tor á??á?­á?¯ á??á??á??á??á?¹á??á?­á?¯á??á?¹á??á??á?¹á?· á?¡á?±á?¾á??á?¬á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ Tor installation "
 "á??á??á?¹á?¸á?±á?¾á??á?¬á??á?¹á?¸á?¡á??á?½á?¬á?¸ á??á?²á??á?­á?¯ á??á?¼á?¬á?¸á??á?½á?¬á?±á??á?¼á?±á??á?? á?»á??á??á?¹á??á??á?¹á?? <a "
@@ -65,8 +56,8 @@ msgstr ""
 #: 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 ""
 "á?¡á?»á??á?¬á?¸á?»á??á??á?¹á??á?­á?¯á??á?¹á?±á?»á??á??á?½á?­á??á??á?¹á?· á?¡á?±á?¾á??á?¬á??á?¹á?¸á??á??á?¹á?¸á??á?½á?¬ á?¡á?»á??á?¬á?¸ Tor process á??á??á?¹ run "
 "á??á?½á??á?¹á?·á?±á??á?»á??á?®á?¸ á?»á??á??á?¹á?? Tor á??á??á??á??á?¹á??á?­á?¯á??á?¹á?»á??á??á?¹á?¸ á?»á??á??á?¹á??á??á?¹á?? á?¡á??á??á?¹á?? á??á??á?¹á??á?½á?¬á?±á??á?¼á?±á??á?¼á??á??á?²á?·á??á?½á?ºá??á?¹ "
@@ -76,8 +67,8 @@ 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 ""
 "á?¡á??á??á?¹á?? á??á??á??á?¹ á?¡á??á?°á??á?®á??á??á??á?°á?¸á??á?­á?¯á??á?½á?ºá??á?¹ á?¡á??á??á?¹á?? á??á??á??á?¹á??á??á?¹ á?¾á??á?­á?³á?¸á??á?¬á?¸á??á?²á?·á?¡á??á?ºá?­á??á?¹á??á?½á?¬ "
@@ -96,7 +87,8 @@ msgstr "Tor á??á?­á?¯ Vidalia á??á??á?¹á??á?¼á??á?¹á?? á??á??á??á?«á??"
 
 # 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 ""
 "Tor á?? <i>á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á?? port</i>á??á?½á??á??á??á?¹á?· á??á??á?¹á??á?¼á??á?¹á?»á??á??á?¹á?¸á?¡á?¬á?¸á?»á??á??á?¹á?· Vidalia á??á??á?¹ Tor "
 "á??á?­á?¯ á??á?¼á??á?¹á??á?²á??á?­á?¯á??á?¹á??á??á?¹á??"
@@ -110,8 +102,8 @@ msgid ""
 "while it started."
 msgstr ""
 "á?¡á??á?ºá?¬á?¸á?¡á?¬á?¸á?»á??á??á?¹á?· á??á?°á??á?®á?±á??á?¬ á?¡á?±á?¾á??á?¬á??á?¹á?¸á??á??á?¹á?¸á??á?½á?¬ Tor á??á??á??á?¹á?±á??á?? Vidalia á??á??á?¹ Tor á??á?­á?¯ "
-"á??á??á?ºá?­á??á?¹á??á??á?¹á??á?­á?¯á??á?¹á?»á??á??á?¹á?¸ á?»á??á??á?¹á??á??á?¹á?? á??á?­á?¯á??á?±á??á?¬á?¹ á?¡á??á?½á?¬á?¸á?¡á??á?¼á??á?¹á?¸ á?¾á??á?¶á?³á?»á??á?®á?¸ á??á?¯á??á?¹á??á??á??á?¹ á??á?¼á??á?¹á??á?¼á?¬á?¸ "
-"á??á?­á??á?¹á?·á??á??á?¹á?? á??á??á??á?¹á??á?²á?·á?¡á??á?ºá?­á??á?¹á??á?½á?¬ Tor á?? á?¡á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??á?¹á??á?¯á??á?¯á??á?­á?¯ á??á??á?¹á?»á??á??á?²á?·á??á?½á?ºá??á?¹ <a "
+"á??á??á?ºá?­á??á?¹á??á??á?¹á??á?­á?¯á??á?¹á?»á??á??á?¹á?¸ á?»á??á??á?¹á??á??á?¹á?? á??á?­á?¯á??á?±á??á?¬á?¹ á?¡á??á?½á?¬á?¸á?¡á??á?¼á??á?¹á?¸ á?¾á??á?¶á?³á?»á??á?®á?¸ á??á?¯á??á?¹á??á??á??á?¹ á??á?¼á??á?¹á??á?¼á?¬á?¸"
+" á??á?­á??á?¹á?·á??á??á?¹á?? á??á??á??á?¹á??á?²á?·á?¡á??á?ºá?­á??á?¹á??á?½á?¬ Tor á?? á?¡á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??á?¹á??á?¯á??á?¯á??á?­á?¯ á??á??á?¹á?»á??á??á?²á?·á??á?½á?ºá??á?¹ <a "
 "href=\"log.html\">message log</a>á??á?­á?¯ á?±á??á?¼á??á?»á??á??á?¹á??á??á?¹ check á??á?¯á??á?¹á??á?«á??"
 
 # type: Content of: <html><body><p>
@@ -120,17 +112,17 @@ 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 ""
-"á?¡á??á??á?¹á?? Vidalia á?±á??á?½á?ºá?¬á?¹á??á?½á??á?¹á?¸á??á?¬á??á??á?¹ Tor á?? á??á??á?°á??á?®á?±á??á?¬ port á?±á??á?¼á?±á??á??á??á?½á?¬ á??á?¬á?¸á?±á??á?¬á??á?¹á?±á??á??á?½á?ºá??á?¹ "
-"Vidalia á?? Tor á??á??á?¹á??á?¼á??á?¹á??á??á??á?­á?¯ á?»á??á??á?¹á??á?ºá??á?­á?¯á??á?¹á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? á?? setting á??á?­á?¯ "
+"á?¡á??á??á?¹á?? Vidalia á?±á??á?½á?ºá?¬á?¹á??á?½á??á?¹á?¸á??á?¬á??á??á?¹ Tor á?? á??á??á?°á??á?®á?±á??á?¬ port á?±á??á?¼á?±á??á??á??á?½á?¬ á??á?¬á?¸á?±á??á?¬á??á?¹á?±á??á??á?½á?ºá??á?¹"
+" Vidalia á?? Tor á??á??á?¹á??á?¼á??á?¹á??á??á??á?­á?¯ á?»á??á??á?¹á??á?ºá??á?­á?¯á??á?¹á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? á?? setting á??á?­á?¯ "
 "á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?­á?¯á?? á??á?­á?¯á?¡á??á?¹á??á?½á?¬ á?»á??á??á?¹á??á?«á??á??á?¹á?? á??á?«á?±á??á??á??á?¹á?· á?¡á?»á??á?¬á?¸ á??á??á?¹á?±á??á?¬á??á?¹á??á?? á??á??á?¹á??á?¯á??á?¯á?? "
 "á??á??á?¹á?·á??á??á?¹á?±á??á??á??á?¼á??á?¹ run á?±á??á?? Tor á?? á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á?? port á??á?½á??á?¹á?· á??á??á?­á??á??á?¡ á?»á??á??á?¹á?±á??á??á?²á?·á??á?½á?ºá??á?¹ "
 "á??á??á?¹á?¡á?±á??á??á?½á??á?¹á?· á??á??á?°á??á?®á?±á??á?¬ port á??á??á?¹á??á?¯á??á?­á?¯ á??á??á?¹á??á?½á??á?¹á?±á??á?¸á??á?­á?¯á?? á??á?­á?¯á??á?«á??á?­á??á?¹á?·á??á??á?¹á?? Vidalia á?? "
-"<a href=\"config.html#advanced\">á?¡á??á??á?¹á?·á?»á??á??á?¹á?· á?»á??á??á?¹á??á??á?¹á??á?­á?¯á??á?¹á?±á??á?¬ settings</a>á??á?¼á??á?¹ "
-"á??á??á?­á?¯ á?»á??á??á?¹á??á??á?¹á??á?­á?¯á??á?¹á??á?«á??á??á?¹á??"
+"<a href=\"config.html#advanced\">á?¡á??á??á?¹á?·á?»á??á??á?¹á?· á?»á??á??á?¹á??á??á?¹á??á?­á?¯á??á?¹á?±á??á?¬ settings</a>á??á?¼á??á?¹"
+" á??á??á?­á?¯ á?»á??á??á?¹á??á??á?¹á??á?­á?¯á??á?¹á??á?«á??á??á?¹á??"
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:63
@@ -187,9 +179,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 ""
 "Vidalia á??á??á?¹ á??á?¯á??á?¹á??á??á??á?¹ á??á?ºá??á?¹á??á?¼á?¬á?¸ á?±á??á??á??á?¹á?· Tor á??á?¬ á?±á??á?¬á??á?¹á??á?¶á?¯á?¸ á??á?­á??á?²á?·á??á?²á?· á??á?ºá??á??á?¹á?¸ "
 "password á??á?½á??á?¹á?· á??á??á?¹á?»á??á?®á?¸ run á?±á??á??á?½á?¬á??á?«á?? Vidalia á??á?­á?¯ á?»á??á??á?¹á??á??á?¹á??á??á??á?¹á?»á??á?®á?¸á??á?²á?·á?¡á??á?« "
@@ -227,32 +219,33 @@ 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 ""
 "Tor á??á??á?¹á?±á??á?¬á??á?¹á??á??á?¡á?»á??á??á?¹ run á?»á??á?®á?¸á?»á??á?®á?»á??á??á?¹á??á?«á??á??á?¹á?? Tor á??á?­á?¯ á??á??á?¹á?±á??á?¬á??á?¹á??á??á?»á??á?³á??á?¯á??á?¹á??á??á?¹ run "
 "á??á?­á?¯á?? á?»á??á??á?¹á??á??á?¹á??á?ºá?­á??á?¹á??á?½á?¬ system boots á?»á??á?³á??á?¯á??á?¹á??á?ºá?­á??á?¹á?? á??á??á??á?¹á?±á??á?»á??á?® á?»á??á??á?¹á??á?«á??á??á?¹á?? á?¡á??á??á?¹á?? "
-"Vidalia á??á?­á?¯á?»á??á??á?¹á?? Tor á??á??á??á?¹á??á??á?¹ á??á??á?¹á?»á??á??á?¹á??á??á?¹á?»á??á?®á?¸á??á?²á?·á??á?½á?ºá??á?¹ á??á?ºá??á??á?¹á?¸ password á??á??á?¹á??á?¯á??á??á?¹ "
-"Tor á??á?²á??á?¼á??á?¹ á??á?­á??á?¹á?¸á?»á??á?®á?¸á?»á??á??á?¹á??á?«á??á??á?¹á?? á??á??á?¹ login á??á??á?¹á?»á??á?®á?¸ Vidalia á??á?­á?¯á??á??á??á?¹á??á?«á?? Vidalia "
-"á??á??á?¹ Tor run á??á?½á??á?¹á?·á?±á??á?»á??á?®á?¸ á??á?­á?¯á??á??á?¹á??á?­á?¯ á?±á?»á??á?¬á?»á??á??á??á?¹ á?¾á??á?­á?³á?¸á??á??á?¹á?¸á??á?«á??á?­á??á?¹á?·á??á??á?¹á??  Vidalia "
-"á??á??á?¹ á??á?ºá??á??á?¹á?¸ password á??á??á?¹á??á?¯á??á?­á?¯ á??á?¯á??á?¹á?±á??á?¸á??á?«á??á?­á??á?¹á?·á??á??á?¹ á??á?«á?±á??á??á??á?¹á?· Tor á??á??á?¹á?±á??á?¬á??á?¹á??á?? á??á?²á??á?½á?¬ "
-"á??á?­á??á?¹á?¸á??á?¬á?¸á??á?²á?· á??á??á?¹á??á?¯á??á?²á??á?±á??á?¬á?· á??á?¼á?²á?»á??á?¬á?¸á??á?«á??á??á?¹á??"
+"Vidalia á??á?­á?¯á?»á??á??á?¹á?? Tor á??á??á??á?¹á??á??á?¹ á??á??á?¹á?»á??á??á?¹á??á??á?¹á?»á??á?®á?¸á??á?²á?·á??á?½á?ºá??á?¹ á??á?ºá??á??á?¹á?¸ password á??á??á?¹á??á?¯á??á??á?¹"
+" Tor á??á?²á??á?¼á??á?¹ á??á?­á??á?¹á?¸á?»á??á?®á?¸á?»á??á??á?¹á??á?«á??á??á?¹á?? á??á??á?¹ login á??á??á?¹á?»á??á?®á?¸ Vidalia á??á?­á?¯á??á??á??á?¹á??á?«á?? Vidalia"
+" á??á??á?¹ Tor run á??á?½á??á?¹á?·á?±á??á?»á??á?®á?¸ á??á?­á?¯á??á??á?¹á??á?­á?¯ á?±á?»á??á?¬á?»á??á??á??á?¹ á?¾á??á?­á?³á?¸á??á??á?¹á?¸á??á?«á??á?­á??á?¹á?·á??á??á?¹á??  Vidalia "
+"á??á??á?¹ á??á?ºá??á??á?¹á?¸ password á??á??á?¹á??á?¯á??á?­á?¯ á??á?¯á??á?¹á?±á??á?¸á??á?«á??á?­á??á?¹á?·á??á??á?¹ á??á?«á?±á??á??á??á?¹á?· Tor á??á??á?¹á?±á??á?¬á??á?¹á??á?? á??á?²á??á?½á?¬"
+" á??á?­á??á?¹á?¸á??á?¬á?¸á??á?²á?· á??á??á?¹á??á?¯á??á?²á??á?±á??á?¬á?· á??á?¼á?²á?»á??á?¬á?¸á??á?«á??á??á?¹á??"
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:114
 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\";> "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
 "Tor á??á??á?¹á?±á??á?¬á??á?¹á??á?? á??á?»á??á?³á??á?¯á??á?¹á??á??á?¹ Tor á??á?­á?¯ á?»á??á??á?¹á??á??á?¹á?»á??á??á?¹á??á??á?¹á??á??á?¹ á??á?­á?¯á?¡á??á?¹á??á??á?¹á?? Tor "
 "á??á??á?¹á?±á??á?¬á??á?¹á??á??á??á?­á?¯ á??á??á?¹á??á?­á?¯á??á??á?¹á??á?¯á??á?¹á??á??á??á?¹ á??á?­á?¯á??á?²á?· á?¡á??á?ºá??á?¹á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ Tor wiki "
-"á??á?¬á??á?ºá??á?¹á??á?½á?¬á??á?¼á??á?¹ <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/To";
-"rFAQ#WinNTService\"> Tor á??á??á?¹á?±á??á?¬á??á?¹á??á??á?¡á?»á??á??á?¹</a> á??á??á?¹á??á??á??á?­á?¯á??á?¹á??á?«á??á??á?¹á??"
+"á??á?¬á??á?ºá??á?¹á??á?½á?¬á??á?¼á??á?¹ <a "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" Tor á??á??á?¹á?±á??á?¬á??á?¹á??á??á?¡á?»á??á??á?¹</a> á??á??á?¹á??á??á??á?­á?¯á??á?¹á??á?«á??á??á?¹á??"
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:122
@@ -267,10 +260,10 @@ msgstr "á??á?¯á??á?¹á??á??á??á?¹ Tor á??á?¼á??á?¹á??á?¼á?¬á?¸á??á?½á?ºá??á?¹"
 # 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 ""
 "á?¡á??á??á?¹á?? á??á??á??á?¹á?»á??á?®á?¸ á??á?¾á??á?¬á??á??á?¹á??á?½á?¬ á??á?¯á??á?¹á??á??á??á?¹ Tor á??á?¼á??á?¹á??á?¼á?¬á?¸á??á?½á?ºá??á?¹ á?¡á?»á??á?¬á?¸ Tor process á??á??á?¹ "
 "run á??á?½á??á?·á?¹á?±á??á?»á??á?®á?¸ á?»á??á??á?¹á?±á??á?¬á?±á?¾á??á?¬á??á?¹á?· á?»á??á??á?¹á??á??á?¹á?? á?¡á??á?«á?±á??á?¬á??á?¹ highlight á?»á??á??á?¬á?¸á?±á??á?¬ "
@@ -282,12 +275,10 @@ msgstr ""
 #: 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 ""
-"connection_create_listener(): 127.0.0.1:9050 á??á?­á?¯á??á?±á??á?«á??á?¹á?¸á??á?­á?¯á??á?¹á??á?«á??: "
-"á?¤á??á?­á??á?¹á??á?¬á??á??á?¹á?¡á??á?¶á?¯á?¸á??á?½á?ºá??á?¹á??á?½á?­á??á??á?¹á?? \n"
+"connection_create_listener(): 127.0.0.1:9050 á??á?­á?¯á??á?±á??á?«á??á?¹á?¸á??á?­á?¯á??á?¹á??á?«á??: á?¤á??á?­á??á?¹á??á?¬á??á??á?¹á?¡á??á?¶á?¯á?¸á??á?½á?ºá??á?¹á??á?½á?­á??á??á?¹á?? \n"
 "Tor á??á??á?¹ run á??á?½á??á?¹á?·á?±á??á?»á??á?®á??á?¬á?¸?\n"
 
 # type: Content of: <html><body><p>
@@ -300,17 +291,17 @@ msgid ""
 "process."
 msgstr ""
 "á?¡á??á??á?¹á?? á?¡á??á??á?¹á??á?«á??á?²á?·á??á?­á?¯á?? á?¡á??á?½á?¬á?¸á??á?¼á??á?¹á?¸ message á??á?­á?¯á?±á??á?¼á??á??á?½á?ºá??á?¹ Vidalia á??á?½á??á?¹á?· Tor "
-"process á?¡á??á??á?¹á??á??á?¹á??á?¯ á??á??á??á??á?¹á??á??á?¹á??á?½á?¬ á?¡á?»á??á?¬á?¸ Tor process á??á?­á?¯ á??á??á?¹á??á??á?¹á??á??á??á?¹á??á?­á?¯á?? á??á?­á?¯á??á?«á??á??á?¹á?? "
-"Windows á??á?½á?¬á??á?­á?¯á??á??á?¹ á??á??á?¹á?·á??á?²á?? Task Manager á??á?²á?? <i>tor.exe</i> á??á?­á?¯ á??á?½á?¬á?±á??á?¼á??á??á?«á??á??á?¹á?? "
-"á?¡á?»á??á?¬á?¸ Opreating systems á?±á??á?¼á??á?½á?¬á??á?­á?¯á??á??á?¹á?±á??á?¬á?· <i>ps</i> command á??á?¬ á?¡á?»á??á?¬á?¸ Tor "
+"process á?¡á??á??á?¹á??á??á?¹á??á?¯ á??á??á??á??á?¹á??á??á?¹á??á?½á?¬ á?¡á?»á??á?¬á?¸ Tor process á??á?­á?¯ á??á??á?¹á??á??á?¹á??á??á??á?¹á??á?­á?¯á?? á??á?­á?¯á??á?«á??á??á?¹á??"
+" Windows á??á?½á?¬á??á?­á?¯á??á??á?¹ á??á??á?¹á?·á??á?²á?? Task Manager á??á?²á?? <i>tor.exe</i> á??á?­á?¯ á??á?½á?¬á?±á??á?¼á??á??á?«á??á??á?¹á??"
+" á?¡á?»á??á?¬á?¸ Opreating systems á?±á??á?¼á??á?½á?¬á??á?­á?¯á??á??á?¹á?±á??á?¬á?· <i>ps</i> command á??á?¬ á?¡á?»á??á?¬á?¸ Tor "
 "process á??á?­á?¯ á??á?½á?¬á?±á??á?¼á??á?­á?¯á?? á??á?°á??á?®á?±á??á?¸á??á?«á??á?­á??á?¹á?·á??á??á?¹á??"
 
 # type: Content of: <html><body><p>
 #: 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 ""
 "á?¡á??á??á?¹á?? á?¡á??á?ºá?­á??á?¹á?¡á??á??á?¹á?¸á??á??á?¹(á??á??á? á??á?¹á??á?¡á??á??á?¹á?¸á??á??á?¹)á?¡á??á?¼á??á?¹á?¸ Tor á??á??á?¹á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?¼á?¬ run "
@@ -337,3 +328,5 @@ msgstr ""
 "á?¡á??á??á?¹á?? Vidalia á??á??á?¹ Tor á??á?­á?¯ á??á??á??á?¹á??á??á?¹á??á??á?­á?¯á??á?¹á??á?½á?ºá??á?¹ á??á?¼á??á?¹á?±á??á??á?¯á??á?¹á?¸ á?¡á??á?½á?¬á?¸á?¡á??á?¼á??á?¹á?¸ "
 "á??á??á?¹á??á?¯á??á?¯á??á?­á?¯ Tor á??á??á?¹á?»á??á??á?²á?·á?¡á??á?«á?»á??á??á?¹á??á??á?¹ <a href=\"log.html\">message log</a> á??á?­á?¯ "
 "á??á??á?¹á?±á??á?¸á??á??á?¹á?·á??á?«á??á??á?¹á??"
+
+
diff --git a/nl/index.po b/nl/index.po
index 5138a21..9d73211 100644
--- a/nl/index.po
+++ b/nl/index.po
@@ -1,29 +1,20 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
+# Shondoit Walker <shondoit+transifex@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-08-30 01:01+0200\n"
-"Last-Translator: Roconda <tim.slot@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-10-12 21:14+0000\n"
+"Last-Translator: Shondoit <shondoit+transifex@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -36,8 +27,8 @@ 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 ""
-"Selecteer een help onderwerp of druk op de Zoek button boven de lijst of "
-"onderwerpen om door alle help onderwerpen te zoeken."
+"Selecteer een help onderwerp of druk op de Zoek knop boven de lijst met "
+"onderwerpen om door in alle help onderwerpen te zoeken."
 
 #. type: Content of: <html><body><p>
 #: en/index.html:25
@@ -45,8 +36,8 @@ msgid ""
 "You can use the <i>Find</i> button on the toolbar above to search within a "
 "particular help topic."
 msgstr ""
-"U kunt de <i>Vind</i> button op de toolbar om te zoeken binnen een bepaald "
-"help onderwerp."
+"U kunt de <i>Vind</i> knop op de toolbar bovenaan gebruiken om te zoeken "
+"binnen een bepaald help onderwerp."
 
 #. type: Content of: <html><body><p>
 #: en/index.html:30
@@ -61,3 +52,5 @@ msgid ""
 msgstr ""
 "Zie het <a href=\"links.html\">Handige Links</a> onderwerp voor additionele "
 "informatie over Vildalia en Tor."
+
+
diff --git a/nl/links.po b/nl/links.po
index 337b57b..36333dd 100644
--- a/nl/links.po
+++ b/nl/links.po
@@ -1,11 +1,14 @@
 # 
+# Translators:
+#   <buzzkruid@xxxxxxxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-10-12 12:42+0000\n"
+"Last-Translator: enc <buzzkruid@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,12 +48,12 @@ msgstr ""
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:31 links.html:58
 msgid "Wiki and Bugtracker"
-msgstr ""
+msgstr "Wiki en Bugtracker"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:33
 msgid "<a href=\"http://trac.torproject.org/\";> http://trac.torproject.org/</a>"
-msgstr ""
+msgstr "<a href=\"http://trac.torproject.org/\";> http://trac.torproject.org/</a>"
 
 #. type: Content of: <html><body><h3>
 #: links.html:39
@@ -73,8 +76,12 @@ msgid ""
 "<a href=\"https://www.torproject.org/docs/faq.html\";> "
 "https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
+"<a "
+"href=\"https://www.torproject.org/docs/faq.html\";>https://www.torproject.org/docs/faq.html</a>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
-msgstr ""
+msgstr "<a href=\"https://trac.torproject.org/\";>https://trac.torproject.org/</a>"
+
+
diff --git a/nl/log.po b/nl/log.po
index 828c09c..5c43a85 100644
--- a/nl/log.po
+++ b/nl/log.po
@@ -1,29 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-08-29 23:21+0200\n"
-"Last-Translator: Roconda <tim.slot@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -33,11 +23,11 @@ msgstr "Berichten Log"
 #. 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>
@@ -49,14 +39,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>
@@ -70,31 +61,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>
@@ -106,7 +97,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>
@@ -122,8 +114,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>
@@ -150,7 +142,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>
@@ -165,3 +158,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr ""
+
+
diff --git a/nl/running.po b/nl/running.po
index 3f50dcb..54b259e 100644
--- a/nl/running.po
+++ b/nl/running.po
@@ -1,29 +1,20 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
+# Shondoit Walker <shondoit+transifex@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-08-30 01:16+0200\n"
-"Last-Translator: Roconda <tim.slot@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-10-12 21:18+0000\n"
+"Last-Translator: Shondoit <shondoit+transifex@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -71,7 +62,7 @@ msgid ""
 "Vidalia's tray icon will change from an onion with a red X to a green onion "
 "when Tor has started."
 msgstr ""
-"Vildalia's icoon verandert van een ui met een rode X naar een groene uit "
+"Vildalia's icoon verandert van een ui met een rode X naar een groene ui "
 "wanneer Tor is gestart."
 
 #. type: Content of: <html><body><p>
@@ -79,10 +70,10 @@ 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 ""
-"Als Vidalia onmogelijk Tor kan starten dan weergeeft het een error meteen "
+"Als Vidalia onmogelijk Tor kan starten dan geeft het een fout weer met een "
 "bericht wat er fout ging. U kunt ook in de <a href=\"log.html\">log "
 "bestanden</a> kijken om te zien of Tor meer informatie geeft over wat er "
 "fout gegaan is."
@@ -103,7 +94,7 @@ msgid ""
 "Vidalia's tray icon will change from a green onion to a gray onion with a "
 "red X when Tor has stopped."
 msgstr ""
-"Vidalia's icoon verandert van een groene uit naar een grijze ui met een rode "
+"Vidalia's icoon verandert van een groene ui naar een grijze ui met een rode "
 "X wanneer Tor gestopt is."
 
 #. type: Content of: <html><body><p>
@@ -111,10 +102,10 @@ 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 ""
-"Als Vidalia onmogelijk Tor kan stoppen dan toont Vidalia een error bericht "
+"Als Vidalia onmogelijk Tor kan stoppen dan toont Vidalia een fout bericht "
 "wat u vertelt dat er iets mis is. U kunt ook kijken in de <a "
 "href=\"log.html\">log bestanden</a> om te zien of Tor meer informatie geeft "
 "over wat er fout gegaan is."
@@ -136,14 +127,15 @@ msgid ""
 "system tray or dock area. The following table shows the different states "
 "indicated by an icon in your system's notification area:"
 msgstr ""
-"Vadalia vertelt u wat de status van Tor is door het icoontje. De volgende "
+"Vidalia vertelt u wat de status van Tor is door het icoontje. De volgende "
 "tabel laat u zien wat de verschillende statussen zijn voor het icoon:"
 
 #. 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 ""
-"Tor is gestopt. Selecteer <i>Start</i> vanuit Vildalia's menu om Tor te "
+"Tor is gestopt. Selecteer <i>Start</i> vanuit Vidalia's menu om Tor te "
 "starten."
 
 #. type: Content of: <html><body><p><table><tr><td>
@@ -158,14 +150,14 @@ 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 is momenteel aan het draaien. Als u wilt dat Tor stopt selecteer dan "
-"<i>Stop</i> in het Vidalia menu. Tor weergeeft dan verdere informatie in het "
-"<a href=\"log.html\">log bestand</a> als het draait."
+"Tor is draait momenteel. Als u wilt dat Tor stopt selecteer dan <i>Stop</i> "
+"in het Vidalia menu. Tor geeft dan verdere informatie weer in het <a "
+"href=\"log.html\">log bestand</a> als het draait."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:92
@@ -176,11 +168,13 @@ msgstr "Tor is aan het afsluiten."
 #: 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 ""
-"Als tor onverwachts stopt dan veranderd Vidialia's icoon in een donkere ui "
-"met een rode X en weergeeft het een bericht wat er fout ging. U kunt ook in "
-"de <a href=\"log.html\">log bestanden</a> om te zien of Tor meer informatie "
-"geeft over wat er fout gegaan is."
+"Als tor onverwachts stopt dan veranderdt Vidialia's icoon in een donkere ui "
+"met een rode X en geeft het een bericht weer wat er fout ging. U kunt ook in"
+" de <a href=\"log.html\">log bestanden</a> kijken om te zien of Tor meer "
+"informatie geeft over wat er fout gegaan is."
+
+
diff --git a/nl/services.po b/nl/services.po
index 3ea2d7d..576224c 100644
--- a/nl/services.po
+++ b/nl/services.po
@@ -1,29 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-08-30 01:37+0200\n"
-"Last-Translator: Roconda <tim.slot@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -94,9 +84,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>
@@ -120,19 +109,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."
@@ -171,9 +160,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>
@@ -194,8 +183,8 @@ msgstr "Voegt dienst toe: Maakt een nieuwe dienst- configuratie aan."
 #. 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>
@@ -223,8 +212,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 ""
 
@@ -233,9 +222,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>
@@ -256,3 +245,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/nl/troubleshooting.po b/nl/troubleshooting.po
index 6011ec5..10c7360 100644
--- a/nl/troubleshooting.po
+++ b/nl/troubleshooting.po
@@ -1,34 +1,25 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+#   <buzzkruid@xxxxxxxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: 2010-08-30 01:34+0200\n"
-"Last-Translator: Roconda <tim.slot@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-10-13 22:43+0000\n"
+"Last-Translator: enc <buzzkruid@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 # type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
 msgid "Troubleshooting"
-msgstr ""
+msgstr "Probleem oplossen"
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:19
@@ -38,51 +29,69 @@ msgid ""
 "having, check out our website at <i>www.vidalia-project.net</i> for more "
 "support and information.  <a name=\"start\"/>"
 msgstr ""
+"Hieronder staan enkele van de gemeenschappelijke problemen of vragen die "
+"mensen hebben tijdens het uitvoeren van Tor. Als u niets vindt over het "
+"specifieke probleem dat u heeft, kijk op onze website <i> www.vidalia-"
+"project.net </ i> voor meer ondersteuning en informatie. <a name=\"start\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:25
 msgid "I Can't Start Tor"
-msgstr ""
+msgstr "Ik Kan Tor Niet Starten"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:27
 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 ""
+"De meest waarschijnlijke reden dat Vidalia Tor niet kon starten is omdat "
+"Vidalia op zoek is naar uw Tor-installatie in de verkeerde map. U kunt in "
+"Vidalia instellen waar Tor zich bevindt door het aanpassen van de <i>Tor "
+"Executable</i> optie in de <a href=\"config.html#general\">algemene "
+"configuratie-instellingen</a> ."
 
 # 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 ""
+"Een andere mogelijke reden dat Tor niet kan starten is omdat er al een ander"
+" Tor-proces draait. Controleer uw lijst met draaiende processen en, mocht "
+"deze aanwezig zijn, stop het vorige Tor proces. Vervolgens probeert u Tor "
+"weer te starten."
 
 # 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 ""
+"Als dat niet heeft geholpen, controleer dan uw <a "
+"href=\"log.html\">berichten logboek</a> om te zien of Tor hierin informatie "
+"over de ondervonden opstart fouten heeft opgeslagen."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:43
 msgid "<a name=\"connect\"/>"
-msgstr "<a name=\"connect\"/>"
+msgstr "<a name=\"verbinden\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:44
 msgid "Vidalia Can't Connect to Tor"
-msgstr ""
+msgstr "Vidalia Kan Niet Verbinden Met Tor"
 
 # 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 ""
+"Vidalia beheert Tor door te communiceren met Tor's <i>controle poort</i>."
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:49
@@ -92,6 +101,10 @@ msgid ""
 "your <a href=\"log.html\">message log</a> to see if Tor reported any errors "
 "while it started."
 msgstr ""
+"De meest voorkomende reden waarom Vidalia niet kan verbinden met Tor is "
+"omdat Tor gestart is maar een error ondervond en meteen stopte. Bekijk uw <a"
+" href=\"log.html\">berichten logboek</a> om te zien of Tor fouten is "
+"tegengekomen tijdens het starten."
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:55
@@ -99,15 +112,21 @@ 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 ""
+"Wanneer Tor op een andere poort luistert dan Vidalia verwacht, zal Vidalia  "
+"niet in staat zijn te verbinden met Tor. U hoeft zelden deze instelling te "
+"veranderen, maar als er een andere dienst draait op uw machine die in strijd"
+" is met de controle Tor-poort, moet u een andere poort opgeven. U kunt deze "
+"instelling wijzigen in Vidalia's <a "
+"href=\"config.html#advanced\">geavanceerde configuratie-instellingen</a> ."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:63
 msgid "<a name=\"password\"/>"
-msgstr ""
+msgstr "<a name=\"wachtwoord\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:64
@@ -124,6 +143,12 @@ msgid ""
 "applications from also connecting to the control port and potentially "
 "compromising your anonymity."
 msgstr ""
+"Vidalia interageert met de Tor software via Tor's \"controle poort\". Via de"
+" controle-poort ontvangt Vidalia status updates van Tor, vraagt om een "
+"nieuwe identiteit, configureert Tor-instellingen, enz. Elke keer dat Vidalia"
+" Tor opstart, stelt Vidalia een willekeurig wachtwoord in voor Tor's "
+"controle poort. Zo worden verbindingen van andere toepassingen met de "
+"controle-poort, welke potentieel afbreuk doen op uw anonimiteit, voorkomen. "
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:75
@@ -132,6 +157,9 @@ msgid ""
 "happens in the background. There are three common situations, though, where "
 "Vidalia may prompt you for a password:"
 msgstr ""
+"Meestal vindt dit proces van genereren en instellen van een willekeurig "
+"controle wachtwoord plaats op de achtergrond . Hoewel, er zijn drie "
+"veelvoorkomende situaties waar Vidalia u kunt vragen om een â??â??wachtwoord:"
 
 # type: Content of: <html><body><ul><li>
 #: en/troubleshooting.html:82
@@ -141,14 +169,22 @@ msgid ""
 "Tor Browser Bundle. In that case, you'll need to close the old Vidalia and "
 "Tor before you can run this one."
 msgstr ""
+"U draait Vidalia en Tor al. Bijvoorbeeld, deze situatie kan plaatsvinden als"
+" u de Vidalia bundel heeft geinstalleerd en nu probeert om de Tor Browser "
+"Bundel te draaien. In dat geval moet u de oude Vidalia en Tor sluiten "
+"voordat u deze kunt starten."
 
 # 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 ""
+"Vidalia is gecrasht, maar liet Tor met het laatst bekende willekeurige "
+"wachtwoord draaien. Nadat u Vidalia opnieuw start, genereert het een "
+"willekeurig nieuwe wachtwoord. Omdat de willekeurige wachtwoorden "
+"verschillend zijn, kan Vidalia niet communiceren met Tor."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:94
@@ -157,6 +193,9 @@ msgid ""
 "button, you can click the button and Vidalia will restart Tor with a new "
 "random control password."
 msgstr ""
+"Als het dialoogvenster dat u om een controle wachtwoord vraagt een <i>Reset-"
+"knop</i> heeft, klikt dan op deze knop. Vidalia zal Tor opnieuw starten met "
+"een nieuw willekeurig controle wachtwoord."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:99
@@ -166,55 +205,77 @@ msgid ""
 "process or task manager, and terminate the Tor process. Then use Vidalia to "
 "restart Tor and all will work again."
 msgstr ""
+"Als u geen <i>Reset-knop,</i> ziet of als Vidalia niet in staat is om Tor "
+"opnieuw voor u te starten, kunt u nog steeds handmatig het probleem "
+"oplossen. Ga eenvoudigweg naar uw proces- of taakbeheer manager, en beëindig"
+" het Tor-proces. Maak vervolgens gebruik van Vidalia om Tor opnieuw te "
+"starten en alles zal weer werken."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:106
 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 ""
+"U had eerder Tor als een service ingesteld. Wanneer Tor is ingesteld om te "
+"draaien als een service, begint deze wanneer het systeem opstart. Als u Tor "
+"heeft geconfigureerd om te starten als een service via Vidalia, was er een "
+"willekeurig wachtwoord ingesteld en opgeslagen in Tor. Wanneer u opnieuw "
+"opstart, start Tor en maakt het gebruik van het random wachtwoord dat is "
+"opgeslagen. U logt in en start Vidalia. Vidalia probeert te communiceren met"
+" het reeds lopende Tor proces. Vidalia genereert een willekeurig wachtwoord,"
+" maar dit is anders dan het bewaarde wachtwoord in de Tor service."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:114
 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\";> "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
+"U moet Tor opnieuw configureren om geen service aan te bieden. Zie de Tor "
+"wiki-pagina<a "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";></a>"
+" voor meer informatie over hoe u de Tor service kunt verwijderen."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:122
 msgid "<a name=\"torexited\"/>"
-msgstr ""
+msgstr "<a name=\"torslootaf\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:123
 msgid "Tor Exited Unexpectedly"
-msgstr ""
+msgstr "Tor Sloot Onverwacht Af"
 
 # 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 ""
+"Als Tor onmiddellijk afsluit na het starten, heeft u waarschijnlijk een "
+"ander Tor proces dat al actief is. Bekijk het <a href=\"log.html\">berichten"
+" logboek</a> om te zien of een van de laatste paar berichten in de lijst "
+"geel is gemarkeerd, en er een bericht is met de volgende gegevens:"
 
 # 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 ""
+"connection_create_listener (): Kon niet verbinden met127.0.0.1:9050: Adres is al in gebruik.\n"
+"Draait Tor al?\n"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:135
@@ -225,25 +286,34 @@ msgid ""
 "operating systems, the <i>ps</i> command can help you find the other Tor "
 "process."
 msgstr ""
+"Als u een foutmelding tegenkomt zoals bovenstaand, moet u het andere Tor "
+"proces stoppen voordat u een nieuwe start met Vidalia. In Windows moet u "
+"kijken naar <i>tor.exe</i> in uw Taakbeheer. Op de meeste andere "
+"besturingssystemen, kan het commando <i>ps</i> helpen bij het â??â??vinden van "
+"de andere Tor processen."
 
 # type: Content of: <html><body><p>
 #: 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 ""
+"Wanneer Tor enige tijd succesvol draait (dat wil zeggen langer dan een paar "
+"seconden), dan moet u het<a href=\"log.html\">berichten logboek </a> op "
+"informatie over eventuele fouten, welke Tor tegenkwam tijdens het afsluiten,"
+" controleren. Dergelijke fouten worden gemarkeerd in rood of geel."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:147
 msgid "<a name=\"stop\"/>"
-msgstr ""
+msgstr "<a name=\"stoppen\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:148
 msgid "Vidalia Can't Stop Tor"
-msgstr ""
+msgstr "Vidalia Kan Tor Niet Stoppen"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:150
@@ -252,3 +322,8 @@ msgid ""
 "href=\"log.html\">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+"Als Vidalia Tor niet kan stoppen, bekijk dan uw <a "
+"href=\"log.html\">berichten logboek</a> om te zien of Tor tijdens het "
+"afsluiten fouten is tegengekomen."
+
+
diff --git a/pl/bridges.po b/pl/bridges.po
index 0bfaac3..0bc9b13 100644
--- a/pl/bridges.po
+++ b/pl/bridges.po
@@ -1,10 +1,12 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:08+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -115,3 +117,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/pl/index.po b/pl/index.po
index 3470bd8..59769dc 100644
--- a/pl/index.po
+++ b/pl/index.po
@@ -1,28 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"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/index.html:16
@@ -61,5 +52,7 @@ 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 ""
-"Zobacz tematy w <a href=\"links.html\">Pomocne Linki</a> gdzie możesz otrzymaÄ? "
-"dodatkowÄ? pomoc i informacje na temat Vidalii i Tora."
+"Zobacz tematy w <a href=\"links.html\">Pomocne Linki</a> gdzie możesz "
+"otrzymaÄ? dodatkowÄ? pomoc i informacje na temat Vidalii i Tora."
+
+
diff --git a/pl/links.po b/pl/links.po
index 049bf3a..6e3b864 100644
--- a/pl/links.po
+++ b/pl/links.po
@@ -1,10 +1,12 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -78,3 +80,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/pt_BR/bridges.po b/pt_BR/bridges.po
index 3d7a799..c81d1a2 100644
--- a/pt_BR/bridges.po
+++ b/pt_BR/bridges.po
@@ -1,11 +1,13 @@
 # 
+# Translators:
+# ssdoria <ssdoria@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-04 19:03+0000\n"
-"Last-Translator: Zetthy <ivan4br@xxxxxxxxxxx>\n"
+"PO-Revision-Date: 2011-04-27 07:02+0000\n"
+"Last-Translator: ssdoria <ssdoria@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,17 +18,17 @@ msgstr ""
 #. type: Content of: <html><body><h1>
 #: en/bridges.html:16
 msgid "Bridge Relays"
-msgstr "Desvios de Ponte"
+msgstr "Roteador Ponte"
 
 #. type: Content of: <html><body>
 #: en/bridges.html:19
 msgid "<a name=\"about\"/>"
-msgstr "<a name=\"about\"/>"
+msgstr "<a name=\"sobre\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/bridges.html:20
 msgid "What are bridge relays?"
-msgstr "O que são desvios de ponte?"
+msgstr "O que são os roteadores ponte?"
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:22
@@ -40,40 +42,42 @@ msgid ""
 "to all the known Tor relays, they probably won't be able to block all the "
 "bridges."
 msgstr ""
-"Alguns Provedores de Internet (ISPs, do inglês Internet Service Providers) "
-"tentam impedir usuários de acessar a rede Tor através do bloqueio de "
-"conexões com desvios do Tor já conhecidos. Desvios de ponte (ou "
-"<i>pontes</i>, na abreviação) são desvios que ajudam tais usuários "
-"censurados a acessar a rede Tor. Diferentemente de outros desvios do Tor, "
-"pontes não são listadas nos mesmos diretórios publicos que desvios comuns. "
-"Uma vez que não há lista pública completa deles, mesmo que o seu ISP esteja "
-"filtrando todas as conexões conhecidas de desvios do Tor, eles dificilmente "
-"serão capazes de bloquear todas as pontes."
+"Alguns Provedores de Internet (ISP) tentam impedir usuários de acessar a "
+"rede Tor através do bloqueio de conexão com os roteadores ponte do Tor já "
+"conhecidos. Roteadores ponte (ou <i>pontes</i>, para simplificar) são "
+"roteadores que ajudam usuários censurados a acessarem a rede Tor. Diferentes"
+" de outros roteadores do Tor, as pontes não são listadas nos mesmos "
+"diretórios publicos que os roteadores comuns. Já que não há uma lista "
+"pública completa deles, mesmo que o ISP esteja bloqueando todas as conexões "
+"conhecidas de roteadores do Tor, eles dificilmente serão capazes de bloquear"
+" todas as pontes."
 
 #. type: Content of: <html><body>
 #: en/bridges.html:31
 msgid "<a name=\"finding\"/>"
-msgstr "<a name=\"finding\"/>"
+msgstr "<a name=\"pesquisando\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/bridges.html:32
 msgid "How do I find a bridge relay?"
-msgstr "Como eu encontro um desvio de ponte?"
+msgstr "Como eu encontro um roteador ponte?"
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:34
 msgid "There are two main ways to learn about a bridge address:"
-msgstr "Existem dois modos principais de descobrir um endereço de ponte:"
+msgstr ""
+"Existem dois modos principais de descobrir o endereço de um roteador ponte:"
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/bridges.html:36
 msgid "Get some friends to run private bridges for you"
-msgstr "Fazer com que amigos mantenham pontes particulares para você"
+msgstr ""
+"Conseguir alguns amigos para servirem de pontes particulares para você"
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/bridges.html:37
 msgid "Use some of the public bridges"
-msgstr "Usar algumas das pontes públicas"
+msgstr "Usar algumas pontes públicas"
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:42
@@ -86,14 +90,14 @@ msgid ""
 "just passes data to and from the Tor network, so it shouldn't expose the "
 "operator to any abuse complaints."
 msgstr ""
-"Para usar pontes particulares, peça aos seus amigos que executem o Vidalia e"
-" o Tor em uma área não censurada da Internet, e cliquem em <i>Ajudar "
-"usuários censurados</i> na <ahref=\"server.html\">Página de Configurações de"
-" Desvios</a>. Depois eles devem te enviar de maneira privada o <i>endereço "
-"de Ponte</i> indicado na linha na base da página de Desvio. Diferentemente "
-"de executar um desvio de saída, executar um desvio de ponte simplesmente "
-"passa dados de e para a rede Tor, então não deveria expor o operador a "
-"quaisquer reclamações de abuso."
+"Para usar pontes particulares, peça aos seus amigos para executarem o "
+"Vidalia e o Tor em uma área não censurada da Internet, e clicarem em "
+"<i>Ajudar usuários censurados</i> na <ahref=\"server.html\">Página de "
+"configuração de roteadores</a>. Depois eles devem enviar de maneira privada "
+"o <i>Endereço da ponte</i> indicado na linha na base da página do seu "
+"roteador. De forma diferente de um roteador de saída, para executar um "
+"roteador ponte simplesmente são passados os dados de e para a rede Tor, de "
+"forma que o usuário não seja exposto a quaisquer acusações de abuso."
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:52
@@ -107,15 +111,14 @@ msgid ""
 "attacker to learn lots of bridge addresses, you must send this request from "
 "a Gmail account."
 msgstr ""
-"Voce pode encontrar endereços de pontes públicas acessando "
-"<b>https://bridges.torproject.org</b>. As respostas que você encontra nesta "
-"página irão mudar periodicamente, então verifique novamente em intervalos de"
-" alguns dias se precisar de mais pontes. Outro modo de se encontrar "
-"endereços de pontes públicas é enviando um e-mail para "
-"<b>bridges@xxxxxxxxxxxxxx</b com a frase <b>get bridges</b>  apenas, no "
-"corpo do mail. Entretanto, para podermos tornar mais difícil para um invasor"
-" aprender muitos endereços de ponte, você deve enviar esse pedido através de"
-" uma conta Gmail."
+"Você pode encontrar endereços de pontes públicas acessando "
+"<b>https://bridges.torproject.org</b>. As respostas que você vai encontrar "
+"nessa página mudarão periodicamente. Portanto, verifique periodicamente se "
+"precisar de mais endereços de pontes. Outro modo de se encontrar endereços "
+"de pontes públicas é enviar um e-mail para <b>bridges@xxxxxxxxxxxxxx</b com "
+"a frase <b>get bridges</b> apenas, no corpo do mail. Entretanto, para "
+"podermos tornar mais difícil para um invasor aprender muitos endereços de "
+"ponte, você deve enviar esse pedido através de uma conta do Gmail."
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:63
@@ -123,5 +126,7 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
-"Configurar mais de um endereço de ponte fará da sua conexão mais estável, "
-"caso a ligação com alguma das pontes se perca."
+"Configurar mais do que um endereço de ponte fará da sua conexão com o Tor "
+"mais estável, caso a conexão com alguma ponte seja interrompida."
+
+
diff --git a/ru/bridges.po b/ru/bridges.po
index 1eda36f..88600ae 100644
--- a/ru/bridges.po
+++ b/ru/bridges.po
@@ -1,17 +1,19 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-18 09:09+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian <None>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\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"
+"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
@@ -123,3 +125,5 @@ msgstr ""
 "Ð?аÑ?Ñ?Ñ?ойка болÑ?Ñ?е одного адÑ?еÑ?а моÑ?Ñ?а позволиÑ? Tor Ñ?оединениÑ? бÑ?Ñ?Ñ? более "
 "Ñ?Ñ?абилÑ?нÑ?м , Ñ?Ñ?оиÑ? Ñ?Ñ?еÑ?Ñ?Ñ? Ñ?Ñ?о некоÑ?оÑ?Ñ?е моÑ?Ñ?Ñ? Ñ?о вÑ?еменем Ñ?Ñ?ановÑ?Ñ?Ñ?Ñ? не "
 "доÑ?Ñ?Ñ?пнÑ?."
+
+
diff --git a/ru/config.po b/ru/config.po
index 9d25433..f5d5604 100644
--- a/ru/config.po
+++ b/ru/config.po
@@ -1,30 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2010-09-24 08:13+0200\n"
-"Last-Translator: euneko <euneko@xxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2010-12-21 22:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/config.html:16
@@ -55,23 +44,24 @@ 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 "Ð?аÑ?Ñ?Ñ?ойки на Ñ?Ñ?Ñ?аниÑ?е <i>Ð?бÑ?ие</i>наиболее Ñ?аÑ?Ñ?о наÑ?Ñ?Ñ?аиваемÑ?е."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:32
 msgid ""
-"<b>Tor Executable</b>: This is the Tor executable that Vidalia will run when "
-"you select <i>Start</i> from the tray menu. If you have multiple versions of "
-"Tor installed, you can tell Vidalia which version you would like to run by "
-"clicking the <i>Browse</i> button and navigating to the particular Tor "
+"<b>Tor Executable</b>: This is the Tor executable that Vidalia will run when"
+" you select <i>Start</i> from the tray menu. If you have multiple versions "
+"of Tor installed, you can tell Vidalia which version you would like to run "
+"by clicking the <i>Browse</i> button and navigating to the particular Tor "
 "installation you want."
 msgstr ""
 "<b>Tor иÑ?полнÑ?емÑ?е Ñ?айлÑ?</b>: ЭÑ?о Ñ?айлÑ? Tor коÑ?оÑ?Ñ?е VIdalia запÑ?Ñ?Ñ?иÑ? когда "
 "вÑ? вÑ?беÑ?иÑ?е <i>Ð?апÑ?Ñ?к</i> из менÑ? в Ñ?Ñ?ее. Ð?Ñ?ли Ñ? ваÑ? Ñ?Ñ?Ñ?ановлено неÑ?колÑ?ко "
 "веÑ?Ñ?ий Tor, вÑ? можеÑ?е Ñ?вно Ñ?казаÑ?Ñ? Vidalia какÑ?Ñ? веÑ?Ñ?иÑ? вÑ? пÑ?едпоÑ?иÑ?аеÑ?е "
-"запÑ?Ñ?каÑ?Ñ? .Ð?ажмиÑ?е кнопкÑ? <i>Ð?бзоÑ?</i> и пеÑ?ейдиÑ?е на Ñ?е Ñ?Ñ?Ñ?ановленнÑ?е Ñ?айлÑ? "
-"Ñ?Ñ?о вам нÑ?жнÑ?."
+"запÑ?Ñ?каÑ?Ñ? .Ð?ажмиÑ?е кнопкÑ? <i>Ð?бзоÑ?</i> и пеÑ?ейдиÑ?е на Ñ?е Ñ?Ñ?Ñ?ановленнÑ?е Ñ?айлÑ?"
+" Ñ?Ñ?о вам нÑ?жнÑ?."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:39
@@ -97,8 +87,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 ""
 "СÑ?Ñ?аниÑ?а наÑ?Ñ?Ñ?оек <i>СеÑ?Ñ?</i> позволиÑ? вам измениÑ?Ñ? каким обÑ?азом Tor бÑ?деÑ? "
 "подклÑ?Ñ?аÑ?Ñ?Ñ? к Tor Ñ?еÑ?и."
@@ -118,9 +108,9 @@ msgstr ""
 "Ñ?оединение Ñ?Ñ?ебÑ?еÑ? HTTP пÑ?окÑ?и, вÑ? можеÑ?е наÑ?Ñ?Ñ?оиÑ?Ñ? Tor на оÑ?пÑ?авкÑ? вÑ?еÑ? "
 "запÑ?оÑ?ов диÑ?екÑ?оÑ?ии и Ñ?оединениÑ? Tor Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Ñ?еÑ?ез пÑ?окÑ?и.Ð?Ñ? должнÑ? "
 "Ñ?казаÑ?Ñ? как минимÑ?м имÑ? компÑ?Ñ?Ñ?еÑ?а или адÑ?еÑ? и поÑ?Ñ? ваÑ?его пÑ?окÑ?и коÑ?оÑ?Ñ?й "
-"ваÑ? пÑ?окÑ?и обÑ?лÑ?живаеÑ? длÑ? Ñ?оединений.Ð?Ñ?ли ваÑ? пÑ?окÑ?и Ñ?Ñ?ебÑ?еÑ? аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ? "
-"вÑ? Ñ?ак же можеÑ?е Ñ?казаÑ?Ñ? <i>Ð?мÑ? полÑ?зоваÑ?елÑ?</i> и <i>Ð?аÑ?олÑ?</i> коÑ?оÑ?Ñ?е вÑ? "
-"иÑ?полÑ?зÑ?еÑ?е длÑ? подклÑ?Ñ?ениÑ? к пÑ?окÑ?и,или вÑ? можеÑ?е оÑ?Ñ?авиÑ?Ñ? Ñ?Ñ?и полÑ? "
+"ваÑ? пÑ?окÑ?и обÑ?лÑ?живаеÑ? длÑ? Ñ?оединений.Ð?Ñ?ли ваÑ? пÑ?окÑ?и Ñ?Ñ?ебÑ?еÑ? аÑ?Ñ?енÑ?иÑ?икаÑ?иÑ?"
+" вÑ? Ñ?ак же можеÑ?е Ñ?казаÑ?Ñ? <i>Ð?мÑ? полÑ?зоваÑ?елÑ?</i> и <i>Ð?аÑ?олÑ?</i> коÑ?оÑ?Ñ?е вÑ?"
+" иÑ?полÑ?зÑ?еÑ?е длÑ? подклÑ?Ñ?ениÑ? к пÑ?окÑ?и,или вÑ? можеÑ?е оÑ?Ñ?авиÑ?Ñ? Ñ?Ñ?и полÑ? "
 "пÑ?Ñ?Ñ?Ñ?ми."
 
 #. type: Content of: <html><body><ul><li>
@@ -130,13 +120,13 @@ 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 на Ñ?оединение "
-"напÑ?Ñ?мÑ?Ñ? Ñ?олÑ?ко на Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? Ñ? поÑ?Ñ?ами коÑ?оÑ?Ñ?е Ñ?азÑ?еÑ?енÑ? вам .Самое "
+"огÑ?аниÑ?ением по поÑ?Ñ?ам длÑ? Ñ?оединениÑ? ,вÑ? можеÑ?е наÑ?Ñ?Ñ?оиÑ?Ñ? Tor на Ñ?оединение"
+" напÑ?Ñ?мÑ?Ñ? Ñ?олÑ?ко на Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? Ñ? поÑ?Ñ?ами коÑ?оÑ?Ñ?е Ñ?азÑ?еÑ?енÑ? вам .Самое "
 "пÑ?оÑ?Ñ?ое ввеÑ?Ñ?и вÑ?е Ñ?азÑ?еÑ?еннÑ?е поÑ?Ñ?Ñ? на ваÑ?ем бÑ?андмаÑ?Ñ?Ñ?е или пÑ?окÑ?и "
 "Ñ?азделеннÑ?е запÑ?Ñ?Ñ?ми. (<i>Ð?Ñ?имеÑ?: 80,443,8080</i>)"
 
@@ -147,8 +137,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 ""
 "<b>Ð?ой пÑ?овайдеÑ? блокиÑ?Ñ?еÑ? Ñ?оединениÑ? Ñ? Ñ?еÑ?Ñ?Ñ? Tor</b>: Ð?Ñ?ли ваÑ? пÑ?овайдеÑ? "
 "блокиÑ?Ñ?еÑ? Ñ?оединениÑ? Ñ? Ñ?еÑ?Ñ?Ñ? Tor, Tor можеÑ? попÑ?Ñ?аÑ?Ñ?Ñ?Ñ? избежаÑ?Ñ? Ñ?илÑ?Ñ?Ñ?аÑ?ии "
@@ -182,22 +172,22 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
 msgid ""
 "Even if you do not know any bridge relay addresses, checking this checkbox "
 "may still be helpful. Tor will encrypt its directory requests, which can "
-"defeat blocking mechanisms that try to filter Tor's requests for information "
-"about other relays. If connections to normal Tor relays are also blocked, "
-"then you will need to learn a bridge relay address somehow and add it "
-"here. See the help topic on <a href=\"bridges.html#finding\">finding bridge "
+"defeat blocking mechanisms that try to filter Tor's requests for information"
+" about other relays. If connections to normal Tor relays are also blocked, "
+"then you will need to learn a bridge relay address somehow and add it here. "
+"See the help topic on <a href=\"bridges.html#finding\">finding bridge "
 "relays</a> for more information on how to learn new bridge relay addresses "
 "and fingerprints."
 msgstr ""
 "Ð?аже еÑ?ли вÑ? не знаеÑ?е ни одного адÑ?еÑ?а Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Ñ?ипа моÑ?Ñ? Ñ?Ñ?Ñ?ановка "
 "данного Ñ?лажка можеÑ? оказаÑ?Ñ?Ñ?Ñ? полезной.Tor Ñ?иÑ?Ñ?Ñ?еÑ? диÑ?екÑ?оÑ?иÑ? запÑ?оÑ?ов "
-",коÑ?оÑ?Ñ?Ñ? можеÑ? повÑ?едиÑ?Ñ? меÑ?анизм блокиÑ?овки пÑ?Ñ?аÑ?Ñ?Ñ? Ñ?илÑ?Ñ?Ñ?оваÑ?Ñ? Tor запÑ?оÑ?Ñ? "
-"об инÑ?оÑ?маÑ?ии о дÑ?Ñ?гиÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?аÑ?.Ð?Ñ?ли Ñ?оединениÑ? обÑ?Ñ?ного Tor "
+",коÑ?оÑ?Ñ?Ñ? можеÑ? повÑ?едиÑ?Ñ? меÑ?анизм блокиÑ?овки пÑ?Ñ?аÑ?Ñ?Ñ? Ñ?илÑ?Ñ?Ñ?оваÑ?Ñ? Tor запÑ?оÑ?Ñ?"
+" об инÑ?оÑ?маÑ?ии о дÑ?Ñ?гиÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?аÑ?.Ð?Ñ?ли Ñ?оединениÑ? обÑ?Ñ?ного Tor "
 "Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Ñ?ак же блокиÑ?Ñ?Ñ?Ñ?Ñ?Ñ?,вам нÑ?жно изÑ?Ñ?иÑ?Ñ? каким обÑ?азом добавлÑ?Ñ?Ñ? "
 "адÑ?еÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Ñ?ипа моÑ?Ñ?.Ð?Ñ?оÑ?моÑ?Ñ?иÑ?е Ñ?пÑ?авкÑ? на <a "
-"href=\"bridges.html#finding\">найÑ?и Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? Ñ?ипа моÑ?Ñ?</a> длÑ? полÑ?Ñ?ениÑ? "
-"дополниÑ?елÑ?ной инÑ?оÑ?маÑ?ии о Ñ?ом, как Ñ?знаÑ?Ñ? новÑ?й адÑ?еÑ?а Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Ñ?ипа "
-"моÑ?Ñ? и оÑ?пеÑ?аÑ?ков палÑ?Ñ?ев."
+"href=\"bridges.html#finding\">найÑ?и Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? Ñ?ипа моÑ?Ñ?</a> длÑ? "
+"полÑ?Ñ?ениÑ? дополниÑ?елÑ?ной инÑ?оÑ?маÑ?ии о Ñ?ом, как Ñ?знаÑ?Ñ? новÑ?й адÑ?еÑ?а "
+"Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Ñ?ипа моÑ?Ñ? и оÑ?пеÑ?аÑ?ков палÑ?Ñ?ев."
 
 #. type: Content of: <html><body>
 #: en/config.html:100
@@ -212,8 +202,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 ""
 "<i> СмоÑ?Ñ?иÑ?е<a href=\"server.html\">Ñ?пÑ?авкÑ?</a> длÑ? подÑ?обной инÑ?оÑ?маÑ?ии о "
 "наÑ?Ñ?Ñ?ойкаÑ? и Ñ?пÑ?авлении Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Tor.  </i>"
@@ -240,12 +230,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 ""
 "<b>ЯзÑ?к</b>: Ð?нÑ?еÑ?Ñ?ейÑ? Vidalia пеÑ?еведен на множеÑ?Ñ?во Ñ?зÑ?ков благодаÑ?Ñ? "
 "помоÑ?и добÑ?оволÑ?Ñ?ев.Ð?Ñ?и запÑ?Ñ?ке Vidalia попÑ?Ñ?аеÑ?Ñ?Ñ? опÑ?еделиÑ?Ñ? Ñ?зÑ?к коÑ?оÑ?Ñ?й "
@@ -260,8 +250,8 @@ msgid ""
 "default interface style. If you dislike the default, you can choose "
 "whichever interface style you prefer from the dropdown box."
 msgstr ""
-"<b>СÑ?илÑ?</b>: Ð? болÑ?Ñ?инÑ?Ñ?ве Ñ?лÑ?Ñ?аев, Vidalia бÑ?деÑ? иÑ?полÑ?зоваÑ?Ñ? по Ñ?молÑ?аниÑ? "
-" Ñ?Ñ?илÑ? инÑ?еÑ?Ñ?ейÑ?а ваÑ?ей плаÑ?Ñ?оÑ?мÑ?. Ð?Ñ?ли вам не нÑ?авиÑ?Ñ?Ñ? по Ñ?молÑ?аниÑ?, вÑ? "
+"<b>СÑ?илÑ?</b>: Ð? болÑ?Ñ?инÑ?Ñ?ве Ñ?лÑ?Ñ?аев, Vidalia бÑ?деÑ? иÑ?полÑ?зоваÑ?Ñ? по Ñ?молÑ?аниÑ?"
+"  Ñ?Ñ?илÑ? инÑ?еÑ?Ñ?ейÑ?а ваÑ?ей плаÑ?Ñ?оÑ?мÑ?. Ð?Ñ?ли вам не нÑ?авиÑ?Ñ?Ñ? по Ñ?молÑ?аниÑ?, вÑ? "
 "можеÑ?е вÑ?бÑ?аÑ?Ñ? лÑ?бой Ñ?Ñ?илÑ? инÑ?еÑ?Ñ?ейÑ?а коÑ?оÑ?Ñ?й  пÑ?едпоÑ?Ñ?Ñ?Ñ?е из вÑ?падаÑ?Ñ?его "
 "Ñ?пиÑ?ка."
 
@@ -287,8 +277,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 ""
@@ -327,21 +317,21 @@ 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 бÑ?деÑ? Ñ?Ñ?ебоваÑ?Ñ? пÑ?и каждом Ñ?оединениÑ? к поÑ?Ñ?Ñ? "
 "Ñ?пÑ?авлениÑ? Tor ,пÑ?иложением или полÑ?зоваÑ?елем.Ð?Ñ?ли запÑ?Ñ?к Tor оÑ?Ñ?Ñ?еÑ?Ñ?влÑ?еÑ? "
-"длÑ? ваÑ? Vidalia, вÑ? можеÑ?е вÑ?бÑ?аÑ?Ñ? генеÑ?аÑ?иÑ? Ñ?лÑ?Ñ?айного нового паÑ?олÑ? каждÑ?й "
-"Ñ?аз пÑ?и запÑ?Ñ?ке Tor, Ñ?Ñ?Ñ?ановив Ñ?лажок на опÑ?ии <i>Ð?енеÑ?иÑ?оваÑ?Ñ? "
+"длÑ? ваÑ? Vidalia, вÑ? можеÑ?е вÑ?бÑ?аÑ?Ñ? генеÑ?аÑ?иÑ? Ñ?лÑ?Ñ?айного нового паÑ?олÑ? каждÑ?й"
+" Ñ?аз пÑ?и запÑ?Ñ?ке Tor, Ñ?Ñ?Ñ?ановив Ñ?лажок на опÑ?ии <i>Ð?енеÑ?иÑ?оваÑ?Ñ? "
 "Ñ?лÑ?Ñ?айнÑ?й</i>."
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:162
 msgid ""
-"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file "
-"(or, <i>cookie</i>) containing random bytes to its data directory when it "
+"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file"
+" (or, <i>cookie</i>) containing random bytes to its data directory when it "
 "starts. Any user or application that tries to connect to Tor's control port "
 "must be able to provide the contents of this cookie."
 msgstr ""
@@ -375,15 +365,15 @@ msgstr ""
 "<b>Ð?иÑ?екÑ?оÑ?иÑ? даннÑ?Ñ? Tor</b> <i>(опÑ?ионалÑ?но)</i>:Ð?Ñ? можеÑ?е Ñ?казаÑ?Ñ? "
 "диÑ?екÑ?оÑ?иÑ? в коÑ?оÑ?ой Tor бÑ?деÑ? Ñ?оÑ?Ñ?анÑ?Ñ?Ñ? даннÑ?е,Ñ?акие как кеÑ?иÑ?ованнÑ?Ñ? "
 "инÑ?оÑ?маÑ?иÑ? о Tor Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?е ,клÑ?Ñ?и Tor Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а и конÑ?игÑ?Ñ?аÑ?ионнÑ?е "
-"Ñ?айлÑ?.Ð?Ñ?ли оÑ?Ñ?авиÑ?е полÑ? пÑ?Ñ?Ñ?Ñ?ми Tor бÑ?деÑ? иÑ?полÑ?зоваÑ?Ñ? Ñ?обÑ?Ñ?веннÑ?Ñ? заданнÑ?Ñ? "
-"по Ñ?молÑ?аниÑ? диÑ?екÑ?оÑ?иÑ?."
+"Ñ?айлÑ?.Ð?Ñ?ли оÑ?Ñ?авиÑ?е полÑ? пÑ?Ñ?Ñ?Ñ?ми Tor бÑ?деÑ? иÑ?полÑ?зоваÑ?Ñ? Ñ?обÑ?Ñ?веннÑ?Ñ? заданнÑ?Ñ?"
+" по Ñ?молÑ?аниÑ? диÑ?екÑ?оÑ?иÑ?."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:181
 msgid ""
-"<b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter "
-"a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it "
-"starts.  If you enter a value for <b>Run as Group</b>, Tor will "
+"<b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter"
+" a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it"
+" starts.  If you enter a value for <b>Run as Group</b>, Tor will "
 "<i>setgid</i> to this group when it starts."
 msgstr ""
 "<b>РазÑ?еÑ?ениÑ?</b> <i>(опÑ?ионалÑ?но,не Ñ?абоÑ?аеÑ? в Windows)</i>:Ð?Ñ?ли вÑ? "
@@ -405,8 +395,10 @@ msgstr "Ð?аÑ?Ñ?Ñ?ойка Ñ?кÑ?Ñ?Ñ?ого Ñ?еÑ?виÑ?а"
 #. type: Content of: <html><body><p>
 #: en/config.html:192
 msgid ""
-"Hidden services allow you to provide any kind of TCP-based service, e.g.  an "
-"HTTP service, to others without revealing your IP address."
+"Hidden services allow you to provide any kind of TCP-based service, e.g.  an"
+" HTTP service, to others without revealing your IP address."
 msgstr ""
 "СкÑ?Ñ?Ñ?Ñ?е Ñ?еÑ?виÑ?Ñ? позволÑ?Ñ?Ñ? вам пÑ?едоÑ?Ñ?авиÑ?Ñ? лÑ?бÑ?е TCP-оÑ?нованнÑ?е Ñ?еÑ?виÑ?Ñ? "
 "напÑ?имеÑ? HTTP Ñ?еÑ?виÑ? не Ñ?аÑ?кÑ?Ñ?ваÑ? ваÑ? IP адÑ?еÑ?."
+
+
diff --git a/ru/index.po b/ru/index.po
index 6c80e49..6f8c12f 100644
--- a/ru/index.po
+++ b/ru/index.po
@@ -1,27 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-06-27 07:37-0600\n"
-"Last-Translator: Runa Sandvik <runa.sandvik@xxxxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\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: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -34,8 +26,8 @@ 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
@@ -57,5 +49,7 @@ 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 ""
-"Ð? Ñ?азделе <a href=\\\"links.html\\\">Ð?олезнÑ?е СÑ?Ñ?лки</a> пеÑ?еÑ?иÑ?ленÑ? некоÑ?оÑ?Ñ?е "
-"меÑ?Ñ?а где можно найÑ?и дополниÑ?елÑ?нÑ?Ñ? инÑ?оÑ?маÑ?иÑ? по Vidalia и Tor."
+"Ð? Ñ?азделе <a href=\\\"links.html\\\">Ð?олезнÑ?е СÑ?Ñ?лки</a> пеÑ?еÑ?иÑ?ленÑ? "
+"некоÑ?оÑ?Ñ?е меÑ?Ñ?а где можно найÑ?и дополниÑ?елÑ?нÑ?Ñ? инÑ?оÑ?маÑ?иÑ? по Vidalia и Tor."
+
+
diff --git a/ru/links.po b/ru/links.po
index f9db63f..79a565c 100644
--- a/ru/links.po
+++ b/ru/links.po
@@ -1,10 +1,12 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -78,3 +80,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/ru/log.po b/ru/log.po
index 48612dc..c0e7ecb 100644
--- a/ru/log.po
+++ b/ru/log.po
@@ -1,30 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-24 08:24+0200\n"
-"Last-Translator: euneko <euneko@xxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -34,11 +23,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 ""
 "Ð?Ñ?Ñ?нал Ñ?ообÑ?ений позволÑ?еÑ? пÑ?оÑ?моÑ?Ñ?еÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о Ñ?Ñ?аÑ?Ñ?Ñ?е запÑ?Ñ?енного "
 "пÑ?оÑ?еÑ?Ñ?а Tor.  <a name=\"basic\"/> Ð?аждое Ñ?ообÑ?ение имееÑ? <i>Ñ?Ñ?овенÑ? "
@@ -56,19 +45,20 @@ 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 ""
-"УÑ?овенÑ? важноÑ?Ñ?и Ñ?ообÑ?ений пÑ?едоÑ?Ñ?авлÑ?еÑ? возможноÑ?Ñ?Ñ? понÑ?Ñ?Ñ? на Ñ?колÑ?ко важно "
-"данное Ñ?ообÑ?ение.СамÑ?й важнÑ?й Ñ?Ñ?овенÑ? Ñ?ообÑ?ениÑ? обÑ?Ñ?но говоÑ?иÑ? о Ñ?ом Ñ?Ñ?о "
+"УÑ?овенÑ? важноÑ?Ñ?и Ñ?ообÑ?ений пÑ?едоÑ?Ñ?авлÑ?еÑ? возможноÑ?Ñ?Ñ? понÑ?Ñ?Ñ? на Ñ?колÑ?ко важно"
+" данное Ñ?ообÑ?ение.СамÑ?й важнÑ?й Ñ?Ñ?овенÑ? Ñ?ообÑ?ениÑ? обÑ?Ñ?но говоÑ?иÑ? о Ñ?ом Ñ?Ñ?о "
 "Ñ?Ñ?о Ñ?о не Ñ?ак пÑ?оиÑ?Ñ?одиÑ? Ñ? Tor.СамаÑ? низкаÑ? важноÑ?Ñ?Ñ? Ñ?ообÑ?ений Ñ?аÑ?Ñ?о "
 "поÑ?влÑ?Ñ?Ñ?Ñ?Ñ? в Ñ?оде ноÑ?малÑ?ного Ñ?Ñ?нкÑ?иониÑ?ованиÑ? Tor и, как пÑ?авило, не "
 "нÑ?ждаеÑ?Ñ?Ñ? в запиÑ?и."
 
 #. 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>
@@ -78,16 +68,16 @@ msgid ""
 "Tor cannot proceed. These messages will be highlighted in <i>red</i> in the "
 "message log."
 msgstr ""
-"<b>Ð?Ñ?ибка</b>:СообÑ?ениÑ? пÑ?ибÑ?ваÑ?Ñ? когда пÑ?оиÑ?Ñ?одиÑ? Ñ?Ñ?о-Ñ?о не Ñ?ак и Tor далее "
-"не можеÑ? пÑ?одолжаÑ?Ñ? Ñ?абоÑ?аÑ?Ñ?.Такие Ñ?ообÑ?ениÑ? помеÑ?енÑ? кÑ?аÑ?нÑ?м Ñ?веÑ?ом в "
+"<b>Ð?Ñ?ибка</b>:СообÑ?ениÑ? пÑ?ибÑ?ваÑ?Ñ? когда пÑ?оиÑ?Ñ?одиÑ? Ñ?Ñ?о-Ñ?о не Ñ?ак и Tor далее"
+" не можеÑ? пÑ?одолжаÑ?Ñ? Ñ?абоÑ?аÑ?Ñ?.Такие Ñ?ообÑ?ениÑ? помеÑ?енÑ? кÑ?аÑ?нÑ?м Ñ?веÑ?ом в "
 "жÑ?Ñ?нале Ñ?ообÑ?ений."
 
 #. 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 ""
 "<b>Ð?Ñ?едÑ?пÑ?еждение</b>: СообÑ?ениÑ? пÑ?ибÑ?ваÑ?Ñ? когда пÑ?оиÑ?Ñ?одиÑ? Ñ?Ñ?о-Ñ?о не Ñ?ак Ñ? "
 "Tor, но не Ñ?аÑ?алÑ?но и Tor бÑ?деÑ? пÑ?одолжаÑ?Ñ? Ñ?абоÑ?аÑ?Ñ?. Такие Ñ?ообÑ?ениÑ? "
@@ -96,8 +86,8 @@ 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 ""
 "<b>УведомлениÑ?</b>: СообÑ?ениÑ? коÑ?оÑ?Ñ?е поÑ?влÑ?Ñ?Ñ?Ñ?Ñ? Ñ?едко во вÑ?емÑ? обÑ?Ñ?ной "
 "Ñ?абоÑ?Ñ? Tor и не Ñ?Ñ?иÑ?аÑ?Ñ?Ñ?Ñ? оÑ?ибками,но в лÑ?бом Ñ?лÑ?Ñ?ае вÑ? можеÑ?е "
@@ -106,8 +96,8 @@ 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 ""
 "<b>Ð?нÑ?оÑ?маÑ?иÑ?</b>: СообÑ?ениÑ? коÑ?оÑ?Ñ?е поÑ?влÑ?Ñ?Ñ?Ñ?Ñ? Ñ?аÑ?Ñ?о во вÑ?емÑ? обÑ?Ñ?ной "
 "Ñ?абоÑ?Ñ? Tor и обÑ?Ñ?но не пÑ?едÑ?Ñ?авлÑ?Ñ?Ñ? инÑ?еÑ?еÑ? длÑ? болÑ?Ñ?инÑ?Ñ?ва полÑ?зоваÑ?елей."
@@ -116,8 +106,8 @@ msgstr ""
 #: 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 ""
 "<b>Ð?Ñ?ладка</b>: Ð?Ñ?енÑ? подÑ?обнÑ?е Ñ?ообÑ?ениÑ?, коÑ?оÑ?Ñ?е в оÑ?новном пÑ?едÑ?Ñ?авлÑ?Ñ?Ñ? "
 "инÑ?еÑ?еÑ? длÑ? Ñ?азÑ?абоÑ?Ñ?иков. Ð?ам не Ñ?ледÑ?еÑ? вклÑ?Ñ?аÑ?Ñ? даннÑ?й вид "
@@ -134,7 +124,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 ""
 "Ð?лÑ? Ñ?ого Ñ?Ñ?обÑ? вÑ?бÑ?аÑ?Ñ? Ñ?Ñ?овни важноÑ?Ñ?и Ñ?ообÑ?ений коÑ?оÑ?Ñ?е вÑ? Ñ?оÑ?ели бÑ? "
 "видеÑ?Ñ?, вÑ?полниÑ?е Ñ?ледÑ?Ñ?Ñ?ее:"
@@ -152,8 +143,8 @@ msgstr "Ð?ажмиÑ?е на <i>Ð?аÑ?Ñ?Ñ?ойки</i> в веÑ?Ñ?ней Ñ?аÑ?Ñ?
 #. 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 ""
 "Ð?Ñ?беÑ?иÑ?е Ñ?Ñ?овни важноÑ?Ñ?и Ñ?ообÑ?ений коÑ?оÑ?Ñ?е вам Ñ?Ñ?ебÑ?Ñ?Ñ?Ñ?Ñ? из гÑ?Ñ?пп ФилÑ?Ñ?Ñ?а "
 "СообÑ?ений и Ñ?нимиÑ?е Ñ?лажок на Ñ?ообÑ?ениÑ?Ñ? коÑ?оÑ?Ñ?е вÑ? бÑ? Ñ?оÑ?ели Ñ?кÑ?Ñ?Ñ?Ñ?."
@@ -186,7 +177,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 ""
 "УÑ?Ñ?ановиÑ?е Ñ?лажок в опÑ?ии <i>Ð?вÑ?омаÑ?иÑ?еÑ?ки Ñ?оÑ?Ñ?анÑ?Ñ?Ñ? новÑ?й жÑ?Ñ?нал Ñ?ообÑ?ений "
 "в Ñ?айл</i>."
@@ -206,3 +198,5 @@ msgstr ""
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr "Ð?ажмиÑ?е <i>СоÑ?Ñ?аниÑ?Ñ? наÑ?Ñ?Ñ?ойки</i> длÑ? наÑ?ала запиÑ?и жÑ?Ñ?нала в Ñ?айл."
+
+
diff --git a/ru/netview.po b/ru/netview.po
index 406ba81..3700bae 100644
--- a/ru/netview.po
+++ b/ru/netview.po
@@ -1,11 +1,12 @@
 # 
+# Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2011-08-10 10:04+0000\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ru/running.po b/ru/running.po
index 6a386e4..7918279 100644
--- a/ru/running.po
+++ b/ru/running.po
@@ -1,30 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-24 08:40+0200\n"
-"Last-Translator: euneko <euneko@xxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/running.html:16
@@ -82,12 +71,13 @@ 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 ""
-"Ð?Ñ?ли Vidalia не Ñ?могла запÑ?Ñ?Ñ?иÑ?Ñ? Tor, Vidalia оÑ?обÑ?азиÑ?Ñ? Ñ?ообÑ?ение об оÑ?ибке "
-"Ñ? опиÑ?анием пÑ?иÑ?инÑ?. Ð?Ñ? Ñ?ак же можеÑ?е пÑ?оÑ?моÑ?Ñ?еÑ?Ñ? <a href=\"log.html\">жÑ?Ñ?нал "
-"Ñ?ообÑ?ений</a> длÑ? более подÑ?обной инÑ?оÑ?маÑ?ии об пÑ?оизоÑ?едÑ?ей оÑ?ибке."
+"Ð?Ñ?ли Vidalia не Ñ?могла запÑ?Ñ?Ñ?иÑ?Ñ? Tor, Vidalia оÑ?обÑ?азиÑ?Ñ? Ñ?ообÑ?ение об оÑ?ибке"
+" Ñ? опиÑ?анием пÑ?иÑ?инÑ?. Ð?Ñ? Ñ?ак же можеÑ?е пÑ?оÑ?моÑ?Ñ?еÑ?Ñ? <a "
+"href=\"log.html\">жÑ?Ñ?нал Ñ?ообÑ?ений</a> длÑ? более подÑ?обной инÑ?оÑ?маÑ?ии об "
+"пÑ?оизоÑ?едÑ?ей оÑ?ибке."
 
 #. type: Content of: <html><body><p>
 #: en/running.html:43
@@ -114,8 +104,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 ""
 "Ð?Ñ?ли Vidalia не Ñ?могла оÑ?Ñ?ановиÑ?Ñ? Tor, Vidalia оÑ?обÑ?азиÑ?Ñ? Ñ?ообÑ?ение об "
 "оÑ?ибке Ñ? опиÑ?анием пÑ?иÑ?инÑ?. Ð?Ñ? Ñ?ак же можеÑ?е пÑ?оÑ?моÑ?Ñ?еÑ?Ñ? <a "
@@ -145,8 +135,10 @@ 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 оÑ?Ñ?ановлен. Ð?Ñ?беÑ?иÑ?е <i>Ð?апÑ?Ñ?к</i> из менÑ? Vidalia длÑ? запÑ?Ñ?ка Tor."
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgstr ""
+"Tor оÑ?Ñ?ановлен. Ð?Ñ?беÑ?иÑ?е <i>Ð?апÑ?Ñ?к</i> из менÑ? Vidalia длÑ? запÑ?Ñ?ка Tor."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/running.html:76
@@ -160,8 +152,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 ""
@@ -178,11 +170,13 @@ msgstr "Tor в пÑ?оÑ?еÑ?Ñ?е завеÑ?Ñ?ениÑ?."
 #: 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> длÑ? более деÑ?алÑ?ной "
 "инÑ?оÑ?маÑ?ии о пÑ?облеме коÑ?оÑ?аÑ? Ñ?пÑ?овоÑ?иÑ?овала вÑ?Ñ?од."
+
+
diff --git a/ru/server.po b/ru/server.po
index 72d6527..0d77052 100644
--- a/ru/server.po
+++ b/ru/server.po
@@ -1,30 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-24 09:58+0200\n"
-"Last-Translator: euneko <euneko@xxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/server.html:16
@@ -78,13 +67,13 @@ 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 ""
 "РеÑ?иÑ?е какой Ñ?ип запÑ?Ñ?ка вам нÑ?жен, обÑ?Ñ?нÑ?й Ñ?ежим Tor или Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Ñ?ипа "
 "<i>Ð?оÑ?Ñ?</i>(Tor 0.2.0.8-alpha или более новаÑ?). Ð?еÑ?енапÑ?авление в Ñ?ежиме "
-"моÑ?Ñ? помогаеÑ? Ñ?ем полÑ?зоваÑ?елÑ?м Tor Ñ? кого заблокиÑ?ована возможноÑ?Ñ?Ñ? доÑ?Ñ?Ñ?па "
-"напÑ?Ñ?мÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?и Tor.  УÑ?Ñ?ановиÑ?е Ñ?лажок <i>Ð?еÑ?енапÑ?авление "
+"моÑ?Ñ? помогаеÑ? Ñ?ем полÑ?зоваÑ?елÑ?м Tor Ñ? кого заблокиÑ?ована возможноÑ?Ñ?Ñ? доÑ?Ñ?Ñ?па"
+" напÑ?Ñ?мÑ?Ñ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?и Tor.  УÑ?Ñ?ановиÑ?е Ñ?лажок <i>Ð?еÑ?енапÑ?авление "
 "Ñ?Ñ?аÑ?ика Ñ?еÑ?ез Ñ?еÑ?Ñ? Tor</i> еÑ?ли Ñ?оÑ?иÑ?е обÑ?Ñ?ное пеÑ?енапÑ?авление Tor или "
 "<i>Ð?омоÑ?Ñ? заблокиÑ?ованнÑ?м полÑ?зоваÑ?елÑ?м полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п к Ñ?еÑ?и Tor</i> еÑ?ли "
 "Ñ?оÑ?иÑ?е пеÑ?енапÑ?авление в Ñ?ежиме моÑ?Ñ?а."
@@ -120,21 +109,21 @@ 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 ""
-"<b>Ð?оÑ?Ñ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а</b>: Ð?оÑ?Ñ? коÑ?оÑ?Ñ?й бÑ?деÑ? ожидаÑ?Ñ? Ñ?оединениÑ? оÑ? клиенÑ?ов "
-"или дÑ?Ñ?гиÑ? Tor Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ов."
+"<b>Ð?оÑ?Ñ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а</b>: Ð?оÑ?Ñ? коÑ?оÑ?Ñ?й бÑ?деÑ? ожидаÑ?Ñ? Ñ?оединениÑ? оÑ? клиенÑ?ов"
+" или дÑ?Ñ?гиÑ? Tor Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ов."
 
 #. 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 ""
 "Ð?Ñ?ли вÑ? Ñ?оÑ?иÑ?е зеÑ?кало диÑ?екÑ?оÑ?ии Tor Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а длÑ? дÑ?Ñ?гиÑ? в Ñ?еÑ?и "
 "пÑ?овеÑ?Ñ?Ñ?е Ñ?лажок в наÑ?Ñ?Ñ?ойкаÑ? <i>Ð?еÑ?калo диÑ?екÑ?оÑ?ии Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а</i> .EÑ?ли "
@@ -159,8 +148,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 ""
 "Ð?апÑ?Ñ?к Tor в Ñ?ежиме пеÑ?енапÑ?авлениÑ? возможно поÑ?Ñ?ебÑ?еÑ? болÑ?Ñ?Ñ?Ñ? пÑ?опÑ?Ñ?кнÑ?Ñ? "
 "Ñ?поÑ?обноÑ?Ñ?Ñ?; как ни бÑ?ло Tor позволÑ?еÑ? огÑ?аниÑ?иваÑ?Ñ? пÑ?опÑ?Ñ?кнÑ?Ñ? Ñ?поÑ?обноÑ?Ñ?Ñ?, "
@@ -188,11 +177,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 ""
@@ -203,30 +192,30 @@ msgstr ""
 "обеÑ?пеÑ?иваеÑ? долгоÑ?Ñ?оÑ?нÑ?е Ñ?Ñ?едние в Ñ?о же вÑ?емÑ? позволÑ?Ñ? Ñ?велиÑ?иÑ?Ñ? Ñ?Ñ?аÑ?ик в "
 "Ñ?аÑ?Ñ? пик еÑ?ли Ñ?Ñ?еднÑ?Ñ? не бÑ?ла доÑ?Ñ?игнÑ?Ñ?а за поÑ?леднее вÑ?емÑ?.Ð?Ñ?ли ваÑ?е "
 "Ñ?Ñ?еднее знаÑ?ение Ñ?акое же как <i>макÑ?ималÑ?ное знаÑ?ение</i>,Ñ?огда Tor не "
-"бÑ?деÑ? пÑ?евÑ?Ñ?аÑ?Ñ? Ñ?казанного знаÑ?ениÑ?.Ð?аÑ?е <i>макÑ?ималÑ?ное знаÑ?ение</i> должно "
-"вÑ?егда бÑ?Ñ?Ñ? Ñ?квиваленÑ?но либо болÑ?Ñ?е Ñ?ем ваÑ?е <i>Ñ?Ñ?еднее знаÑ?ение</i>."
+"бÑ?деÑ? пÑ?евÑ?Ñ?аÑ?Ñ? Ñ?казанного знаÑ?ениÑ?.Ð?аÑ?е <i>макÑ?ималÑ?ное знаÑ?ение</i> должно"
+" вÑ?егда бÑ?Ñ?Ñ? Ñ?квиваленÑ?но либо болÑ?Ñ?е Ñ?ем ваÑ?е <i>Ñ?Ñ?еднее знаÑ?ение</i>."
 
 #. type: Content of: <html><body><p>
 #: 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 ""
 "<i>СÑ?еднее знаÑ?ение</i> Ñ?влÑ?еÑ?Ñ?Ñ? макÑ?ималÑ?ной долгоÑ?Ñ?оÑ?ной Ñ?Ñ?едней "
 "Ñ?азÑ?еÑ?енной пÑ?опÑ?Ñ?кной Ñ?поÑ?обноÑ?Ñ?Ñ?Ñ? (в килобайÑ?аÑ? в Ñ?екÑ?ндÑ?). Ð?апÑ?имеÑ?, вÑ? "
-"можеÑ?е вÑ?бÑ?аÑ?Ñ? 2 мегабайÑ? в Ñ?екÑ?ндÑ? (2048 Ð?б / Ñ?), или 50 килобайÑ? в Ñ?екÑ?ндÑ? "
-"(Ñ?Ñ?едней Ñ?коÑ?оÑ?Ñ?и кабелÑ?ного Ñ?оединениÑ?). Tor Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? не менее 20 "
+"можеÑ?е вÑ?бÑ?аÑ?Ñ? 2 мегабайÑ? в Ñ?екÑ?ндÑ? (2048 Ð?б / Ñ?), или 50 килобайÑ? в Ñ?екÑ?ндÑ?"
+" (Ñ?Ñ?едней Ñ?коÑ?оÑ?Ñ?и кабелÑ?ного Ñ?оединениÑ?). Tor Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? не менее 20 "
 "килобайÑ? в Ñ?екÑ?ндÑ?, Ñ?Ñ?обÑ? запÑ?Ñ?Ñ?иÑ?Ñ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?."
 
 #. 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>."
@@ -234,8 +223,8 @@ msgstr ""
 "Ð?ажно Ñ?помÑ?нÑ?Ñ?Ñ? Ñ?о Ñ?Ñ?о Tor иÑ?полÑ?зÑ?еÑ? длÑ? меÑ?Ñ? пÑ?опÑ?Ñ?кной Ñ?поÑ?обноÑ?Ñ?и "
 "<b>байÑ?Ñ?</b> а не биÑ?Ñ?.Так же Tor Ñ?ледиÑ? за вÑ?одÑ?Ñ?ими байÑ?ами вмеÑ?Ñ?о "
 "иÑ?Ñ?одÑ?Ñ?иÑ?.Ð?апÑ?имеÑ?, еÑ?ли ваÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Ñ?абоÑ?аеÑ? как зеÑ?кало диÑ?екÑ?оÑ?ии "
-"Ñ?коÑ?ее вÑ?его иÑ?Ñ?одÑ?Ñ?его Ñ?Ñ?аÑ?ика бÑ?деÑ? болÑ?Ñ?е Ñ?ем вÑ?одÑ?Ñ?его.Ð?Ñ?ли окажеÑ?Ñ?Ñ? Ñ?Ñ?о "
-"Ñ?Ñ?о Ñ?оздаеÑ? болÑ?Ñ?Ñ?Ñ? нагÑ?Ñ?зкÑ? на ваÑ?Ñ? пÑ?опÑ?Ñ?кнÑ?Ñ? Ñ?поÑ?обноÑ?Ñ?Ñ? вам Ñ?ледÑ?еÑ? "
+"Ñ?коÑ?ее вÑ?его иÑ?Ñ?одÑ?Ñ?его Ñ?Ñ?аÑ?ика бÑ?деÑ? болÑ?Ñ?е Ñ?ем вÑ?одÑ?Ñ?его.Ð?Ñ?ли окажеÑ?Ñ?Ñ? Ñ?Ñ?о"
+" Ñ?Ñ?о Ñ?оздаеÑ? болÑ?Ñ?Ñ?Ñ? нагÑ?Ñ?зкÑ? на ваÑ?Ñ? пÑ?опÑ?Ñ?кнÑ?Ñ? Ñ?поÑ?обноÑ?Ñ?Ñ? вам Ñ?ледÑ?еÑ? "
 "оÑ?клÑ?Ñ?иÑ?Ñ? опÑ?иÑ? <i>Ð?еÑ?кало диÑ?екÑ?оÑ?ии Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а</i>."
 
 #. type: Content of: <html><body>
@@ -285,8 +274,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 ""
 "Ð?лÑ? полной Ñ?Ñ?ноÑ?Ñ?и ,Ñ?ледÑ?Ñ?Ñ?аÑ? Ñ?аблиÑ?а номеÑ?ов поÑ?Ñ?ов пÑ?едÑ?Ñ?авлÑ?еÑ? каждÑ?й "
 "Ñ?лажок огÑ?аниÑ?ениÑ? вÑ?Ñ?ода.СÑ?олбеÑ? <b>Ð?пиÑ?ание</b> опиÑ?Ñ?ваеÑ? Ñ?еÑ?Ñ?Ñ?Ñ?Ñ? коÑ?оÑ?Ñ?е "
@@ -365,7 +354,8 @@ msgstr "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888"
 
 #. 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 ""
 "Ð?бмен мгновеннÑ?ми Ñ?ообÑ?ениÑ?ми Ñ?акие как MSN Messenger, AIM, ICQ, и Jabber"
 
@@ -439,16 +429,16 @@ 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 ""
 "Ð?олÑ?Ñ?инÑ?Ñ?во домаÑ?ниÑ? полÑ?зоваÑ?елей Ñ?оединÑ?Ñ?Ñ?Ñ?Ñ? Ñ? инÑ?еÑ?неÑ?ом Ñ?еÑ?ез "
 "<i>маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?</i>, коÑ?оÑ?Ñ?й позволÑ?еÑ? неÑ?колÑ?ким компÑ?Ñ?Ñ?еÑ?ам в локалÑ?ной "
-"Ñ?еÑ?и имеÑ?Ñ? доÑ?Ñ?Ñ?п Ñ?еÑ?ез одно Ñ?оединение в инÑ?еÑ?неÑ?.Ð?екоÑ?оÑ?Ñ?е могÑ?Ñ? наÑ?одиÑ?Ñ?Ñ? "
-"за бÑ?андмаÑ?Ñ?Ñ?ом коÑ?оÑ?Ñ?й блокиÑ?Ñ?еÑ? вÑ?одÑ?Ñ?ие Ñ?оединениÑ? к ваÑ?емÑ? компÑ?Ñ?Ñ?еÑ?Ñ? "
+"Ñ?еÑ?и имеÑ?Ñ? доÑ?Ñ?Ñ?п Ñ?еÑ?ез одно Ñ?оединение в инÑ?еÑ?неÑ?.Ð?екоÑ?оÑ?Ñ?е могÑ?Ñ? наÑ?одиÑ?Ñ?Ñ?"
+" за бÑ?андмаÑ?Ñ?Ñ?ом коÑ?оÑ?Ñ?й блокиÑ?Ñ?еÑ? вÑ?одÑ?Ñ?ие Ñ?оединениÑ? к ваÑ?емÑ? компÑ?Ñ?Ñ?еÑ?Ñ? "
 "дÑ?Ñ?гим компÑ?Ñ?Ñ?еÑ?ам в Ñ?еÑ?и инÑ?еÑ?неÑ?.Ð?ак бÑ? ни бÑ?ло длÑ? Ñ?абоÑ?Ñ? Tor "
 "Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а необÑ?одимо Ñ?Ñ?об дÑ?Ñ?гие клиенÑ?Ñ? Tor имели возможноÑ?Ñ?Ñ? "
 "подклÑ?Ñ?аÑ?Ñ?Ñ? к ваÑ?емÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? Ñ?еÑ?ез домаÑ?ний маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ? либо "
@@ -467,16 +457,16 @@ msgstr ""
 "бÑ?андмаÑ?Ñ?Ñ? должен знаÑ?Ñ? какие поÑ?Ñ?Ñ? ваÑ?его компÑ?Ñ?Ñ?еÑ?а Ñ?ледÑ?еÑ? Ñ?азÑ?еÑ?иÑ?Ñ? на "
 "доÑ?Ñ?Ñ?п из вне обÑ?Ñ?но даннаÑ? опÑ?иÑ? в наÑ?Ñ?Ñ?ойкаÑ? имееÑ? название "
 "<i>пеÑ?енапÑ?авление поÑ?Ñ?ов</i>(port forwarding).Ð?еÑ?енапÑ?авление поÑ?Ñ?ов "
-"наÑ?Ñ?Ñ?аиваеÑ?Ñ?Ñ? в ваÑ?ем маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?е или бÑ?андмаÑ?Ñ?Ñ?е на пеÑ?енапÑ?авление вÑ?еÑ? "
-"Ñ?оединений на опÑ?еделеннÑ?е поÑ?Ñ?Ñ? пеÑ?енапÑ?авлÑ?Ñ? Ñ?оединение Ñ? маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?а "
+"наÑ?Ñ?Ñ?аиваеÑ?Ñ?Ñ? в ваÑ?ем маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?е или бÑ?андмаÑ?Ñ?Ñ?е на пеÑ?енапÑ?авление вÑ?еÑ?"
+" Ñ?оединений на опÑ?еделеннÑ?е поÑ?Ñ?Ñ? пеÑ?енапÑ?авлÑ?Ñ? Ñ?оединение Ñ? маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?а "
 "или бÑ?андмаÑ?Ñ?Ñ?а на поÑ?Ñ?Ñ? ваÑ?его компÑ?Ñ?Ñ?еÑ?а."
 
 #. type: Content of: <html><body><p>
 #: 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."
@@ -499,8 +489,8 @@ 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/\";>http://192.168.0.1</a> or <a "
-"href=\"http://192.168.1.1/\";>http://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/\";>http://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
 "Ð?Ñ?ли поÑ?ле нажаÑ?иÑ? кнопки <i>ТеÑ?Ñ?</i> Vidalia не Ñ?могла наÑ?Ñ?Ñ?оиÑ?Ñ? "
 "пеÑ?енапÑ?авление поÑ?Ñ?а, возможно вам поÑ?Ñ?ебÑ?еÑ?Ñ?Ñ? вклÑ?Ñ?иÑ?Ñ? Ñ?Ñ?Ñ? наÑ?Ñ?Ñ?ойкÑ? в "
@@ -517,8 +507,8 @@ msgstr ""
 #: 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\";> "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" 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 "
@@ -526,11 +516,13 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
-"Ð?Ñ?ли вам Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? Ñ?Ñ?Ñ?наÑ? наÑ?Ñ?Ñ?ойка пеÑ?енапÑ?авление поÑ?Ñ?а ,вебÑ?айÑ? <a href=\""
-"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";> "
-"portforward.com</a> Ñ?одеÑ?жиÑ? инÑ?Ñ?Ñ?Ñ?кÑ?ии по наÑ?Ñ?Ñ?ойке пеÑ?енапÑ?авлениÑ? поÑ?Ñ?ов "
-"болÑ?Ñ?инÑ?Ñ?во Ñ?ипов маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?ов и бÑ?андмаÑ?Ñ?Ñ?ов.Ð?инималÑ?но вам нÑ?жно "
+"Ð?Ñ?ли вам Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? Ñ?Ñ?Ñ?наÑ? наÑ?Ñ?Ñ?ойка пеÑ?енапÑ?авление поÑ?Ñ?а ,вебÑ?айÑ? <a "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" portforward.com</a> Ñ?одеÑ?жиÑ? инÑ?Ñ?Ñ?Ñ?кÑ?ии по наÑ?Ñ?Ñ?ойке пеÑ?енапÑ?авлениÑ? поÑ?Ñ?ов"
+" болÑ?Ñ?инÑ?Ñ?во Ñ?ипов маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?ов и бÑ?андмаÑ?Ñ?Ñ?ов.Ð?инималÑ?но вам нÑ?жно "
 "пеÑ?енапÑ?авиÑ?Ñ? <i>Ð?оÑ?Ñ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а</i>, по Ñ?молÑ?аниÑ? поÑ?Ñ? 443 в Ñ?иÑ?Ñ?еме "
 "Windows и 9001 на дÑ?Ñ?гиÑ? опеÑ?аÑ?ионнÑ?Ñ? Ñ?иÑ?Ñ?емаÑ?.Ð?Ñ?ли Ñ? ваÑ? Ñ?Ñ?Ñ?ановлен Ñ?лажок "
 "на опÑ?ии <i>Ð?еÑ?кало диÑ?екÑ?оÑ?ии Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а</i>, вам нÑ?жно пеÑ?енапÑ?авиÑ?Ñ? "
 "<i>Ð?оÑ?Ñ? диÑ?екÑ?оÑ?ии</i>.Ð?о Ñ?молÑ?аниÑ? на вÑ?еÑ? опеÑ?аÑ?ионнÑ?Ñ? Ñ?иÑ?Ñ?ема поÑ?Ñ? 9030."
+
+
diff --git a/ru/services.po b/ru/services.po
index b6f478e..46d4797 100644
--- a/ru/services.po
+++ b/ru/services.po
@@ -1,30 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-09-24 08:59+0200\n"
-"Last-Translator: euneko <euneko@xxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/services.html:16
@@ -112,13 +101,12 @@ 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 ""
 "Ð?а вебÑ?айÑ?е Tor еÑ?Ñ?Ñ? замеÑ?аÑ?елÑ?ное Ñ?Ñ?ководÑ?Ñ?во "
-"(https://www.torproject.org/docs/tor-hidden-service.html) опиÑ?анное по Ñ?агам "
-"более деÑ?алÑ?но."
+"(https://www.torproject.org/docs/tor-hidden-service.html) опиÑ?анное по Ñ?агам"
+" более деÑ?алÑ?но."
 
 #. type: Content of: <html><body>
 #: en/services.html:55
@@ -143,35 +131,35 @@ 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 ""
 "Onion адÑ?еÑ? (генеÑ?иÑ?Ñ?емÑ?й):СеÑ?виÑ? (или onion) адÑ?еÑ? генеÑ?иÑ?Ñ?еÑ?Ñ?Ñ? Tor длÑ? "
 "Ñ?никалÑ?ной иденÑ?иÑ?икаÑ?ии ваÑ?его Ñ?еÑ?виÑ?а.Ð?айÑ?е Ñ?Ñ?оÑ? onion адÑ?еÑ? лÑ?дÑ?м кÑ?о "
 "должен имеÑ?Ñ? доÑ?Ñ?Ñ?п к ваÑ?емÑ? Ñ?еÑ?виÑ?Ñ?. Ð?лÑ? Ñ?Ñ?ого вÑ? можеÑ?е воÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? "
-"\"СкопиÑ?оваÑ?Ñ? в бÑ?Ñ?еÑ? обмена\" кнопкой Ñ?Ñ?об избежаÑ?Ñ? опеÑ?аÑ?ки.Ð?Ñ?ли вÑ? Ñ?олÑ?ко "
-"Ñ?Ñ?о Ñ?оздали Ñ?кÑ?Ñ?Ñ?Ñ?й Ñ?еÑ?виÑ? , в поле бÑ?деÑ? \"[Создано Tor]\"; Ñ?Ñ?об оÑ?обÑ?азиÑ?Ñ? "
-"наÑ?Ñ?оÑ?Ñ?ий onion адÑ?еÑ? , вам нÑ?жно Ñ?оÑ?Ñ?аниÑ?Ñ? конÑ?игÑ?Ñ?аÑ?иÑ? и оÑ?кÑ?Ñ?Ñ?Ñ? вновÑ? "
-"окно наÑ?Ñ?Ñ?оек."
+"\"СкопиÑ?оваÑ?Ñ? в бÑ?Ñ?еÑ? обмена\" кнопкой Ñ?Ñ?об избежаÑ?Ñ? опеÑ?аÑ?ки.Ð?Ñ?ли вÑ? Ñ?олÑ?ко"
+" Ñ?Ñ?о Ñ?оздали Ñ?кÑ?Ñ?Ñ?Ñ?й Ñ?еÑ?виÑ? , в поле бÑ?деÑ? \"[Создано Tor]\"; Ñ?Ñ?об "
+"оÑ?обÑ?азиÑ?Ñ? наÑ?Ñ?оÑ?Ñ?ий onion адÑ?еÑ? , вам нÑ?жно Ñ?оÑ?Ñ?аниÑ?Ñ? конÑ?игÑ?Ñ?аÑ?иÑ? и "
+"оÑ?кÑ?Ñ?Ñ?Ñ? вновÑ? окно наÑ?Ñ?Ñ?оек."
 
 #. 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."
 msgstr ""
 "Ð?иÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ? (обÑ?заÑ?елÑ?но):ЭÑ?о TCP поÑ?Ñ? коÑ?оÑ?Ñ?й нÑ?жен клиенÑ?Ñ? длÑ? "
-"доÑ?Ñ?Ñ?па к ваÑ?емÑ? Ñ?еÑ?виÑ?Ñ?. Ð?бÑ?Ñ?но вам поÑ?Ñ?ебÑ?еÑ?Ñ?Ñ? иÑ?полÑ?зоваÑ?Ñ? "
-"Ñ?еÑ?виÑ?о-Ñ?пеÑ?иÑ?иÑ?нÑ?й поÑ?Ñ? как напÑ?имеÑ? поÑ?Ñ? 80 длÑ? HTTP. Ð?бÑ?аÑ?иÑ?е внимание, "
-"Ñ?Ñ?о виÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ? обÑ?Ñ?но не имееÑ? ниÑ?его обÑ?его Ñ? наÑ?Ñ?Ñ?ойками "
-"бÑ?андмаÑ?Ñ?Ñ?а, поÑ?колÑ?кÑ? он иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? Ñ?олÑ?ко длÑ? внÑ?Ñ?Ñ?енней Ñ?абоÑ?Ñ? Tor."
+"доÑ?Ñ?Ñ?па к ваÑ?емÑ? Ñ?еÑ?виÑ?Ñ?. Ð?бÑ?Ñ?но вам поÑ?Ñ?ебÑ?еÑ?Ñ?Ñ? иÑ?полÑ?зоваÑ?Ñ? Ñ?еÑ?виÑ?о-"
+"Ñ?пеÑ?иÑ?иÑ?нÑ?й поÑ?Ñ? как напÑ?имеÑ? поÑ?Ñ? 80 длÑ? HTTP. Ð?бÑ?аÑ?иÑ?е внимание, Ñ?Ñ?о "
+"виÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ? обÑ?Ñ?но не имееÑ? ниÑ?его обÑ?его Ñ? наÑ?Ñ?Ñ?ойками бÑ?андмаÑ?Ñ?Ñ?а, "
+"поÑ?колÑ?кÑ? он иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? Ñ?олÑ?ко длÑ? внÑ?Ñ?Ñ?енней Ñ?абоÑ?Ñ? Tor."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:73
@@ -186,10 +174,10 @@ msgid ""
 msgstr ""
 "Ð?дÑ?еÑ? назнаÑ?ениÑ? (опÑ?ионалÑ?но): Ð?бÑ?Ñ?но вам нÑ?жно Ñ?Ñ?обÑ? Tor пеÑ?енапÑ?авлÑ?л "
 "ваÑ?и запÑ?оÑ?Ñ? Ñ?оединениÑ? на локалÑ?нÑ?й адÑ?еÑ? (localhost) Ñ? дÑ?Ñ?гим поÑ?Ñ?ом "
-"нежели Ñ?ем Ñ?казаннÑ?м в \"Ð?иÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ?\". Ð?оÑ?Ñ?омÑ? вÑ? можеÑ?е Ñ?казаÑ?Ñ? адÑ?еÑ? "
-"назнаÑ?ениÑ? Ñ?Ñ?о Ñ?изиÑ?еÑ?кий адÑ?еÑ? и поÑ?Ñ? в коÑ?оÑ?ом бÑ?деÑ? Ñ?одеÑ?жаÑ?Ñ?Ñ? запÑ?оÑ?Ñ? на "
-"ваÑ? Ñ?кÑ?Ñ?Ñ?Ñ?й Ñ?еÑ?виÑ? и пеÑ?енапÑ?авленÑ? напÑ?имеÑ? localhost:5222(или лÑ?бой поÑ?Ñ? "
-"коÑ?оÑ?Ñ?й ожидаеÑ? Ñ?оединениÑ? на ваÑ?ем Ñ?еÑ?веÑ?е ).Ð?Ñ?ли вÑ? не Ñ?казали Ñ?ели "
+"нежели Ñ?ем Ñ?казаннÑ?м в \"Ð?иÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ?\". Ð?оÑ?Ñ?омÑ? вÑ? можеÑ?е Ñ?казаÑ?Ñ? адÑ?еÑ?"
+" назнаÑ?ениÑ? Ñ?Ñ?о Ñ?изиÑ?еÑ?кий адÑ?еÑ? и поÑ?Ñ? в коÑ?оÑ?ом бÑ?деÑ? Ñ?одеÑ?жаÑ?Ñ?Ñ? запÑ?оÑ?Ñ? "
+"на ваÑ? Ñ?кÑ?Ñ?Ñ?Ñ?й Ñ?еÑ?виÑ? и пеÑ?енапÑ?авленÑ? напÑ?имеÑ? localhost:5222(или лÑ?бой "
+"поÑ?Ñ? коÑ?оÑ?Ñ?й ожидаеÑ? Ñ?оединениÑ? на ваÑ?ем Ñ?еÑ?веÑ?е ).Ð?Ñ?ли вÑ? не Ñ?казали Ñ?ели "
 "назнаÑ?ениÑ? , Tor бÑ?деÑ? пеÑ?енапÑ?авлÑ?Ñ?Ñ? запÑ?оÑ?Ñ? на поÑ?Ñ? Ñ?казаннÑ?й в "
 "\"Ð?иÑ?Ñ?Ñ?алÑ?нÑ?й поÑ?Ñ?\" на локалÑ?нÑ?й адÑ?еÑ? (localhost)."
 
@@ -210,12 +198,12 @@ msgid ""
 "location, enable the service again, and save the new configuration."
 msgstr ""
 "Ð?иÑ?екÑ?оÑ?иÑ? Ñ?еÑ?виÑ?а (обÑ?заÑ?елÑ?но): Tor нÑ?жно Ñ?Ñ?аниÑ?Ñ? некоÑ?оÑ?Ñ?е Ñ?айлÑ? длÑ? "
-"Ñ?кÑ?Ñ?Ñ?ого Ñ?еÑ?виÑ?а в оÑ?делÑ?ной диÑ?екÑ?оÑ?ии Ñ?акие как клÑ?Ñ?и (private key) и Ñ?айл "
-"(hostname)Ñ?одеÑ?жаÑ?ий onion адÑ?еÑ?а.ЭÑ?оÑ? каÑ?алог должен бÑ?Ñ?Ñ? оÑ?лиÑ?нÑ?м оÑ? "
+"Ñ?кÑ?Ñ?Ñ?ого Ñ?еÑ?виÑ?а в оÑ?делÑ?ной диÑ?екÑ?оÑ?ии Ñ?акие как клÑ?Ñ?и (private key) и Ñ?айл"
+" (hostname)Ñ?одеÑ?жаÑ?ий onion адÑ?еÑ?а.ЭÑ?оÑ? каÑ?алог должен бÑ?Ñ?Ñ? оÑ?лиÑ?нÑ?м оÑ? "
 "каÑ?алога,Ñ?одеÑ?жимое коÑ?оÑ?ого пÑ?едоÑ?Ñ?авлÑ?еÑ? Ñ?еÑ?виÑ?.ХоÑ?оÑ?им меÑ?Ñ?ом длÑ? Ñ?еÑ?виÑ? "
-"диÑ?екÑ?оÑ?ии бÑ?деÑ? Ñ?Ñ?б диÑ?екÑ?оÑ?иÑ? в диÑ?екÑ?оÑ?ии даннÑ?Ñ? Tor.-- Ð?бÑ?аÑ?иÑ?е внимание "
-"на Ñ?о Ñ?Ñ?о вÑ? не Ñ?можеÑ?е Ñ?мениÑ?Ñ? каÑ?алог во вÑ?емÑ? Ñ?абоÑ?Ñ? Ñ?еÑ?виÑ?а(Ñ?Ñ?о оÑ?обо и "
-"не имееÑ? Ñ?мÑ?Ñ?ла Ñ?ак как Vidalia не Ñ?можеÑ? пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?айлÑ? на ваÑ?ем "
+"диÑ?екÑ?оÑ?ии бÑ?деÑ? Ñ?Ñ?б диÑ?екÑ?оÑ?иÑ? в диÑ?екÑ?оÑ?ии даннÑ?Ñ? Tor.-- Ð?бÑ?аÑ?иÑ?е внимание"
+" на Ñ?о Ñ?Ñ?о вÑ? не Ñ?можеÑ?е Ñ?мениÑ?Ñ? каÑ?алог во вÑ?емÑ? Ñ?абоÑ?Ñ? Ñ?еÑ?виÑ?а(Ñ?Ñ?о оÑ?обо и"
+" не имееÑ? Ñ?мÑ?Ñ?ла Ñ?ак как Vidalia не Ñ?можеÑ? пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?айлÑ? на ваÑ?ем "
 "жеÑ?Ñ?ком диÑ?ке!) Ð?Ñ?ли вÑ? Ñ?оÑ?иÑ?е пеÑ?емеÑ?Ñ?иÑ?Ñ? Ñ?айлÑ? Ñ?кÑ?Ñ?Ñ?ого Ñ?еÑ?виÑ?а в дÑ?Ñ?гÑ?Ñ? "
 "диÑ?екÑ?оÑ?иÑ?,пожалÑ?йÑ?Ñ?а, вÑ?полниÑ?е Ñ?ледÑ?Ñ?Ñ?ие дейÑ?Ñ?виÑ?: Ð?аÑ?ниÑ?е Ñ? запÑ?еÑ?а "
 "Ñ?еÑ?виÑ?а в Vidalia и Ñ?оÑ?Ñ?аниÑ?е конÑ?игÑ?Ñ?аÑ?иÑ?. Ð? Ñ?олÑ?ко Ñ?огда пеÑ?емеÑ?айÑ?е "
@@ -226,9 +214,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 ""
 "Ð?клÑ?Ñ?ен(Enabled): Ð?Ñ?ли Ñ?Ñ?оÑ? Ñ?лажок вÑ?клÑ?Ñ?ен,Vidalia не бÑ?деÑ? наÑ?Ñ?Ñ?аиваÑ?Ñ? "
 "Ñ?Ñ?оÑ? Ñ?кÑ?Ñ?Ñ?Ñ?й Ñ?еÑ?виÑ? в Tor. ЭÑ?о можеÑ? бÑ?Ñ?Ñ? полезнÑ?м длÑ? Ñ?оÑ?Ñ?анениÑ? на даннÑ?й "
@@ -253,8 +241,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 ""
 "УдалиÑ?Ñ? Ñ?еÑ?виÑ?:Ð?олноÑ?Ñ?Ñ?Ñ? Ñ?далиÑ?Ñ? конÑ?игÑ?Ñ?аÑ?иÑ? Ñ?кÑ?Ñ?Ñ?ого Ñ?еÑ?виÑ?а. (Ð?Ñ?ли вÑ? "
 "желаеÑ?е Ñ?далиÑ?Ñ? вÑ?еменно Ñ?еÑ?виÑ?,Ñ?нимиÑ?е Ñ?лажок.)"
@@ -288,26 +276,26 @@ 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 ""
 "Tor позволÑ?еÑ? наÑ?Ñ?Ñ?оиÑ?Ñ? многа Ñ?пеÑ?иÑ?иÑ?нÑ?Ñ? наÑ?Ñ?Ñ?оек длÑ? Ñ?кÑ?Ñ?Ñ?Ñ?Ñ? Ñ?еÑ?виÑ?ов "
 "напÑ?имеÑ? заÑ?Ñ?авиÑ?Ñ? иÑ?полÑ?зоваÑ?Ñ? (или избежаниÑ?) некоÑ?оÑ?Ñ?Ñ? Ñ?злов как Ñ?оÑ?ки "
-"знакомÑ?Ñ?в (introduction points) или пÑ?именение неÑ?колÑ?киÑ? виÑ?Ñ?Ñ?алÑ?нÑ?Ñ? поÑ?Ñ?ов "
-"длÑ? одной и Ñ?ой же Ñ?лÑ?жбÑ?."
+"знакомÑ?Ñ?в (introduction points) или пÑ?именение неÑ?колÑ?киÑ? виÑ?Ñ?Ñ?алÑ?нÑ?Ñ? поÑ?Ñ?ов"
+" длÑ? одной и Ñ?ой же Ñ?лÑ?жбÑ?."
 
 #. type: Content of: <html><body><p>
 #: en/services.html:128
 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 ""
-"Ð?ак бÑ? ни бÑ?ло , вÑ? Ñ?еÑ?аеÑ?е Ñ?пÑ?оÑ?Ñ?иÑ?Ñ? наÑ?Ñ?Ñ?ойкÑ? Ñ? Vidalia и пÑ?именÑ?Ñ?Ñ? Ñ?олÑ?ко "
-"болÑ?Ñ?инÑ?Ñ?во обÑ?иÑ? наÑ?Ñ?Ñ?оек. Ð?Ñ?ли же Ñ?Ñ?ебÑ?Ñ?Ñ?Ñ?Ñ? Ñ?аÑ?Ñ?иÑ?еннÑ?е наÑ?Ñ?Ñ?ойки иÑ? "
+"Ð?ак бÑ? ни бÑ?ло , вÑ? Ñ?еÑ?аеÑ?е Ñ?пÑ?оÑ?Ñ?иÑ?Ñ? наÑ?Ñ?Ñ?ойкÑ? Ñ? Vidalia и пÑ?именÑ?Ñ?Ñ? Ñ?олÑ?ко"
+" болÑ?Ñ?инÑ?Ñ?во обÑ?иÑ? наÑ?Ñ?Ñ?оек. Ð?Ñ?ли же Ñ?Ñ?ебÑ?Ñ?Ñ?Ñ?Ñ? Ñ?аÑ?Ñ?иÑ?еннÑ?е наÑ?Ñ?Ñ?ойки иÑ? "
 "пÑ?идеÑ?Ñ?Ñ? наÑ?Ñ?Ñ?аиваÑ?Ñ? в Ñ?айле torrc Tor. Vidalia не бÑ?деÑ? Ñ?далÑ?Ñ?Ñ? Ñ?Ñ?и "
 "наÑ?Ñ?Ñ?ойки даже еÑ?ли вÑ? Ñ?едакÑ?иÑ?Ñ?еÑ?е ваÑ?и Ñ?кÑ?Ñ?Ñ?Ñ?е Ñ?еÑ?виÑ?Ñ?.Ð?Ñ?ли Ñ?казаÑ?Ñ? "
 "неÑ?колÑ?ко виÑ?Ñ?Ñ?алÑ?нÑ?Ñ? поÑ?Ñ?ов, Ñ?олÑ?ко пеÑ?вÑ?е бÑ?дÑ?Ñ? показанÑ? и доÑ?Ñ?Ñ?пнÑ? длÑ? "
@@ -337,3 +325,5 @@ msgstr ""
 "Ñ?кÑ?Ñ?Ñ?Ñ?м Ñ?еÑ?виÑ?ам ,набеÑ?иÑ?е адÑ?еÑ? onion Ñ?еÑ?виÑ?а в ваÑ?ем пÑ?оводнике (или "
 "Ñ?ооÑ?веÑ?Ñ?Ñ?вÑ?Ñ?Ñ?ем клиенÑ?Ñ?комÑ? пÑ?иложениÑ? еÑ?ли Ñ?Ñ?о не веб Ñ?еÑ?виÑ?) и Tor и вÑ?е "
 "оÑ?Ñ?алÑ?ное Ñ?делаеÑ? за ваÑ?. Ð?лÑ? Ñ?Ñ?ого неÑ? нÑ?ждÑ? Ñ?пеÑ?иалÑ?но наÑ?Ñ?Ñ?аиваÑ?Ñ? Tor."
+
+
diff --git a/ru/troubleshooting.po b/ru/troubleshooting.po
index cc642a2..92870de 100644
--- a/ru/troubleshooting.po
+++ b/ru/troubleshooting.po
@@ -1,30 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: 2010-09-24 09:54+0200\n"
-"Last-Translator: euneko <euneko@xxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 # type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
@@ -41,8 +30,8 @@ msgid ""
 msgstr ""
 "Ð?иже пеÑ?еÑ?иÑ?ленÑ? некоÑ?оÑ?Ñ?е Ñ?Ñ?Ñ?дноÑ?Ñ?и и вопÑ?оÑ?Ñ? Ñ? коÑ?оÑ?Ñ?ми Ñ?Ñ?олкнÑ?лиÑ?Ñ? лÑ?ди "
 "пÑ?и иÑ?полÑ?зовании пÑ?огÑ?аммÑ? Tor. Ð?Ñ?ли вÑ? не Ñ?могли найÑ?и Ñ?еÑ?ение ваÑ?ей "
-"пÑ?облемÑ?,пÑ?овеÑ?Ñ?Ñ?е наÑ? веб-Ñ?айÑ? <i>www.vidalia-project.net</i> длÑ? полÑ?Ñ?ениÑ? "
-"дополниÑ?елÑ?ной инÑ?оÑ?маÑ?ии и поддеÑ?жки. <a name=\"start\"/>"
+"пÑ?облемÑ?,пÑ?овеÑ?Ñ?Ñ?е наÑ? веб-Ñ?айÑ? <i>www.vidalia-project.net</i> длÑ? полÑ?Ñ?ениÑ?"
+" дополниÑ?елÑ?ной инÑ?оÑ?маÑ?ии и поддеÑ?жки. <a name=\"start\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:25
@@ -54,20 +43,20 @@ msgstr "Ð?е могÑ? запÑ?Ñ?Ñ?иÑ?Ñ? Tor"
 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 ""
-"Ð?аиболее веÑ?оÑ?Ñ?наÑ? пÑ?иÑ?ина Ñ?ого Ñ?Ñ?о Vidalia не можеÑ? запÑ?Ñ?Ñ?иÑ?Ñ? Tor в Ñ?ом Ñ?Ñ?о "
-"Vidalia пÑ?Ñ?аеÑ?Ñ?Ñ? найÑ?и Ñ?Ñ?Ñ?ановленнÑ?й Tor в невеÑ?ном каÑ?алоге.Ð?Ñ? можеÑ?е Ñ?вно "
-"Ñ?казаÑ?Ñ? Vidalia где наÑ?одиÑ?Ñ?Ñ? <i>иÑ?полнÑ?емÑ?й Ñ?айл Tor</i> в опÑ?иÑ?Ñ? <a "
+"Ð?аиболее веÑ?оÑ?Ñ?наÑ? пÑ?иÑ?ина Ñ?ого Ñ?Ñ?о Vidalia не можеÑ? запÑ?Ñ?Ñ?иÑ?Ñ? Tor в Ñ?ом Ñ?Ñ?о"
+" Vidalia пÑ?Ñ?аеÑ?Ñ?Ñ? найÑ?и Ñ?Ñ?Ñ?ановленнÑ?й Tor в невеÑ?ном каÑ?алоге.Ð?Ñ? можеÑ?е Ñ?вно"
+" Ñ?казаÑ?Ñ? Vidalia где наÑ?одиÑ?Ñ?Ñ? <i>иÑ?полнÑ?емÑ?й Ñ?айл Tor</i> в опÑ?иÑ?Ñ? <a "
 "href=\"config.html#general\">обÑ?иÑ? паÑ?амеÑ?Ñ?ов наÑ?Ñ?Ñ?ойки</a>."
 
 # 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 ""
 "Ð?Ñ?Ñ?гаÑ? возможнаÑ? пÑ?иÑ?ина когда Tor не запÑ?Ñ?каеÑ?Ñ?Ñ? в Ñ?ом Ñ?Ñ?о дÑ?Ñ?гой пÑ?оÑ?еÑ?Ñ? "
 "пÑ?огÑ?аммÑ? Tor Ñ?же Ñ?абоÑ?аеÑ?.Ð?Ñ?овеÑ?Ñ?Ñ?е Ñ?пиÑ?ок запÑ?Ñ?еннÑ?Ñ? пÑ?оÑ?еÑ?Ñ?ов и "
@@ -77,13 +66,13 @@ 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 ""
-"Ð?Ñ?ли Ñ?Ñ?о не помогло , пÑ?овеÑ?Ñ?Ñ?е <a href=\"log.html\">жÑ?Ñ?нал Ñ?ообÑ?ений</a> длÑ? "
-"пÑ?оÑ?моÑ?Ñ?а лÑ?бой инÑ?оÑ?маÑ?ии об оÑ?ибкаÑ? Ñ? коÑ?оÑ?Ñ?ми пÑ?огÑ?амма Tor Ñ?Ñ?олкнÑ?лаÑ?Ñ? "
-"пÑ?и запÑ?Ñ?ке."
+"Ð?Ñ?ли Ñ?Ñ?о не помогло , пÑ?овеÑ?Ñ?Ñ?е <a href=\"log.html\">жÑ?Ñ?нал Ñ?ообÑ?ений</a> "
+"длÑ? пÑ?оÑ?моÑ?Ñ?а лÑ?бой инÑ?оÑ?маÑ?ии об оÑ?ибкаÑ? Ñ? коÑ?оÑ?Ñ?ми пÑ?огÑ?амма Tor "
+"Ñ?Ñ?олкнÑ?лаÑ?Ñ? пÑ?и запÑ?Ñ?ке."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:43
@@ -97,7 +86,8 @@ msgstr "Vidalia не можеÑ? Ñ?оединиÑ?Ñ?Ñ? Ñ? Tor ."
 
 # 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 ""
 "Vidalia Ñ?пÑ?авлÑ?еÑ? Tor, обÑ?аÑ?Ñ?Ñ? Ñ? ним Ñ?еÑ?ез Tor <i>поÑ?Ñ? Ñ?пÑ?авлениÑ? </ I>."
 
@@ -120,9 +110,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 ""
 "Ð?Ñ?ли Tor ожидаеÑ? Ñ?оединениÑ? на поÑ?Ñ?Ñ? оÑ?лиÑ?ном оÑ? Ñ?ого Ñ? коÑ?оÑ?Ñ?м Vidalia "
 "пÑ?Ñ?аеÑ?Ñ?Ñ? Ñ?оединиÑ?Ñ?Ñ? ,Vidalia не Ñ?можеÑ? Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?оединение Ñ? Tor.Ð?ам "
@@ -156,8 +146,8 @@ msgstr ""
 "позволÑ?еÑ? Vidalia полÑ?Ñ?иÑ?Ñ? обновленнÑ?й Ñ?Ñ?аÑ?Ñ?Ñ? из Tor , новÑ?й запÑ?оÑ? "
 "иденÑ?иÑ?икаÑ?ии ,Ñ?конÑ?игÑ?Ñ?иÑ?оваÑ?Ñ? наÑ?Ñ?Ñ?ойки Tor и Ñ?д.Ð?аждÑ?й Ñ?аз Vidalia "
 "Ñ?оединÑ?Ñ?Ñ?Ñ? Ñ? Tor, Ñ?Ñ?Ñ?анавливаеÑ? Ñ?лÑ?Ñ?айнÑ?й паÑ?олÑ? на поÑ?Ñ? Ñ?пÑ?авлениÑ? Tor длÑ? "
-"пÑ?едоÑ?вÑ?аÑ?ениÑ? подклÑ?Ñ?ениÑ? дÑ?Ñ?гими пÑ?иложениÑ?ми к поÑ?Ñ?Ñ? Ñ?пÑ?авлениÑ? Ñ?ем Ñ?амÑ?м "
-"подвеÑ?гаÑ? опаÑ?ноÑ?Ñ?и ваÑ?Ñ? анонимноÑ?Ñ?Ñ?."
+"пÑ?едоÑ?вÑ?аÑ?ениÑ? подклÑ?Ñ?ениÑ? дÑ?Ñ?гими пÑ?иложениÑ?ми к поÑ?Ñ?Ñ? Ñ?пÑ?авлениÑ? Ñ?ем Ñ?амÑ?м"
+" подвеÑ?гаÑ? опаÑ?ноÑ?Ñ?и ваÑ?Ñ? анонимноÑ?Ñ?Ñ?."
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:75
@@ -184,9 +174,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 ""
 "Vidalia аваÑ?ийно завеÑ?Ñ?илаÑ?Ñ? но Tor пÑ?одолжил Ñ?абоÑ?Ñ? Ñ? поÑ?ледним Ñ?лÑ?Ñ?айнÑ?м "
 "паÑ?олем .Ð?оÑ?ле пеÑ?езапÑ?Ñ?ка Vidalia Ñ?генеÑ?ивала новÑ?й Ñ?лÑ?Ñ?айнÑ?й паÑ?олÑ? но "
@@ -213,22 +203,22 @@ msgid ""
 msgstr ""
 "Ð?Ñ?ли кнопки <i>СбÑ?оÑ?</i> вÑ? не видиÑ?е или еÑ?ли Vidalia не можеÑ? "
 "пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Tor, вÑ? лÑ?бом Ñ?лÑ?Ñ?ае можеÑ?е иÑ?пÑ?авиÑ?Ñ? Ñ?Ñ?о вÑ?Ñ?Ñ?нÑ?Ñ?.Самое "
-"пÑ?оÑ?Ñ?ое запÑ?Ñ?Ñ?иÑ?Ñ? диÑ?пеÑ?Ñ?еÑ? задаÑ? и завеÑ?Ñ?иÑ?Ñ? пÑ?оÑ?еÑ?Ñ? Tor.Ð?аÑ?ем иÑ?полÑ?зоваÑ?Ñ? "
-"Vidalia длÑ? пеÑ?езапÑ?Ñ?ка Tor .Ð?Ñ?е должно Ñ?абоÑ?аÑ?Ñ?."
+"пÑ?оÑ?Ñ?ое запÑ?Ñ?Ñ?иÑ?Ñ? диÑ?пеÑ?Ñ?еÑ? задаÑ? и завеÑ?Ñ?иÑ?Ñ? пÑ?оÑ?еÑ?Ñ? Tor.Ð?аÑ?ем иÑ?полÑ?зоваÑ?Ñ?"
+" Vidalia длÑ? пеÑ?езапÑ?Ñ?ка Tor .Ð?Ñ?е должно Ñ?абоÑ?аÑ?Ñ?."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:106
 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 ""
-"Ð?аÑ? Tor Ñ?анее наÑ?Ñ?Ñ?оен на запÑ?Ñ?к как Ñ?лÑ?жба.Ð?огда Tor наÑ?Ñ?Ñ?оен на запÑ?Ñ?к как "
-"Ñ?лÑ?жба, он запÑ?Ñ?каеÑ?Ñ?Ñ? во вÑ?емÑ? загÑ?Ñ?зки Ñ?иÑ?Ñ?емÑ?. Ð?Ñ?ли вÑ? наÑ?Ñ?Ñ?оили запÑ?Ñ?к "
+"Ð?аÑ? Tor Ñ?анее наÑ?Ñ?Ñ?оен на запÑ?Ñ?к как Ñ?лÑ?жба.Ð?огда Tor наÑ?Ñ?Ñ?оен на запÑ?Ñ?к как"
+" Ñ?лÑ?жба, он запÑ?Ñ?каеÑ?Ñ?Ñ? во вÑ?емÑ? загÑ?Ñ?зки Ñ?иÑ?Ñ?емÑ?. Ð?Ñ?ли вÑ? наÑ?Ñ?Ñ?оили запÑ?Ñ?к "
 "Tor как Ñ?лÑ?жба Ñ?еÑ?ез пÑ?огÑ?аммÑ? Vidalia, Ñ?лÑ?Ñ?айнÑ?й паÑ?олÑ? бÑ?деÑ? Ñ?Ñ?Ñ?ановлен и "
 "запомнен Tor.Ð?огда вÑ? пеÑ?е загÑ?Ñ?зиÑ?еÑ?Ñ? Tor бÑ?деÑ? иÑ?полÑ?зоваÑ?Ñ? Ñ?лÑ?Ñ?айнÑ?й "
 "паÑ?олÑ? Ñ?оÑ? Ñ?Ñ?о запомнил. Ð?Ñ?и запÑ?Ñ?ке Vidalia ,попÑ?Ñ?аеÑ?Ñ?Ñ? обÑ?аÑ?Ñ?Ñ?Ñ? Ñ? Ñ?же "
@@ -240,13 +230,13 @@ 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\";> "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
 "Ð?ам нÑ?жно пеÑ?енаÑ?Ñ?Ñ?оиÑ?Ñ? Tor Ñ?Ñ?об он не запÑ?Ñ?калÑ?Ñ? как Ñ?лÑ?жба.Ð?Ñ?оÑ?моÑ?Ñ?иÑ?е "
-"Ñ?Ñ?Ñ?аниÑ?Ñ? Tor wiki  <a href=\"https://wiki.torproject.org/noreply/TheOnionRout";
-"er/TorFAQ#WinNTService\"> Tor запÑ?Ñ?к как Ñ?лÑ?жба</a> длÑ? деÑ?алÑ?ной инÑ?оÑ?маÑ?ии "
-"как Ñ?далиÑ?Ñ? Ñ?лÑ?жбÑ? Tor."
+"Ñ?Ñ?Ñ?аниÑ?Ñ? Tor wiki  <a "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" Tor запÑ?Ñ?к как Ñ?лÑ?жба</a> длÑ? деÑ?алÑ?ной инÑ?оÑ?маÑ?ии как Ñ?далиÑ?Ñ? Ñ?лÑ?жбÑ? Tor."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:122
@@ -261,26 +251,24 @@ msgstr "Tor неожиданно завеÑ?Ñ?илÑ?Ñ?."
 # 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 ""
-"Ð?Ñ?ли Tor немедленно завеÑ?Ñ?илÑ?Ñ? поÑ?ле попÑ?Ñ?ки запÑ?Ñ?ка, веÑ?оÑ?Ñ?ней вÑ?его дÑ?Ñ?гой "
-"пÑ?оÑ?еÑ?Ñ? Tor Ñ?же запÑ?Ñ?ен.Ð?Ñ?оÑ?моÑ?Ñ?иÑ?е <a href=\"log.html\">жÑ?Ñ?нал Ñ?ообÑ?ений</a> "
-"длÑ? пÑ?овеÑ?ки поÑ?ледниÑ? Ñ?ообÑ?ений в Ñ?пиÑ?ке помеÑ?еннÑ?Ñ? желÑ?Ñ?м Ñ?веÑ?ом "
-"Ñ?одеÑ?жаÑ?иÑ? возможнÑ?е Ñ?Ñ?Ñ?оки:"
+"Ð?Ñ?ли Tor немедленно завеÑ?Ñ?илÑ?Ñ? поÑ?ле попÑ?Ñ?ки запÑ?Ñ?ка, веÑ?оÑ?Ñ?ней вÑ?его дÑ?Ñ?гой"
+" пÑ?оÑ?еÑ?Ñ? Tor Ñ?же запÑ?Ñ?ен.Ð?Ñ?оÑ?моÑ?Ñ?иÑ?е <a href=\"log.html\">жÑ?Ñ?нал "
+"Ñ?ообÑ?ений</a> длÑ? пÑ?овеÑ?ки поÑ?ледниÑ? Ñ?ообÑ?ений в Ñ?пиÑ?ке помеÑ?еннÑ?Ñ? желÑ?Ñ?м "
+"Ñ?веÑ?ом Ñ?одеÑ?жаÑ?иÑ? возможнÑ?е Ñ?Ñ?Ñ?оки:"
 
 # 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 ""
-"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"
 
 # type: Content of: <html><body><p>
@@ -301,8 +289,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 ""
 "Ð?Ñ?ли Tor Ñ?Ñ?пеÑ?но Ñ?абоÑ?ал некоÑ?оÑ?ое вÑ?емÑ? (Ñ?помÑ?нÑ?Ñ?ое вÑ?емÑ? болÑ?Ñ?е Ñ?ем "
@@ -331,3 +319,5 @@ msgstr ""
 "Ð?Ñ?ли Vidalia не Ñ?могла оÑ?Ñ?ановиÑ?Ñ? Tor, вам Ñ?ледÑ?еÑ? пÑ?овеÑ?иÑ?Ñ? <a "
 "href=\"log.html\">жÑ?Ñ?нал Ñ?ообÑ?ений</a> длÑ? обнаÑ?Ñ?жениÑ? оÑ?ибок коÑ?оÑ?Ñ?е могли "
 "возникнÑ?Ñ?Ñ? пÑ?и попÑ?Ñ?ке завеÑ?Ñ?иÑ?Ñ? Tor."
+
+
diff --git a/sco/index.po b/sco/index.po
index 49d7627..78d7f55 100644
--- a/sco/index.po
+++ b/sco/index.po
@@ -1,29 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-09-14 03:29+0200\n"
-"Last-Translator: emma_f <emmafelber@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: sco\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: sco\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/index.html:16
@@ -55,3 +45,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/templates/bridges.pot b/templates/bridges.pot
index 2eaadbb..70ab4d0 100644
--- a/templates/bridges.pot
+++ b/templates/bridges.pot
@@ -1,91 +1,98 @@
-##
-##  $Id$
-##
-##  This file is part of Vidalia, and is subject to the license terms in
-##  the LICENSE file, found in the top level directory of this
-##  distribution. If you did not receive the LICENSE file with this
-##  file, you may obtain it from the Vidalia source package distributed by
-##  the Vidalia Project at http://www.vidalia-project.net/. No part of
-##  Vidalia, including this file, may be copied, modified, propagated, or
-##  distributed except according to the terms described in the LICENSE
-##  file.
-##
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/bridges.html:16
 msgid "Bridge Relays"
-msgstr ""
+msgstr "Bridge Relays"
 
 #. type: Content of: <html><body>
 #: en/bridges.html:19
 msgid "<a name=\"about\"/>"
-msgstr ""
+msgstr "<a name=\"about\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/bridges.html:20
 msgid "What are bridge relays?"
-msgstr ""
+msgstr "What are bridge relays?"
 
 #. type: Content of: <html><body><p>
 #: 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 ""
+"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."
 
 #. type: Content of: <html><body>
 #: en/bridges.html:31
 msgid "<a name=\"finding\"/>"
-msgstr ""
+msgstr "<a name=\"finding\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/bridges.html:32
 msgid "How do I find a bridge relay?"
-msgstr ""
+msgstr "How do I find a bridge relay?"
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:34
 msgid "There are two main ways to learn about a bridge address:"
-msgstr ""
+msgstr "There are two main ways to learn about a bridge address:"
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/bridges.html:36
 msgid "Get some friends to run private bridges for you"
-msgstr ""
+msgstr "Get some friends to run private bridges for you"
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/bridges.html:37
 msgid "Use some of the public bridges"
-msgstr ""
+msgstr "Use some of the public bridges"
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:42
 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 ""
+"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 "
+"just passes data to and from the Tor network, so it shouldn't expose the "
+"operator to any abuse complaints."
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:52
@@ -99,6 +106,14 @@ msgid ""
 "attacker to learn lots of bridge addresses, you must send this request from "
 "a Gmail account."
 msgstr ""
+"You can find public bridge addresses by visiting "
+"<b>https://bridges.torproject.org</b>.  The answers you get from that page "
+"will change every few days, so check back periodically if you need more "
+"bridge addresses. Another way to find public bridge addresses is to send "
+"mail to <b>bridges@xxxxxxxxxxxxxx</b> with the line <b>get bridges</b> by "
+"itself in the body of the mail. However, so we can make it harder for an "
+"attacker to learn lots of bridge addresses, you must send this request from "
+"a Gmail account."
 
 #. type: Content of: <html><body><p>
 #: en/bridges.html:63
@@ -106,3 +121,7 @@ msgid ""
 "Configuring more than one bridge address will make your Tor connection more "
 "stable, in case some of the bridges become unreachable."
 msgstr ""
+"Configuring more than one bridge address will make your Tor connection more "
+"stable, in case some of the bridges become unreachable."
+
+
diff --git a/templates/config.pot b/templates/config.pot
index d40ebf7..c9ff834 100644
--- a/templates/config.pot
+++ b/templates/config.pot
@@ -1,31 +1,24 @@
-##
-##  $Id$
-##
-##  This file is part of Vidalia, and is subject to the license terms in
-##  the LICENSE file, found in the top level directory of this
-##  distribution. If you did not receive the LICENSE file with this
-##  file, you may obtain it from the Vidalia source package distributed
-##  by the Vidalia Project at http://www.vidalia-project.net/. No part
-##  of Vidalia, including this file, may be copied, modified,
-##  propagated, or distributed except according to the terms described
-##  in the LICENSE file.
-##
-#, fuzzy
+# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-12-21 22:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/config.html:16
 msgid "Configuring Vidalia and Tor"
-msgstr ""
+msgstr "Configuring Vidalia and Tor"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:20
@@ -34,31 +27,41 @@ 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 allows you to configure some of the most commonly modified aspects "
+"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."
 
 #. type: Content of: <html><body>
 #: en/config.html:26
 msgid "<a name=\"general\"/>"
-msgstr ""
+msgstr "<a name=\"general\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:27
 msgid "General Settings"
-msgstr ""
+msgstr "General Settings"
 
 #. 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 ""
+"Settings on the <i>General</i> page are the most commonly modified settings."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:32
 msgid ""
-"<b>Tor Executable</b>: This is the Tor executable that Vidalia will run when "
-"you select <i>Start</i> from the tray menu. If you have multiple versions of "
-"Tor installed, you can tell Vidalia which version you would like to run by "
-"clicking the <i>Browse</i> button and navigating to the particular Tor "
+"<b>Tor Executable</b>: This is the Tor executable that Vidalia will run when"
+" you select <i>Start</i> from the tray menu. If you have multiple versions "
+"of Tor installed, you can tell Vidalia which version you would like to run "
+"by clicking the <i>Browse</i> button and navigating to the particular Tor "
 "installation you want."
 msgstr ""
+"<b>Tor 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."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:39
@@ -67,23 +70,28 @@ msgid ""
 "automatically start Tor when Vidalia starts. You can also configure Vidalia "
 "to run when your system starts (<i>Windows only</i>)."
 msgstr ""
+"<b>Startup Options</b>: This setting allows you to have Vidalia "
+"automatically start Tor when Vidalia starts. You can also configure Vidalia "
+"to run when your system starts (<i>Windows only</i>)."
 
 #. type: Content of: <html><body>
 #: en/config.html:46
 msgid "<a name=\"network\"/>"
-msgstr ""
+msgstr "<a name=\"network\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:47
 msgid "Network Settings"
-msgstr ""
+msgstr "Network Settings"
 
 #. 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 ""
+"The <i>Network</i> settings page lets you change how Tor connects to the Tor"
+" network."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:53
@@ -96,6 +104,13 @@ 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>I use a proxy to access the Internet</b>: If your Internet connection "
+"requires an HTTP proxy, you can configure Tor to send all of its directory "
+"requests and Tor relay connections through your proxy. You must specify at "
+"least the hostname or address of your proxy, and the port on which your "
+"proxy is listening for connections. If your proxy requires authentication, "
+"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."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:62
@@ -104,9 +119,15 @@ 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>My firewall only lets me connect to certain ports</b>: If you are behind "
+"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>)"
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:69
@@ -115,69 +136,85 @@ msgid ""
 "Service Provider) blocks connections to the Tor network, Tor can attempt to "
 "avoid being filtered by encrypting its directory connections and connecting "
 "to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha "
-"or newer only). You can add bridge relays by specifying either their address "
-"and port number, or their address, port number, and fingerprint."
+"or newer only). You can add bridge relays by specifying either their address"
+" and port number, or their address, port number, and fingerprint."
 msgstr ""
+"<b>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."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:77
 msgid "Below are examples of valid bridge address formats:"
-msgstr ""
+msgstr "Below are examples of valid bridge address formats:"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:80
 msgid "128.213.48.13:8080"
-msgstr ""
+msgstr "128.213.48.13:8080"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:83
 msgid "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
-msgstr ""
+msgstr "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:86
 msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
-msgstr ""
+msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:89
 msgid ""
 "Even if you do not know any bridge relay addresses, checking this checkbox "
 "may still be helpful. Tor will encrypt its directory requests, which can "
-"defeat blocking mechanisms that try to filter Tor's requests for information "
-"about other relays. If connections to normal Tor relays are also blocked, "
-"then you will need to learn a bridge relay address somehow and add it "
-"here. See the help topic on <a href=\"bridges.html#finding\">finding bridge "
+"defeat blocking mechanisms that try to filter Tor's requests for information"
+" about other relays. If connections to normal Tor relays are also blocked, "
+"then you will need to learn a bridge relay address somehow and add it here. "
+"See the help topic on <a href=\"bridges.html#finding\">finding bridge "
 "relays</a> for more information on how to learn new bridge relay addresses "
 "and fingerprints."
 msgstr ""
+"Even if you do not know any bridge relay addresses, checking this checkbox "
+"may still be helpful. Tor will encrypt its directory requests, which can "
+"defeat blocking mechanisms that try to filter Tor's requests for information"
+" about other relays. If connections to normal Tor relays are also blocked, "
+"then you will need to learn a bridge relay address somehow and add it here. "
+"See the help topic on <a href=\"bridges.html#finding\">finding bridge "
+"relays</a> for more information on how to learn new bridge relay addresses "
+"and fingerprints."
 
 #. type: Content of: <html><body>
 #: en/config.html:100
 msgid "<a name=\"relay\"/>"
-msgstr ""
+msgstr "<a name=\"relay\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:101
 msgid "Relay Settings"
-msgstr ""
+msgstr "Relay Settings"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:103
 msgid ""
-"<i> See <a href=\"server.html\">this help topic</a> for detailed information "
-"about setting up and managing a Tor relay.  </i>"
+"<i> See <a href=\"server.html\">this help topic</a> for detailed information"
+" about setting up and managing a Tor relay.  </i>"
 msgstr ""
+"<i> See <a href=\"server.html\">this help topic</a> for detailed information"
+" about setting up and managing a Tor relay.  </i>"
 
 #. type: Content of: <html><body>
 #: en/config.html:109
 msgid "<a name=\"appearance\"/>"
-msgstr ""
+msgstr "<a name=\"appearance\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:110
 msgid "Appearance Settings"
-msgstr ""
+msgstr "Appearance Settings"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:112
@@ -185,17 +222,25 @@ msgid ""
 "The settings on the <i>Appearance</i> page allow you to customize the look "
 "and feel of Vidalia."
 msgstr ""
+"The settings on the <i>Appearance</i> page allow you to customize the look "
+"and feel of Vidalia."
 
 #. 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."
-msgstr ""
+"<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>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."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:124
@@ -204,16 +249,19 @@ msgid ""
 "default interface style. If you dislike the default, you can choose "
 "whichever interface style you prefer from the dropdown box."
 msgstr ""
+"<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."
 
 #. type: Content of: <html><body>
 #: en/config.html:131
 msgid "<a name=\"advanced\"/>"
-msgstr ""
+msgstr "<a name=\"advanced\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:132
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Advanced Settings"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:134
@@ -221,15 +269,21 @@ msgid ""
 "The settings on the <i>Advanced</i> page should generally only be modified "
 "by more experienced users."
 msgstr ""
+"The settings on the <i>Advanced</i> page should generally only be modified "
+"by more experienced users."
 
 #. 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>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."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:144
@@ -238,6 +292,9 @@ msgid ""
 "limit the applications on your machine that can connect to and reconfigure "
 "your Tor installation. The available authentication methods are:"
 msgstr ""
+"<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:"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:150
@@ -246,6 +303,9 @@ msgid ""
 "<b>strongly</b> discouraged. Any application or user on your computer can "
 "reconfigure your Tor installation."
 msgstr ""
+"<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."
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:155
@@ -253,18 +313,27 @@ 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>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."
 
 #. 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> -- 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."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:170
@@ -274,6 +343,10 @@ msgid ""
 "file. If you leave this field blank, Tor will uses its own default torrc "
 "location."
 msgstr ""
+"<b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to "
+"have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration "
+"file. If you leave this field blank, Tor will uses its own default torrc "
+"location."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:175
@@ -283,29 +356,41 @@ 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 Data Directory</b> <i>(optional)</i>: You can specify the directory "
+"in which Tor will store its saved data, such as cached Tor relay "
+"information, Tor relay keys, and configuration files. If you leave this "
+"field blank, Tor will use its own default data directory location."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:181
 msgid ""
-"<b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter "
-"a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it "
-"starts.  If you enter a value for <b>Run as Group</b>, Tor will "
+"<b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter"
+" a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it"
+" starts.  If you enter a value for <b>Run as Group</b>, Tor will "
 "<i>setgid</i> to this group when it starts."
 msgstr ""
+"<b>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."
 
 #. type: Content of: <html><body>
 #: en/config.html:189
 msgid "<a name=\"services\"/>"
-msgstr ""
+msgstr "<a name=\"services\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:190
 msgid "Hidden Service Settings"
-msgstr ""
+msgstr "Hidden Service Settings"
 
 #. 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 ""
+"Hidden services allow you to provide any kind of TCP-based service, e.g.  an"
+" HTTP service, to others without revealing your IP address."
+
+
diff --git a/templates/index.pot b/templates/index.pot
index 22301d3..d70f325 100644
--- a/templates/index.pot
+++ b/templates/index.pot
@@ -1,31 +1,23 @@
-##
-##  $Id$
-##
-##  This file is part of Vidalia, and is subject to the license terms in
-##  the LICENSE file, found in the top level directory of this
-##  distribution. If you did not receive the LICENSE file with this
-##  file, you may obtain it from the Vidalia source package distributed
-##  by the Vidalia Project at http://www.vidalia-project.net/. No part
-##  of Vidalia, including this file, may be copied, modified,
-##  propagated, or distributed except according to the terms described
-##  in the LICENSE file.
-##
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/index.html:16
 msgid "Vidalia Help"
-msgstr ""
+msgstr "Vidalia Help"
 
 #. type: Content of: <html><body><p>
 #: en/index.html:20
@@ -33,6 +25,8 @@ 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 ""
+"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."
 
 #. type: Content of: <html><body><p>
 #: en/index.html:25
@@ -40,11 +34,13 @@ msgid ""
 "You can use the <i>Find</i> button on the toolbar above to search within a "
 "particular help topic."
 msgstr ""
+"You can use the <i>Find</i> button on the toolbar above to search within a "
+"particular help topic."
 
 #. 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 ""
+msgstr "The <i>Home</i> button above will bring you back to this home page."
 
 #. type: Content of: <html><body><p>
 #: en/index.html:34
@@ -52,3 +48,7 @@ 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 ""
+"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."
+
+
diff --git a/templates/links.pot b/templates/links.pot
index a1d0a8d..9bcdc03 100644
--- a/templates/links.pot
+++ b/templates/links.pot
@@ -1,47 +1,38 @@
-##
-##  $Id$
-##
-##  This file is part of Vidalia, and is subject to the license terms in
-##  the LICENSE file, found in the top level directory of this
-##  distribution. If you did not receive the LICENSE file with this
-##  file, you may obtain it from the Vidalia source package distributed
-##  by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-##  No part of Vidalia, including this file, may be copied, modified,
-##  propagated, or distributed except according to the terms described
-##  in the LICENSE file.
-##
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: links.html:16
 msgid "Helpful Links"
-msgstr ""
+msgstr "Helpful Links"
 
 #. type: Content of: <html><body><h3>
 #: links.html:19
 msgid "Vidalia"
-msgstr ""
+msgstr "Vidalia"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57
 msgid "&nbsp;&nbsp;&nbsp;"
-msgstr ""
+msgstr "&nbsp;&nbsp;&nbsp;"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:23 links.html:43
 msgid "Homepage"
-msgstr ""
+msgstr "Homepage"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:25
@@ -49,31 +40,33 @@ msgid ""
 "<a href=\"https://www.torproject.org/vidalia/\";> "
 "https://www.torproject.org/vidalia/</a>"
 msgstr ""
+"<a href=\"https://www.torproject.org/vidalia/\";> "
+"https://www.torproject.org/vidalia/</a>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:31 links.html:58
 msgid "Wiki and Bugtracker"
-msgstr ""
+msgstr "Wiki and Bugtracker"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:33
 msgid "<a href=\"http://trac.torproject.org/\";> http://trac.torproject.org/</a>"
-msgstr ""
+msgstr "<a href=\"http://trac.torproject.org/\";> http://trac.torproject.org/</a>"
 
 #. type: Content of: <html><body><h3>
 #: links.html:39
 msgid "Tor"
-msgstr ""
+msgstr "Tor"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:45
 msgid "<a href=\"https://www.torproject.org/\";>https://www.torproject.org/</a>"
-msgstr ""
+msgstr "<a href=\"https://www.torproject.org/\";>https://www.torproject.org/</a>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:50
 msgid "FAQ"
-msgstr ""
+msgstr "FAQ"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:52
@@ -81,8 +74,13 @@ msgid ""
 "<a href=\"https://www.torproject.org/docs/faq.html\";> "
 "https://www.torproject.org/docs/faq.html</a>"
 msgstr ""
+"<a href=\"https://www.torproject.org/docs/faq.html\";> "
+"https://www.torproject.org/docs/faq.html</a>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
+"<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
+
+
diff --git a/templates/log.pot b/templates/log.pot
index 737b0da..6ae4c0b 100644
--- a/templates/log.pot
+++ b/templates/log.pot
@@ -1,60 +1,63 @@
-##
-##  $Id$
-##
-##  This file is part of Vidalia, and is subject to the license terms in
-##  the LICENSE file, found in the top level directory of this
-##  distribution. If you did not receive the LICENSE file with this
-##  file, you may obtain it from the Vidalia source package distributed
-##  by the Vidalia Project at http://www.vidalia-project.net/. No part
-##  of Vidalia, including this file, may be copied, modified,
-##  propagated, or distributed except according to the terms described
-##  in the LICENSE file.
-##
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/log.html:16
 msgid "Message Log"
-msgstr ""
+msgstr "Message Log"
 
 #. 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\"/>"
-msgstr ""
+"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 ""
+"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\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/log.html:28
 msgid "Message Severities"
-msgstr ""
+msgstr "Message Severities"
 
 #. type: Content of: <html><body><p>
 #: 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 ""
+"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."
 
 #. 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 ""
+"The possible message severities, from most severe to least severe, are:"
 
 #. type: Content of: <html><body><ul><li>
 #: en/log.html:41
@@ -63,36 +66,49 @@ msgid ""
 "Tor cannot proceed. These messages will be highlighted in <i>red</i> in the "
 "message log."
 msgstr ""
+"<b>Error</b>: Messages that appear when something has gone very wrong and "
+"Tor cannot proceed. These messages will be highlighted in <i>red</i> in the "
+"message log."
 
 #. 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 ""
+"<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>."
 
 #. 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 ""
+"<b>Notice</b>: Messages that appear infrequently during normal Tor operation"
+" and are not considered errors, but you still may care about."
 
 #. 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 ""
+"<b>Info</b>: Messages that appear frequently during normal Tor operation and"
+" are not usually of interest to most users."
 
 #. 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 ""
+"<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."
 
 #. type: Content of: <html><body><p>
 #: en/log.html:66
@@ -100,43 +116,49 @@ msgid ""
 "Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i> "
 "messages."
 msgstr ""
+"Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i> "
+"messages."
 
 #. 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 ""
+"To select which message severities you would like to see, do the following:"
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:73 en/log.html:92
 msgid "Open the message log from the Vidalia tray menu."
-msgstr ""
+msgstr "Open the message log from the Vidalia tray menu."
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:74 en/log.html:93
 msgid "Click on <i>Settings</i> at the top of the message log window."
-msgstr ""
+msgstr "Click on <i>Settings</i> at the top of the message log window."
 
 #. 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 ""
+"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."
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/log.html:79
 msgid "Click <i>Save Settings</i> to apply your new message filter."
-msgstr ""
+msgstr "Click <i>Save Settings</i> to apply your new message filter."
 
 #. type: Content of: <html><body>
 #: en/log.html:84
 msgid "<a name=\"logfile\"/>"
-msgstr ""
+msgstr "<a name=\"logfile\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/log.html:85
 msgid "Logging to a File"
-msgstr ""
+msgstr "Logging to a File"
 
 #. type: Content of: <html><body><p>
 #: en/log.html:87
@@ -144,11 +166,15 @@ msgid ""
 "Vidalia can also write log messages to a file, as well as logging them in "
 "the message log window. To enable logging to a file, follow these steps:"
 msgstr ""
+"Vidalia can also write log messages to a file, as well as logging them in "
+"the message log window. To enable logging to a file, follow these steps:"
 
 #. 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 ""
+"Check the box labeled <i>Automatically save new log messages to a file</i>."
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:96
@@ -157,8 +183,13 @@ msgid ""
 "either type the path and filename into the text box, or click <i>Browse</i> "
 "to navigate to a location for your log file."
 msgstr ""
+"If you would like to change the file to which messages will be written, "
+"either type the path and filename into the text box, or click <i>Browse</i> "
+"to navigate to a location for your log file."
 
 #. type: Content of: <html><body><ol><li>
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
-msgstr ""
+msgstr "Click <i>Save Settings</i> to save your log destination."
+
+
diff --git a/templates/netview.pot b/templates/netview.pot
index 7523f08..055590c 100644
--- a/templates/netview.pot
+++ b/templates/netview.pot
@@ -1,31 +1,23 @@
-##
-##  $Id$
-##
-##  This file is part of Vidalia, and is subject to the license terms in
-##  the LICENSE file, found in the top level directory of this
-##  distribution. If you did not receive the LICENSE file with this
-##  file, you may obtain it from the Vidalia source package distributed
-##  by the Vidalia Project at http://www.vidalia-project.net/. No part
-##  of Vidalia, including this file, may be copied, modified,
-##  propagated, or distributed except according to the terms described
-##  in the LICENSE file.
-##
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
 msgid "Network Viewer"
-msgstr ""
+msgstr "Network Viewer"
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:20
@@ -33,16 +25,18 @@ msgid ""
 "The network viewer lets you see relays in the Tor network and where your "
 "traffic is going."
 msgstr ""
+"The network viewer lets you see relays in the Tor network and where your "
+"traffic is going."
 
 #. type: Content of: <html><body>
 #: en/netview.html:25
 msgid "<a name=\"overview\"/>"
-msgstr ""
+msgstr "<a name=\"overview\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/netview.html:26
 msgid "Overview"
-msgstr ""
+msgstr "Overview"
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:28
@@ -53,25 +47,34 @@ msgid ""
 "then sent as a <i>stream</i> through that circuit. For efficiency, multiple "
 "streams may share the same circuit."
 msgstr ""
+"When you want to communicate anonymously through Tor (say, connecting to a "
+"website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections "
+"through a series of relays on the network. Your application's traffic is "
+"then sent as a <i>stream</i> through that circuit. For efficiency, multiple "
+"streams may share the same circuit."
 
 #. type: Content of: <html><body>
 #: en/netview.html:35
 msgid "<a name=\"netmap\"/>"
-msgstr ""
+msgstr "<a name=\"netmap\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/netview.html:36
 msgid "Network Map"
-msgstr ""
+msgstr "Network Map"
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
+"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 "
+"client has created through the Tor network."
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:44
@@ -81,6 +84,10 @@ msgid ""
 "map by clicking on the map and then dragging it in whatever direction you "
 "would like to move the map."
 msgstr ""
+"You can zoom in on locations in the map by clicking the <b>Zoom In</b> and "
+"<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the "
+"map by clicking on the map and then dragging it in whatever direction you "
+"would like to move the map."
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:50
@@ -89,29 +96,40 @@ msgid ""
 "address of the relay in a GeoIP database, created by MaxMind and located at "
 "geoip.vidalia-project.net."
 msgstr ""
+"The geographic location of a Tor relay is determined by looking up the IP "
+"address of the relay in a GeoIP database, created by MaxMind and located at "
+"geoip.vidalia-project.net."
 
 #. type: Content of: <html><body><p>
 #: 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 ""
+"In the middle of the dialog, below the network map, you will see a list of "
+"your current circuits, as well as any application traffic currently on those"
+" circuits. When the network map first loads, you will probably see a "
+"connection to geoip.vidalia-project.net, which occurs when Vidalia is "
+"looking up geographic information for the list of Tor relays. It is "
+"important to note that this request is done through Tor, so your location is"
+" not revealed to the GeoIP relay. The results of the lookups will be cached "
+"locally in order to reduce load on Vidalia's GeoIP relays."
 
 #. type: Content of: <html><body>
 #: en/netview.html:66
 msgid "<a name=\"relaylist\"/>"
-msgstr ""
+msgstr "<a name=\"relaylist\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/netview.html:67
 msgid "Relay Status"
-msgstr ""
+msgstr "Relay Status"
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:69
@@ -120,11 +138,14 @@ msgid ""
 "Tor network. Next to each relay is an icon indicating that relay's status.  "
 "The following table summarizes the possible relay status icons:"
 msgstr ""
+"On the left side of the network view, you will see a list of relays in the "
+"Tor network. Next to each relay is an icon indicating that relay's status.  "
+"The following table summarizes the possible relay status icons:"
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:78
 msgid "The relay is offline or simply not responding."
-msgstr ""
+msgstr "The relay is offline or simply not responding."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:84
@@ -132,26 +153,28 @@ msgid ""
 "The relay is <i>hibernating</i>, meaning it is online, but has used up as "
 "much bandwidth as the operator is willing to allow for a given time period."
 msgstr ""
+"The relay is <i>hibernating</i>, meaning it is online, but has used up as "
+"much bandwidth as the operator is willing to allow for a given time period."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:92
 msgid "The relay is online, but has shown only minimal throughput."
-msgstr ""
+msgstr "The relay is online, but has shown only minimal throughput."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:98
 msgid "The relay is online and has shown a throughput &gt;= 20 KB/s."
-msgstr ""
+msgstr "The relay is online and has shown a throughput &gt;= 20 KB/s."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:104
 msgid "The relay is online and has shown a throughput &gt;= 60 KB/s."
-msgstr ""
+msgstr "The relay is online and has shown a throughput &gt;= 60 KB/s."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:110
 msgid "The relay is online and has shown a throughput &gt;= 400 KB/s."
-msgstr ""
+msgstr "The relay is online and has shown a throughput &gt;= 400 KB/s."
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:116
@@ -160,26 +183,34 @@ msgid ""
 "maximum bandwidth sustained input or output over any ten second period in "
 "the past day."
 msgstr ""
+"All bandwidth values are estimates based on the minimum of either the "
+"maximum bandwidth sustained input or output over any ten second period in "
+"the past day."
 
 #. type: Content of: <html><body>
 #: en/netview.html:122
 msgid "<a name=\"details\"/>"
-msgstr ""
+msgstr "<a name=\"details\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/netview.html:123
 msgid "Relay Details"
-msgstr ""
+msgstr "Relay Details"
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:125
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream"
+" in the list of your current circuits and streams, this panel will show you "
 "details about each relay through which your traffic is currently being sent."
 msgstr ""
+"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 "
+"details about each relay through which your traffic is currently being sent."
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:132
@@ -187,31 +218,33 @@ msgid ""
 "The fields that you may see in the panel are as follows (<i>Note</i>: not "
 "all of these fields will always be present):"
 msgstr ""
+"The fields that you may see in the panel are as follows (<i>Note</i>: not "
+"all of these fields will always be present):"
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:138
 msgid "<b>Location</b>"
-msgstr ""
+msgstr "<b>Location</b>"
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:139
 msgid "The geographic location of this Tor relay."
-msgstr ""
+msgstr "The geographic location of this Tor relay."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:142
 msgid "<b>IP Address</b>"
-msgstr ""
+msgstr "<b>IP Address</b>"
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:143
 msgid "IP address at which this Tor relay can be reached."
-msgstr ""
+msgstr "IP address at which this Tor relay can be reached."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:146
 msgid "<b>Platform</b>"
-msgstr ""
+msgstr "<b>Platform</b>"
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:148
@@ -219,11 +252,13 @@ msgid ""
 "Operating system information and Tor version on which this relay is "
 "currently running."
 msgstr ""
+"Operating system information and Tor version on which this relay is "
+"currently running."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:153
 msgid "<b>Bandwidth</b>"
-msgstr ""
+msgstr "<b>Bandwidth</b>"
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:155
@@ -231,11 +266,13 @@ msgid ""
 "Estimated maximum amount of bandwidth that the directory relays have seen "
 "this relay handle recently."
 msgstr ""
+"Estimated maximum amount of bandwidth that the directory relays have seen "
+"this relay handle recently."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:160
 msgid "<b>Uptime</b>"
-msgstr ""
+msgstr "<b>Uptime</b>"
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:162
@@ -243,13 +280,17 @@ msgid ""
 "Length of time this relay has been available, which can be used to help "
 "estimate this relay's stability."
 msgstr ""
+"Length of time this relay has been available, which can be used to help "
+"estimate this relay's stability."
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:167
 msgid "<b>Last Updated</b>"
-msgstr ""
+msgstr "<b>Last Updated</b>"
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
-msgstr ""
+msgstr "Date this relay's information was last updated."
+
+
diff --git a/templates/server.pot b/templates/server.pot
index 7299a3f..945935f 100644
--- a/templates/server.pot
+++ b/templates/server.pot
@@ -1,31 +1,23 @@
-##
-##  $Id$
-##
-##  This file is part of Vidalia, and is subject to the license terms in
-##  the LICENSE file, found in the top level directory of this
-##  distribution. If you did not receive the LICENSE file with this
-##  file, you may obtain it from the Vidalia source package distributed
-##  by the Vidalia Project at http://www.vidalia-project.net/. No part
-##  of Vidalia, including this file, may be copied, modified,
-##  propagated, or distributed except according to the terms described
-##  in the LICENSE file.
-##
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/server.html:16
 msgid "Setting Up a Tor Relay"
-msgstr ""
+msgstr "Setting Up a Tor Relay"
 
 #. type: Content of: <html><body>
 #: en/server.html:19
@@ -34,11 +26,14 @@ msgid ""
 "of their spare bandwidth by running a Tor relay. Vidalia helps you do your "
 "part by making it easy to set up a relay of your own.  <a name=\"basic\"/>"
 msgstr ""
+"The Tor network is made up of volunteers all over the world who donate some "
+"of their spare bandwidth by running a Tor relay. Vidalia helps you do your "
+"part by making it easy to set up a relay of your own.  <a name=\"basic\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:24
 msgid "Basic Settings"
-msgstr ""
+msgstr "Basic Settings"
 
 #. type: Content of: <html><body><p>
 #: en/server.html:26
@@ -46,6 +41,8 @@ msgid ""
 "If you decide you want to help the Tor network grow by running a relay, you "
 "can follow these steps to get started:"
 msgstr ""
+"If you decide you want to help the Tor network grow by running a relay, you "
+"can follow these steps to get started:"
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:31
@@ -54,11 +51,14 @@ msgid ""
 "tray menu or <i>Preferences</i> from your system menubar on Macintosh "
 "systems."
 msgstr ""
+"Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the "
+"tray menu or <i>Preferences</i> from your system menubar on Macintosh "
+"systems."
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:35
 msgid "Select the <i>Relay</i> configuration page."
-msgstr ""
+msgstr "Select the <i>Relay</i> configuration page."
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:37
@@ -67,14 +67,20 @@ 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 ""
+"Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay "
+"(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."
 
 #. type: Content of: <html><body><ol><li>
 #: en/server.html:44
 msgid "Enter the following information:"
-msgstr ""
+msgstr "Enter the following information:"
 
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:46
@@ -82,6 +88,8 @@ msgid ""
 "<b>Nickname</b>: The name which your relay will be known as on the Tor "
 "network. An example of a relay nickname is \"MyVidaliaRelay\"."
 msgstr ""
+"<b>Nickname</b>: The name which your relay will be known as on the Tor "
+"network. An example of a relay nickname is \"MyVidaliaRelay\"."
 
 #. type: Content of: <html><body><ol><ul><li>
 #: en/server.html:50
@@ -91,43 +99,59 @@ msgid ""
 "goes wrong with your relay. You might also include your PGP or GPG key ID "
 "and fingerprint."
 msgstr ""
+"<b>Contact Info</b>: Your e-mail address. This address will only be used to "
+"contact you in case there is an important Tor security update or something "
+"goes wrong with your relay. You might also include your PGP or GPG key ID "
+"and fingerprint."
 
 #. 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 ""
+"<b>Relay Port</b>: The port on which your relay will listen for traffic from"
+" clients or other Tor relays."
 
 #. 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 ""
+"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."
 
 #. type: Content of: <html><body>
 #: en/server.html:71
 msgid "<a name=\"bandwidth\"/>"
-msgstr ""
+msgstr "<a name=\"bandwidth\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:72
 msgid "Bandwidth Limits"
-msgstr ""
+msgstr "Bandwidth Limits"
 
 #. type: Content of: <html><body><p>
 #: en/server.html:74
 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 ""
+"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."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:80
@@ -136,55 +160,77 @@ msgid ""
 "connection speed. If you select <i>Custom</i>, you will be able to specify "
 "your own limits."
 msgstr ""
+"You should select the option in the dropdown box that best matches your "
+"connection speed. If you select <i>Custom</i>, you will be able to specify "
+"your own limits."
 
 #. type: Content of: <html><body><h4>
 #: en/server.html:84
 msgid "Custom Limits"
-msgstr ""
+msgstr "Custom Limits"
 
 #. type: Content of: <html><body><p>
 #: 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 ""
+"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 "
+"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 "
+"exceed the specified rate. Your <i>maximum rate</i> must always be greater "
+"than or equal to your <i>average rate</i>."
 
 #. type: Content of: <html><body><p>
 #: 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 ""
+"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 "
+"connection). Tor requires a minimum of 20 kilobytes per second to run a "
+"relay."
 
 #. 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>."
 msgstr ""
+"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>."
 
 #. type: Content of: <html><body>
 #: en/server.html:111
 msgid "<a name=\"exitpolicy\"/>"
-msgstr ""
+msgstr "<a name=\"exitpolicy\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:112
 msgid "Exit Policies"
-msgstr ""
+msgstr "Exit Policies"
 
 #. type: Content of: <html><body><p>
 #: en/server.html:114
@@ -195,6 +241,11 @@ msgid ""
 "as mail to prevent spam and some default file sharing ports to reduce abuse "
 "of the Tor network."
 msgstr ""
+"Exit policies give you a way to specify what kinds of resources on the "
+"Internet you are willing let other Tor users access from your Tor relay.  "
+"Tor uses a default list of exit policies that restrict some services, such "
+"as mail to prevent spam and some default file sharing ports to reduce abuse "
+"of the Tor network."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:121
@@ -206,120 +257,132 @@ msgid ""
 "checked, Tor users will be able to access other services not covered by the "
 "other checkboxes or Tor's default exit policy."
 msgstr ""
+"Each of the checkboxes represents a type of resource that you can allow Tor "
+"users to access through your relay. If you uncheck the box next to a "
+"particular type of resource, Tor users will not be allowed to access that "
+"resource from your relay. If the box labeled <i>Misc Other Services</i> is "
+"checked, Tor users will be able to access other services not covered by the "
+"other checkboxes or Tor's default exit policy."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:130
 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 ""
+"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."
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:138
 msgid "<b>Checkbox</b>"
-msgstr ""
+msgstr "<b>Checkbox</b>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:139
 msgid "<b>Ports</b>"
-msgstr ""
+msgstr "<b>Ports</b>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:140
 msgid "<b>Description</b>"
-msgstr ""
+msgstr "<b>Description</b>"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:143
 msgid "Websites"
-msgstr ""
+msgstr "Websites"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:144
 msgid "80"
-msgstr ""
+msgstr "80"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:145
 msgid "Normal, unencrypted Web browsing"
-msgstr ""
+msgstr "Normal, unencrypted Web browsing"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:148
 msgid "Secure Websites (SSL)"
-msgstr ""
+msgstr "Secure Websites (SSL)"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:149
 msgid "443"
-msgstr ""
+msgstr "443"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:150
 msgid "Encrypted Web browsing"
-msgstr ""
+msgstr "Encrypted Web browsing"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:153
 msgid "Retrieve Mail (POP, IMAP)"
-msgstr ""
+msgstr "Retrieve Mail (POP, IMAP)"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:154
 msgid "110, 143, 993, 995"
-msgstr ""
+msgstr "110, 143, 993, 995"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:155
 msgid "Downloading email (does not permit sending email)"
-msgstr ""
+msgstr "Downloading email (does not permit sending email)"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:158
 msgid "Instant Messaging (IM)"
-msgstr ""
+msgstr "Instant Messaging (IM)"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:159
 msgid "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888"
-msgstr ""
+msgstr "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888"
 
 #. 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 ""
+"Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:163
 msgid "Internet Relay Chat (IRC)"
-msgstr ""
+msgstr "Internet Relay Chat (IRC)"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:164
 msgid "6660-6669, 6697, 7000-7001"
-msgstr ""
+msgstr "6660-6669, 6697, 7000-7001"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:165
 msgid "IRC clients and servers"
-msgstr ""
+msgstr "IRC clients and servers"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:168
 msgid "Misc. Other Services"
-msgstr ""
+msgstr "Misc. Other Services"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:169
 msgid "*"
-msgstr ""
+msgstr "*"
 
 #. type: Content of: <html><body><table><tr><td>
 #: en/server.html:170
 msgid "All other applications that aren't covered by the previous checkboxes"
-msgstr ""
+msgstr "All other applications that aren't covered by the previous checkboxes"
 
 #. type: Content of: <html><body><p>
 #: en/server.html:175
@@ -330,6 +393,11 @@ msgid ""
 "network.  Your relay will allow other Tor users to connect to the Tor "
 "network and will help relay traffic between other Tor relays."
 msgstr ""
+"If you do not want to let other Tor users make connections outside the Tor "
+"network from your relay, you can uncheck all of the checkboxes. Even if you "
+"uncheck all of the checkboxes, your relay is still useful to the Tor "
+"network.  Your relay will allow other Tor users to connect to the Tor "
+"network and will help relay traffic between other Tor relays."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:182
@@ -338,27 +406,36 @@ msgid ""
 "grayed out, since bridge relays do not allow exit connections. Bridges are "
 "only used by Tor clients to connect to the Tor network."
 msgstr ""
+"If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be "
+"grayed out, since bridge relays do not allow exit connections. Bridges are "
+"only used by Tor clients to connect to the Tor network."
 
 #. type: Content of: <html><body>
 #: en/server.html:188
 msgid "<a name=\"upnp\"/>"
-msgstr ""
+msgstr "<a name=\"upnp\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/server.html:189
 msgid "Port Forwarding"
-msgstr ""
+msgstr "Port Forwarding"
 
 #. type: Content of: <html><body><p>
 #: 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 ""
+"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."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:200
@@ -369,17 +446,28 @@ msgid ""
 "firewall to \"forward\" all connections to certain ports on your router or "
 "firewall to local ports on your computer."
 msgstr ""
+"To make your relay publicly accessible, your router or firewall needs to "
+"know which ports to allow through to your computer by setting up what is "
+"known as <i>port forwarding</i>. Port forwarding configures your router or "
+"firewall to \"forward\" all connections to certain ports on your router or "
+"firewall to local ports on your computer."
 
 #. type: Content of: <html><body><p>
 #: 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."
 msgstr ""
+"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 "
+"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."
 
 #. type: Content of: <html><body><p>
 #: en/server.html:217
@@ -391,16 +479,25 @@ 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/\";>http://192.168.0.1</a> or <a "
-"href=\"http://192.168.1.1/\";>http://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/\";>http://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 msgstr ""
+"If the <i>Test</i> button finds that Vidalia is unable to set up port "
+"forwarding for you, you may need to enable this feature on your router or "
+"set up port forwarding manually. Some network devices have a feature called "
+"<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's "
+"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/\";>http://192.168.0.1</a> or <a "
+"href=\"http://192.168.1.1/\";>http://192.168.1.1</a> in your Web browser. You"
+" should consult your router's instruction manual for more information."
 
 #. 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\";> "
-"portforward.com</a> has instructions for how to set up port forwarding for "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" 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 "
@@ -408,3 +505,14 @@ msgid ""
 "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
 "default on all operating systems."
 msgstr ""
+"If you need to set up port forwarding manually, the website <a "
+"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\";>"
+" 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 "
+"<i>Mirror the relay directory</i>, then you will also need to forward your "
+"<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by "
+"default on all operating systems."
+
+
diff --git a/templates/services.pot b/templates/services.pot
index c2705db..a2560c3 100644
--- a/templates/services.pot
+++ b/templates/services.pot
@@ -1,31 +1,23 @@
-##
-##  $Id$
-##
-##  This file is part of Vidalia, and is subject to the license terms in
-##  the LICENSE file, found in the top level directory of this
-##  distribution. If you did not receive the LICENSE file with this
-##  file, you may obtain it from the Vidalia source package distributed
-##  by the Vidalia Project at http://www.vidalia-project.net/. No part
-##  of Vidalia, including this file, may be copied, modified,
-##  propagated, or distributed except according to the terms described
-##  in the LICENSE file.
-##
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/services.html:16
 msgid "Hidden Services"
-msgstr ""
+msgstr "Hidden Services"
 
 #. type: Content of: <html><body>
 #: en/services.html:19
@@ -36,11 +28,16 @@ msgid ""
 "goes wrong. If you find bugs or have comments on this new feature, please "
 "let us know! We need your feedback.  <a name=\"about\"/>"
 msgstr ""
+"Remark: Support for hidden services is new in Vidalia. You should expect it "
+"to have bugs, some of which possibly corrupting your hidden service "
+"configuration. So, don't rely on it, or rather, don't blame us if something "
+"goes wrong. If you find bugs or have comments on this new feature, please "
+"let us know! We need your feedback.  <a name=\"about\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:26
 msgid "What is a hidden service?"
-msgstr ""
+msgstr "What is a hidden service?"
 
 #. type: Content of: <html><body><p>
 #: en/services.html:28
@@ -50,6 +47,10 @@ msgid ""
 "provide a hidden service is built on top of the same circuits that Tor uses "
 "for anonymous browsing and roughly has similar anonymity properties."
 msgstr ""
+"Hidden services allow you to provide any kind of TCP-based service, e.g. an "
+"HTTP service, to others without revealing your IP address. The protocol to "
+"provide a hidden service is built on top of the same circuits that Tor uses "
+"for anonymous browsing and roughly has similar anonymity properties."
 
 #. type: Content of: <html><body><p>
 #: en/services.html:35
@@ -58,21 +59,24 @@ msgid ""
 "Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous "
 "Specification (doc/spec/rend-spec.txt)."
 msgstr ""
+"For more information on hidden service you may want to read section 5 of "
+"Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous "
+"Specification (doc/spec/rend-spec.txt)."
 
 #. type: Content of: <html><body>
 #: en/services.html:40
 msgid "<a name=\"provide\"/>"
-msgstr ""
+msgstr "<a name=\"provide\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:41
 msgid "How do I provide a hidden service?"
-msgstr ""
+msgstr "How do I provide a hidden service?"
 
 #. type: Content of: <html><body><p>
 #: en/services.html:43
 msgid "Providing a hidden service consists of at least two steps:"
-msgstr ""
+msgstr "Providing a hidden service consists of at least two steps:"
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/services.html:45
@@ -80,6 +84,8 @@ msgid ""
 "Install a web server locally (or a server for whatever service you want to "
 "provide, e.g. IRC) to listen for local requests."
 msgstr ""
+"Install a web server locally (or a server for whatever service you want to "
+"provide, e.g. IRC) to listen for local requests."
 
 #. type: Content of: <html><body><p><ol><li>
 #: en/services.html:47
@@ -87,24 +93,27 @@ msgid ""
 "Configure your hidden service, so that Tor relays requests coming from Tor "
 "users to your local server."
 msgstr ""
+"Configure your hidden service, so that Tor relays requests coming from Tor "
+"users to your local server."
 
 #. 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 ""
+"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."
 
 #. type: Content of: <html><body>
 #: en/services.html:55
 msgid "<a name=\"data\"/>"
-msgstr ""
+msgstr "<a name=\"data\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:56
 msgid "What data do I need to provide?"
-msgstr ""
+msgstr "What data do I need to provide?"
 
 #. type: Content of: <html><body><p>
 #: en/services.html:58
@@ -112,28 +121,42 @@ msgid ""
 "The services table contains five columns containing data about configured "
 "hidden services:"
 msgstr ""
+"The services table contains five columns containing data about configured "
+"hidden services:"
 
 #. type: Content of: <html><body><p><ul><li>
 #: 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 ""
+"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 "
+"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."
 
 #. 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."
 msgstr ""
+"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."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:73
@@ -146,6 +169,13 @@ msgid ""
 "specify any target, Tor will redirect requests to the port specified in "
 "\"Virtual Port\" on localhost."
 msgstr ""
+"Target (optional): Usually you want Tor to relay connection requests to "
+"localhost on a different port than the one you specified in \"Virtual "
+"Port\". Therefore, you can specify a target consisting of physical address "
+"and port to which requests to your hidden service are redirected, e.g. to "
+"localhost:5222 (or on whatever port your server is listening). If you don't "
+"specify any target, Tor will redirect requests to the port specified in "
+"\"Virtual Port\" on localhost."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:81
@@ -163,37 +193,55 @@ msgid ""
 "disk to the new place. Finally, change the directory in Vidalia to the new "
 "location, enable the service again, and save the new configuration."
 msgstr ""
+"Service Directory (required): Tor needs to store some hidden-service "
+"specific files in a separate directory, e.g. a private key and a hostname "
+"file containing the onion address. This directory should be distinct from a "
+"directory containing content that the service provides. A good place for a "
+"service directory might be a sub directory in Tor's data directory. -- Note "
+"that you cannot change the directory of a running service (it wouldn't make "
+"much sense to allow it, because Vidalia is not supposed to move directories "
+"on your hard disk!). If you want to move a hidden service to another "
+"directory, please proceed as follows: Start by disabling the service in "
+"Vidalia and save the configuration. Then move the directory on your hard "
+"disk to the new place. Finally, change the directory in Vidalia to the new "
+"location, enable the service again, and save the new configuration."
 
 #. type: Content of: <html><body><p><ul><li>
 #: 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 ""
+"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."
 
 #. type: Content of: <html><body>
 #: en/services.html:103
 msgid "<a name=\"buttons\"/>"
-msgstr ""
+msgstr "<a name=\"buttons\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:104
 msgid "What are the five buttons used for?"
-msgstr ""
+msgstr "What are the five buttons used for?"
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:107
 msgid "Add service: Creates a new empty service configuration."
-msgstr ""
+msgstr "Add service: Creates a new empty service configuration."
 
 #. 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 ""
+"Remove service: Permanently removes a hidden service configuration.  (If you"
+" want to temporarily remove a service, uncheck its Enabled checkbox.)"
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:111
@@ -201,49 +249,59 @@ msgid ""
 "Copy to clipboard: Copies the onion address to the clipboard, so that you "
 "can tell it to whoever shall be able to use your service."
 msgstr ""
+"Copy to clipboard: Copies the onion address to the clipboard, so that you "
+"can tell it to whoever shall be able to use your service."
 
 #. type: Content of: <html><body><p><ul><li>
 #: en/services.html:114
 msgid "Browse: Lets you browse to find a local hidden service directory."
-msgstr ""
+msgstr "Browse: Lets you browse to find a local hidden service directory."
 
 #. type: Content of: <html><body>
 #: en/services.html:119
 msgid "<a name=\"advanced\"/>"
-msgstr ""
+msgstr "<a name=\"advanced\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:120
 msgid "How can I configure advanced hidden service settings?"
-msgstr ""
+msgstr "How can I configure advanced hidden service settings?"
 
 #. 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 ""
+"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."
 
 #. type: Content of: <html><body><p>
 #: en/services.html:128
 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 ""
+"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."
 
 #. type: Content of: <html><body>
 #: en/services.html:135
 msgid "<a name=\"client\"/>"
-msgstr ""
+msgstr "<a name=\"client\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/services.html:136
 msgid "How does Vidalia help me to access other hidden services?"
-msgstr ""
+msgstr "How does Vidalia help me to access other hidden services?"
 
 #. type: Content of: <html><body><p>
 #: en/services.html:138
@@ -253,3 +311,9 @@ 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 ""
+"Not at all. There is no need to do so. If you want to access another hidden "
+"service, type the service's onion address in your browser (or appropriate "
+"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."
+
+
diff --git a/templates/troubleshooting.pot b/templates/troubleshooting.pot
index a04a965..eafc164 100644
--- a/templates/troubleshooting.pot
+++ b/templates/troubleshooting.pot
@@ -1,31 +1,23 @@
-##
-##  $Id$
-##
-##  This file is part of Vidalia, and is subject to the license terms in
-##  the LICENSE file, found in the top level directory of this
-##  distribution. If you did not receive the LICENSE file with this
-##  file, you may obtain it from the Vidalia source package distributed
-##  by the Vidalia Project at http://www.vidalia-project.net/. No part
-##  of Vidalia, including this file, may be copied, modified,
-##  propagated, or distributed except according to the terms described
-##  in the LICENSE file.
-##
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 # type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
 msgid "Troubleshooting"
-msgstr ""
+msgstr "Troubleshooting"
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:19
@@ -35,51 +27,67 @@ msgid ""
 "having, check out our website at <i>www.vidalia-project.net</i> for more "
 "support and information.  <a name=\"start\"/>"
 msgstr ""
+"Listed below are some of the common problems or questions people have while "
+"running Tor. If you can't find anything about the particular problem you're "
+"having, check out our website at <i>www.vidalia-project.net</i> for more "
+"support and information.  <a name=\"start\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:25
 msgid "I Can't Start Tor"
-msgstr ""
+msgstr "I Can't Start Tor"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:27
 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 ""
+"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>."
 
 # 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 ""
+"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."
 
 # 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 ""
+"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."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:43
 msgid "<a name=\"connect\"/>"
-msgstr ""
+msgstr "<a name=\"connect\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:44
 msgid "Vidalia Can't Connect to Tor"
-msgstr ""
+msgstr "Vidalia Can't Connect to Tor"
 
 # 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 ""
+"Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:49
@@ -89,6 +97,10 @@ msgid ""
 "your <a href=\"log.html\">message log</a> to see if Tor reported any errors "
 "while it started."
 msgstr ""
+"The most common reason that Vidalia cannot connect to Tor is because Tor "
+"started, but encountered an error and exited immediately. You should check "
+"your <a href=\"log.html\">message log</a> to see if Tor reported any errors "
+"while it started."
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:55
@@ -96,20 +108,26 @@ 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 ""
+"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>."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:63
 msgid "<a name=\"password\"/>"
-msgstr ""
+msgstr "<a name=\"password\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:64
 msgid "Why is Vidalia asking me for a \"control password\"?"
-msgstr ""
+msgstr "Why is Vidalia asking me for a \"control password\"?"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:66
@@ -121,6 +139,12 @@ msgid ""
 "applications from also connecting to the control port and potentially "
 "compromising your anonymity."
 msgstr ""
+"Vidalia interacts with the Tor software via Tor's \"control port\". The "
+"control port lets Vidalia receive status updates from Tor, request a new "
+"identity, configure Tor's settings, etc. Each time Vidalia starts Tor, "
+"Vidalia sets a random password for Tor's control port to prevent other "
+"applications from also connecting to the control port and potentially "
+"compromising your anonymity."
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:75
@@ -129,6 +153,9 @@ msgid ""
 "happens in the background. There are three common situations, though, where "
 "Vidalia may prompt you for a password:"
 msgstr ""
+"Usually this process of generating and setting a random control password "
+"happens in the background. There are three common situations, though, where "
+"Vidalia may prompt you for a password:"
 
 # type: Content of: <html><body><ul><li>
 #: en/troubleshooting.html:82
@@ -138,14 +165,21 @@ msgid ""
 "Tor Browser Bundle. In that case, you'll need to close the old Vidalia and "
 "Tor before you can run this one."
 msgstr ""
+"You're already running Vidalia and Tor. For example, this situation can "
+"happen if you installed the Vidalia bundle and now you're trying to run the "
+"Tor Browser Bundle. In that case, you'll need to close the old Vidalia and "
+"Tor before you can run this one."
 
 # 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 ""
+"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."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:94
@@ -154,6 +188,9 @@ msgid ""
 "button, you can click the button and Vidalia will restart Tor with a new "
 "random control password."
 msgstr ""
+"If the dialog that prompts you for a control password has a <i>Reset</i> "
+"button, you can click the button and Vidalia will restart Tor with a new "
+"random control password."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:99
@@ -163,55 +200,75 @@ msgid ""
 "process or task manager, and terminate the Tor process. Then use Vidalia to "
 "restart Tor and all will work again."
 msgstr ""
+"If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart "
+"Tor for you, you can still fix the problem manually. Simply go into your "
+"process or task manager, and terminate the Tor process. Then use Vidalia to "
+"restart Tor and all will work again."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:106
 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 ""
+"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."
 
 # type: Content of: <html><body><ul><li><p>
 #: en/troubleshooting.html:114
 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\";> "
-"Tor as a service</a> for more information on how to remove the Tor service."
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\";>"
+" Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
+"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\";>"
+" Tor as a service</a> for more information on how to remove the Tor service."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:122
 msgid "<a name=\"torexited\"/>"
-msgstr ""
+msgstr "<a name=\"torexited\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:123
 msgid "Tor Exited Unexpectedly"
-msgstr ""
+msgstr "Tor Exited Unexpectedly"
 
 # 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 ""
+"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:"
 
 # 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 ""
+"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
+"Is Tor already running?\n"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:135
@@ -222,25 +279,34 @@ msgid ""
 "operating systems, the <i>ps</i> command can help you find the other Tor "
 "process."
 msgstr ""
+"If you find an error message like the one above, you will need to stop the "
+"other Tor process before starting a new one with Vidalia. On Windows, you "
+"would need to look for <i>tor.exe</i> in your Task Manager. On most other "
+"operating systems, the <i>ps</i> command can help you find the other Tor "
+"process."
 
 # type: Content of: <html><body><p>
 #: 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 ""
+"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 "
+"will be highlighted in either red or yellow."
 
 # type: Content of: <html><body>
 #: en/troubleshooting.html:147
 msgid "<a name=\"stop\"/>"
-msgstr ""
+msgstr "<a name=\"stop\"/>"
 
 # type: Content of: <html><body><h3>
 #: en/troubleshooting.html:148
 msgid "Vidalia Can't Stop Tor"
-msgstr ""
+msgstr "Vidalia Can't Stop Tor"
 
 # type: Content of: <html><body><p>
 #: en/troubleshooting.html:150
@@ -249,3 +315,8 @@ msgid ""
 "href=\"log.html\">message log</a> to see if Tor reported any errors while "
 "trying to exit."
 msgstr ""
+"If Vidalia cannot stop Tor, you should check your <a "
+"href=\"log.html\">message log</a> to see if Tor reported any errors while "
+"trying to exit."
+
+
diff --git a/tr/config.po b/tr/config.po
index 7613a9a..2b8d22d 100644
--- a/tr/config.po
+++ b/tr/config.po
@@ -1,16 +1,18 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-04-12 15:31+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-04-12 15:33+0000\n"
+"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr_TR\n"
+"Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
@@ -301,3 +303,5 @@ 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 ""
+
+
diff --git a/tr/index.po b/tr/index.po
index 66d86cd..6bc4939 100644
--- a/tr/index.po
+++ b/tr/index.po
@@ -1,28 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
-#, fuzzy
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"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/index.html:16
@@ -54,3 +45,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/tr/links.po b/tr/links.po
index 6c1a5ef..f5a5501 100644
--- a/tr/links.po
+++ b/tr/links.po
@@ -1,10 +1,12 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:12+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -78,3 +80,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/zh_CN/bridges.po b/zh_CN/bridges.po
index 4c37706..172f14c 100644
--- a/zh_CN/bridges.po
+++ b/zh_CN/bridges.po
@@ -1,10 +1,13 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
+# snakeyi <snakeyi0624@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2011-03-04 19:03+0000\n"
+"PO-Revision-Date: 2011-03-22 16:41+0000\n"
 "Last-Translator: snakeyi <snakeyi0624@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -97,3 +100,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_CN/index.po b/zh_CN/index.po
index b94bac8..202d352 100644
--- a/zh_CN/index.po
+++ b/zh_CN/index.po
@@ -1,29 +1,19 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 16:59+0200\n"
-"PO-Revision-Date: 2010-10-31 17:05+0200\n"
-"Last-Translator: jonchil <abcd666@xxxxxxxxx>\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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/index.html:16
@@ -42,12 +32,12 @@ msgstr "ä»?å·¦æ?¹ç??æ ?å½¢å?¾ä¸­é??æ?©ä¸?个帮å?©ä¸»é¢?æ??è??ç?¹å?»å?¨ä¸»é¢?å??
 msgid ""
 "You can use the <i>Find</i> button on the toolbar above to search within a "
 "particular help topic."
-msgstr "æ?¨å?¯ä»¥ä½¿ç?¨å·¥å?·æ ?ä¸?ç??<i>æ?¥æ?¾</i>æ??é?®æ?¥æ??ç´¢ç?¹å®?ç??帮å?©ä¸»é¢?"
+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 "ä¸?é?¢ç??<i>主页</i>æ??é?®ä¼?让æ?¨å??å?°ä¸»é¡µ"
+msgstr ""
 
 #. type: Content of: <html><body><p>
 #: en/index.html:34
@@ -55,4 +45,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 ""
-"æ?¨å?¯ä»¥è®¿é?®å?¨å¾?å¤?å?°æ?¹ç??å?°ç??<a href=\"links.html\">æ??帮å?©ç??é?¾æ?¥</a>主é¢?ï¼?æ?¥æ?¥æ?¾å?³äº? Vidalia å?? Tor æ?´å¤?ç??帮å?©å??ä¿¡æ?¯"
+
+
diff --git a/zh_CN/links.po b/zh_CN/links.po
index 9bfd6c9..0b7b5b2 100644
--- a/zh_CN/links.po
+++ b/zh_CN/links.po
@@ -1,10 +1,12 @@
 # 
+# Translators:
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2011-05-05 20:21+0200\n"
-"PO-Revision-Date: 2011-05-06 19:13+0000\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
@@ -78,3 +80,5 @@ msgstr ""
 #: links.html:60
 msgid "<a href=\"https://trac.torproject.org/\";> https://trac.torproject.org/</a>"
 msgstr ""
+
+
diff --git a/zh_CN/log.po b/zh_CN/log.po
index 0a62a83..f7e32f2 100644
--- a/zh_CN/log.po
+++ b/zh_CN/log.po
@@ -1,27 +1,20 @@
 # 
-#   $Id$
-# 
-#   This file is part of Vidalia, and is subject to the license terms in
-#   the LICENSE file, found in the top level directory of this
-#   distribution. If you did not receive the LICENSE file with this
-#   file, you may obtain it from the Vidalia source package distributed
-#   by the Vidalia Project at http://www.torproject.org/projects/vidalia.html.
-#   No part of Vidalia, including this file, may be copied, modified,
-#   propagated, or distributed except according to the terms described
-#   in the LICENSE file.
-# 
+# Translators:
+# jhk <j_hk001@xxxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-06-27 07:54-0600\n"
-"Last-Translator: Runa Sandvik <runa.sandvik@xxxxxxxxx>\n"
+"PO-Revision-Date: 2011-03-22 16:43+0000\n"
+"Last-Translator: jhk <j_hk001@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/log.html:16
@@ -31,15 +24,15 @@ 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 ""
-"é??è¿?æ¶?æ?¯æ?¥å¿?æ?¨å?¯ä»¥ç??å?°Torè¿?ç¨?ç??è¿?è¡?ç?¶æ??ä¿¡æ?¯ã?? <a name=\\\"basic\\\"/> æ¯?å??æ¶?æ?¯é?½æ??ä¸?个å?³è??ç??<i>ç¨?度级å?«</i>ï¼?ä»?<b>å?ºé?? "
-"</b> (æ??严é??) å?° <b>Debug</b> (æ??å??é?¿)ï¼?å?¯å??è?? <a "
-"href=\\\"#severities\\\">æ¶?æ?¯çº§å?«</a>段è?½ç??æ?´å¤?ä»?ç»?ã??<a name=\\\"severities\\\"/>"
+"é??è¿?æ¶?æ?¯æ?¥å¿?æ?¨å?¯ä»¥ç??å?°Torè¿?ç¨?ç??è¿?è¡?ç?¶æ??ä¿¡æ?¯ã?? <a name=\"basic\"/> æ¯?å??æ¶?æ?¯é?½æ??ä¸?个å?³è??ç??<i>ç¨?度级å?«</i>ï¼?ä»?<b>å?ºé?? "
+"</b> (æ??严é??) å?° <b>è°?è¯?</b> (æ??å??é?¿)ï¼?å?¯å??è?? <a href=\"#severities\">æ¶?æ?¯çº§å?«</a>段è?½ç??æ?´å¤?ä»?ç»?ã??<a "
+"name=\"severities\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/log.html:28
@@ -50,14 +43,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 "æ¶?æ?¯çº§å?«è¡¨æ??äº?该æ¶?æ?¯ç??é??è¦?ç¨?度ã??é«?级å?«ç??æ¶?æ?¯è¡¨æ??Torå?ºç?°äº?é?®é¢?ï¼? ä½?级å?«æ¶?æ?¯å??å?¨Torç??正常è¿?è¡?中å?ºç?°ï¼?ä¸?è?¬æ?¥è¯´ä¸?é??è¦?纪å½?"
 
 #. 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>
@@ -71,32 +65,32 @@ msgstr "<b>å?ºé??</b>ï¼?å??ç??äº?严é??ç??é??误ï¼?Toræ? æ³?继续è¿?è¡?ã??æ­¤
 #. 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 "<b>è­¦å??</b>ï¼?å??ç??äº?é??误ï¼?ä½?è¿?ä¸?è?´å?½ï¼?Torå?¯ä»¥ç»§ç»­è¿?è¡?ã??此类æ¶?æ?¯ä»¥<i>é»?è?²</i>é«?亮æ?¾ç¤ºã??"
 
 #. 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 "<b>注æ??</b>ï¼?Tor正常è¿?è¡?中è¾?å°?å?ºç?°ç??æ¶?æ?¯ï¼?ä¸?被è§?ä½?é??误ï¼?ä½?ä»?è¦?å¼?起注æ??ã??"
 
 #. 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 "<b>ä¿¡æ?¯</b>ï¼?Tor正常è¿?è¡?中ç»?常å?ºç?°ç??æ¶?æ?¯ï¼?é??常ç?¨ä¸?ç??å?³æ³¨ã??"
 
 #. 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."
-msgstr "<b>Debug</b>ï¼?é??常å??é?¿ç??æ¶?æ?¯ï¼?å¼?å??å??ä¼?æ??å?´è¶£ã??é?¤é??ä½ ç?¥æ ¹ç?¥åº?ï¼?å?¦å??ä¸?é??è¦?纪å½?è¿?ç±»æ¶?æ?¯ã??"
+"developers. You should generally not log debug messages unless you know what"
+" you are doing."
+msgstr "<b>è°?è¯?</b>ï¼?é??常å??é?¿ç??æ¶?æ?¯ï¼?å¼?å??å??ä¼?æ??å?´è¶£ã??é?¤é??ä½ ç?¥æ ¹ç?¥åº?ï¼?å?¦å??ä¸?é??è¦?è®°å½?è¿?ç±»æ¶?æ?¯ã??"
 
 #. type: Content of: <html><body><p>
 #: en/log.html:66
@@ -107,7 +101,8 @@ msgstr "大é?¨å??ç?¨æ?·å?ªé??è¦?纪å½?<i>å?ºé??</i>ã??<i>è­¦å??</i>å??<i>注æ??<
 
 #. 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>
@@ -123,8 +118,8 @@ msgstr "�����������<i>�示设置</i>�"
 #. 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>
@@ -151,7 +146,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 "å?¾é??<i>å°?æ¶?æ?¯ä¿?å­?å?°æ??件</i>æ ?ç­¾ï¼?"
 
 #. type: Content of: <html><body><ol><li>
@@ -166,3 +162,5 @@ msgstr "æ?¨è?¥æ?³æ?¹å??æ¶?æ?¯å??å?¥ç??æ??件ï¼?å?¯ä»¥å?¨æ??æ?¬æ¡?中ç?´æ?¥è¾?å?¥
 #: en/log.html:100
 msgid "Click <i>Save Settings</i> to save your log destination."
 msgstr "æ??å??ç?¹å?»<i>ä¿?å­?设置</i>ã??"
+
+

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