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

translation at torproject.org translation at torproject.org
Sun Oct 16 10:28:40 UTC 2011


commit ee05c262801d92bae2278caf802419d2a1a4e0a7
Author: Translation commit bot <translation at torproject.org>
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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-04-12 15:33+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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 at gmail.com>, 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 at 35point5.com>\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <html><body><h1>
 #: en/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 at gmail.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 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 at ADDRESS>\n"
+"PO-Revision-Date: 2011-06-08 16:32+0000\n"
+"Last-Translator: imksa <malham1 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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 at gmail.com>, 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 at 35point5.com>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <html><body><h1>
 #: en/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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at 35point5.com>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <html><body><h1>
 #: en/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 at gmail.com>, 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 at 35point5.com>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <html><body><h1>
 #: en/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 at gmail.com>, 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 at 35point5.com>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <html><body><h1>
 #: en/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 at gmail.com>, 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 at 35point5.com>\n"
+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 # type: Content of: <html><body><h1>
 #: en/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 at hotmail.com>, 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 at ADDRESS>\n"
+"PO-Revision-Date: 2011-03-22 16:42+0000\n"
+"Last-Translator: Il_Tifossi <lluita_i_no_dorm at hotmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: 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 at hotmail.com>, 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 at hotmail.co.uk>, 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 at ADDRESS>\n"
+"PO-Revision-Date: 2011-05-14 22:22+0000\n"
+"Last-Translator: cymro <markives at hotmail.co.uk>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at hotmail.co.uk>, 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 at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-04-12 15:33+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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 at gmail.com>, 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 at ADDRESS>\n"
+"PO-Revision-Date: 2011-03-22 16:42+0000\n"
+"Last-Translator: aputsiaq <aputtu at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/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 at gmail.com>, 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 at ADDRESS>\n"
+"PO-Revision-Date: 2011-03-22 16:43+0000\n"
+"Last-Translator: aputsiaq <aputtu at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/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 at web.de>, 2011.
+# Sacro <Razor30 at web.de>, 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 at ADDRESS>\n"
+"PO-Revision-Date: 2011-06-28 08:06+0000\n"
+"Last-Translator: gregweb <gregweb at web.de>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: 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 at torproject.org</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 at gmx.de>, 2011.
+# runasand <runa.sandvik at gmail.com>, 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 at systemausfall.org>\n"
+"PO-Revision-Date: 2011-03-22 16:45+0000\n"
+"Last-Translator: NilsP <gibsorter at gmx.de>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: 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 at libero.it>, 2011.
+#   <fliegenfalle at ovi.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\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 at ovi.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: 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 at emaz73.e4ward.com>, 2011.
+#   <lutetia at hushmail.com>, 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 at ADDRESS>\n"
+"PO-Revision-Date: 2011-06-30 19:50+0000\n"
+"Last-Translator: parla <lutetia at hushmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.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 at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: 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 at emaz73.e4ward.com>, 2011.
+#   <benni at include-benni.de>, 2011.
+#   <lutetia at hushmail.com>, 2011.
+#   <ricod1996 at freenet.de>, 2011.
+# runasand <runa.sandvik at gmail.com>, 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 at web.de>\n"
+"PO-Revision-Date: 2011-08-09 16:08+0000\n"
+"Last-Translator: ricod1996 <ricod1996 at freenet.de>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: 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 at googlemail.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-04-16 20:48+0000\n"
+"Last-Translator: bastik <bastik.tor at googlemail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: 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 at web.de>, 2011.
+#   <lutetia at hushmail.com>, 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 at ADDRESS>\n"
+"PO-Revision-Date: 2011-06-30 06:05+0000\n"
+"Last-Translator: parla <lutetia at hushmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.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 at gmail.com>, 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 at 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 at hotmail.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: es\n"
+"PO-Revision-Date: 2011-10-10 13:16+0000\n"
+"Last-Translator: ernestob <ernesto_pow at hotmail.com>\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 at 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 at 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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at hotmail.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: es\n"
+"PO-Revision-Date: 2011-10-14 09:49+0000\n"
+"Last-Translator: ernestob <ernesto_pow at hotmail.com>\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-07-16 04:10+0000\n"
+"Last-Translator: arashaalaei <aalaeiarash at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at torproject.org است. این "
 "عبارت را(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 at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2010-12-21 22:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 2011.
+# perspolis <rezarms at yahoo.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-07-09 18:12+0000\n"
+"Last-Translator: knematipour <kaveh.nematipour at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 2011.
+#   <behravanhamed at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-07-03 22:25+0000\n"
+"Last-Translator: arashaalaei <aalaeiarash at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-06-29 15:23+0000\n"
+"Last-Translator: behravan <behravanhamed at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 2011.
+#   <behravanhamed at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-07-05 19:48+0000\n"
+"Last-Translator: arashaalaei <aalaeiarash at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 2011.
+#   <behravanhamed at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-07-14 02:16+0000\n"
+"Last-Translator: arashaalaei <aalaeiarash at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 2011.
+# skhaen <skhaen at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: 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 at liberte-info.net>, 2011.
+# runasand <runa.sandvik at gmail.com>, 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 at ADDRESS>\n"
+"PO-Revision-Date: 2011-05-11 00:17+0000\n"
+"Last-Translator: mehditaileb <mehditaileb at liberte-info.net>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 2011.
+# skhaen <skhaen at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: 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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: 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 at gmail.com>, 2011.
+# skhaen <skhaen at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: 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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: 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 at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at 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 at gmail.com>, 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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-05-06 12:30+0000\n"
+"Last-Translator: zfrns84 <silviazaf at gmail.com>\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 at gmail.com>, 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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-05-02 20:18+0000\n"
+"Last-Translator: zfrns84 <silviazaf at gmail.com>\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 at gmail.com>, 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 at 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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at 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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: 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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: 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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: 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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: 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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: 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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: 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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: 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 at gmail.com>, 2011.
+# Shondoit Walker <shondoit+transifex at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-10-12 21:14+0000\n"
+"Last-Translator: Shondoit <shondoit+transifex at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at hotmail.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 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 at ADDRESS>\n"
+"PO-Revision-Date: 2011-10-12 12:42+0000\n"
+"Last-Translator: enc <buzzkruid at hotmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 2011.
+# Shondoit Walker <shondoit+transifex at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-10-12 21:18+0000\n"
+"Last-Translator: Shondoit <shondoit+transifex at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at hotmail.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-10-13 22:43+0000\n"
+"Last-Translator: enc <buzzkruid at hotmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at hotmail.com>\n"
+"PO-Revision-Date: 2011-04-27 07:02+0000\n"
+"Last-Translator: ssdoria <ssdoria at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -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 at torproject.org</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 at torproject.org</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 at gmail.com>, 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 at 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 at gmail.com>, 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 at mail.ru>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2010-12-21 22:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL at 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 at gmail.com>, 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 at gmail.com>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL at 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 at gmail.com>, 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 at 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 at gmail.com>, 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 at mail.ru>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at 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 at gmail.com>, 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 at 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 at gmail.com>, 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 at mail.ru>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at 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 at gmail.com>, 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 at mail.ru>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at 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 at gmail.com>, 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 at mail.ru>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2010-11-30 05:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at 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 at gmail.com>, 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 at mail.ru>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ru\n"
+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL at 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 at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"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 at torproject.org</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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"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 at gmail.com>, 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 at ADDRESS>\n"
+"PO-Revision-Date: 2011-04-12 15:33+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 2011.
+# snakeyi <snakeyi0624 at gmail.com>, 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 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2010-11-30 05:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/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 at gmail.com>, 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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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 at 126.com>, 2011.
+# runasand <runa.sandvik at gmail.com>, 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 at gmail.com>\n"
+"PO-Revision-Date: 2011-03-22 16:43+0000\n"
+"Last-Translator: jhk <j_hk001 at 126.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: 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>。"
+
+



More information about the tor-commits mailing list