[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [translation/vidalia_installer] Update translations for vidalia_installer

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/vidalia_installer] Update translations for vidalia_installer
From: translation@xxxxxxxxxxxxxx
Date: Sat, 3 Sep 2011 15:07:43 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 03 Sep 2011 11:33:28 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: code repository commits <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx
commit 29882edb1bf4fae99ac390475e98d76906305af2
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Sat Sep 3 13:31:55 2011 +0000

    Update translations for vidalia_installer
---
 af/vidalia_af.po       |    2 +-
 ak/vidalia_ak.po       |    2 +-
 am/vidalia_am.po       |    2 +-
 arn/vidalia_arn.po     |    2 +-
 ast/vidalia_ast.po     |    2 +-
 be/vidalia_be.po       |   97 ++++++++++++++++++++++++++++--------------
 bg/vidalia_bg.po       |    2 +-
 bn/vidalia_bn.po       |   97 ++++++++++++++++++++++++++++--------------
 bn_IN/vidalia_bn_IN.po |    2 +-
 bo/vidalia_bo.po       |   97 ++++++++++++++++++++++++++++--------------
 br/vidalia_br.po       |   97 ++++++++++++++++++++++++++++--------------
 bs/vidalia_bs.po       |   97 ++++++++++++++++++++++++++++--------------
 csb/vidalia_csb.po     |    2 +-
 de_CH/vidalia_de_CH.po |    2 +-
 de_DE/vidalia_de_DE.po |   97 ++++++++++++++++++++++++++++--------------
 dz/vidalia_dz.po       |    2 +-
 eo/vidalia_eo.po       |    2 +-
 eu/vidalia_eu.po       |    2 +-
 fil/vidalia_fil.po     |    2 +-
 fo/vidalia_fo.po       |   97 ++++++++++++++++++++++++++++--------------
 fur/vidalia_fur.po     |    2 +-
 fy/vidalia_fy.po       |   97 ++++++++++++++++++++++++++++--------------
 ga/vidalia_ga.po       |    2 +-
 gl/vidalia_gl.po       |    2 +-
 gu/vidalia_gu.po       |    2 +-
 gun/vidalia_gun.po     |    2 +-
 ha/vidalia_ha.po       |    2 +-
 hi/vidalia_hi.po       |    2 +-
 hr/vidalia_hr.po       |    2 +-
 ht/vidalia_ht.po       |    2 +-
 hu/vidalia_hu.po       |    2 +-
 hy/vidalia_hy.po       |   97 ++++++++++++++++++++++++++++--------------
 is/vidalia_is.po       |    2 +-
 jv/vidalia_jv.po       |   97 ++++++++++++++++++++++++++++--------------
 ka/vidalia_ka.po       |   97 ++++++++++++++++++++++++++++--------------
 km/vidalia_km.po       |   97 ++++++++++++++++++++++++++++--------------
 kn/vidalia_kn.po       |    2 +-
 ku/vidalia_ku.po       |   97 ++++++++++++++++++++++++++++--------------
 kw/vidalia_kw.po       |   97 ++++++++++++++++++++++++++++--------------
 ky/vidalia_ky.po       |   97 ++++++++++++++++++++++++++++--------------
 lb/vidalia_lb.po       |    2 +-
 ln/vidalia_ln.po       |    2 +-
 lo/vidalia_lo.po       |    2 +-
 lt/vidalia_lt.po       |    2 +-
 lv/vidalia_lv.po       |    2 +-
 mg/vidalia_mg.po       |    2 +-
 mi/vidalia_mi.po       |    2 +-
 mk/vidalia_mk.po       |    2 +-
 ml/vidalia_ml.po       |    2 +-
 mn/vidalia_mn.po       |    2 +-
 mr/vidalia_mr.po       |    2 +-
 ms/vidalia_ms.po       |    2 +-
 mt/vidalia_mt.po       |    2 +-
 nah/vidalia_nah.po     |    2 +-
 nap/vidalia_nap.po     |    2 +-
 ne/vidalia_ne.po       |    2 +-
 nn/vidalia_nn.po       |    2 +-
 nso/vidalia_nso.po     |    2 +-
 oc/vidalia_oc.po       |    2 +-
 or/vidalia_or.po       |   97 ++++++++++++++++++++++++++++--------------
 pa/vidalia_pa.po       |    2 +-
 pap/vidalia_pap.po     |    2 +-
 pms/vidalia_pms.po     |    2 +-
 ps/vidalia_ps.po       |    2 +-
 pt_BR/vidalia_pt_BR.po |    2 +-
 sco/vidalia_sco.po     |    2 +-
 sk/vidalia_sk.po       |   97 ++++++++++++++++++++++++++++--------------
 sl/vidalia_sl.po       |  109 +++++++++++++++++++++++++++++++++++++-----------
 so/vidalia_so.po       |   97 ++++++++++++++++++++++++++++--------------
 son/vidalia_son.po     |    2 +-
 sq/vidalia_sq.po       |   97 ++++++++++++++++++++++++++++--------------
 sr/vidalia_sr.po       |   83 +++++++++++++++++++++++-------------
 st/vidalia_st.po       |   97 ++++++++++++++++++++++++++++--------------
 su/vidalia_su.po       |    2 +-
 sw/vidalia_sw.po       |    2 +-
 ta/vidalia_ta.po       |    2 +-
 te/vidalia_te.po       |    2 +-
 tg/vidalia_tg.po       |    2 +-
 ti/vidalia_ti.po       |    2 +-
 tk/vidalia_tk.po       |    2 +-
 ur/vidalia_ur.po       |    2 +-
 ve/vidalia_ve.po       |    2 +-
 wa/vidalia_wa.po       |   97 ++++++++++++++++++++++++++++--------------
 wo/vidalia_wo.po       |   97 ++++++++++++++++++++++++++++--------------
 zh_HK/vidalia_zh_HK.po |    2 +-
 zu/vidalia_zu.po       |    2 +-
 86 files changed, 1629 insertions(+), 821 deletions(-)

diff --git a/af/vidalia_af.po b/af/vidalia_af.po
index 96bdce1..5c46b33 100755
--- a/af/vidalia_af.po
+++ b/af/vidalia_af.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ak/vidalia_ak.po b/ak/vidalia_ak.po
index b34dff3..d08f104 100644
--- a/ak/vidalia_ak.po
+++ b/ak/vidalia_ak.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/am/vidalia_am.po b/am/vidalia_am.po
index a6a90a9..84d2cff 100755
--- a/am/vidalia_am.po
+++ b/am/vidalia_am.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/arn/vidalia_arn.po b/arn/vidalia_arn.po
index 2a0f43e..e1d2234 100755
--- a/arn/vidalia_arn.po
+++ b/arn/vidalia_arn.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ast/vidalia_ast.po b/ast/vidalia_ast.po
index 3745a2d..43aafd8 100755
--- a/ast/vidalia_ast.po
+++ b/ast/vidalia_ast.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/be/vidalia_be.po b/be/vidalia_be.po
index bc333d8..244b2ea 100755
--- a/be/vidalia_be.po
+++ b/be/vidalia_be.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/bg/vidalia_bg.po b/bg/vidalia_bg.po
index cc6c1eb..9409933 100755
--- a/bg/vidalia_bg.po
+++ b/bg/vidalia_bg.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/bn/vidalia_bn.po b/bn/vidalia_bn.po
index bc333d8..2a02a75 100755
--- a/bn/vidalia_bn.po
+++ b/bn/vidalia_bn.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/bn_IN/vidalia_bn_IN.po b/bn_IN/vidalia_bn_IN.po
index 2c43845..631ea86 100755
--- a/bn_IN/vidalia_bn_IN.po
+++ b/bn_IN/vidalia_bn_IN.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/bo/vidalia_bo.po b/bo/vidalia_bo.po
index bc333d8..d410e33 100755
--- a/bo/vidalia_bo.po
+++ b/bo/vidalia_bo.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: bo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/br/vidalia_br.po b/br/vidalia_br.po
index bc333d8..ea30257 100755
--- a/br/vidalia_br.po
+++ b/br/vidalia_br.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/bs/vidalia_bs.po b/bs/vidalia_bs.po
index bc333d8..c2ffea2 100755
--- a/bs/vidalia_bs.po
+++ b/bs/vidalia_bs.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/csb/vidalia_csb.po b/csb/vidalia_csb.po
index 7dfc0f6..770475e 100755
--- a/csb/vidalia_csb.po
+++ b/csb/vidalia_csb.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/de_CH/vidalia_de_CH.po b/de_CH/vidalia_de_CH.po
index 3260e99..05fd064 100755
--- a/de_CH/vidalia_de_CH.po
+++ b/de_CH/vidalia_de_CH.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/de_DE/vidalia_de_DE.po b/de_DE/vidalia_de_DE.po
index bc333d8..741f9dc 100755
--- a/de_DE/vidalia_de_DE.po
+++ b/de_DE/vidalia_de_DE.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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_DE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/dz/vidalia_dz.po b/dz/vidalia_dz.po
index ad6794b..6e67b0f 100755
--- a/dz/vidalia_dz.po
+++ b/dz/vidalia_dz.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/eo/vidalia_eo.po b/eo/vidalia_eo.po
index 4143410..ba27449 100755
--- a/eo/vidalia_eo.po
+++ b/eo/vidalia_eo.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po
index bc36cf7..d7a7ef9 100755
--- a/eu/vidalia_eu.po
+++ b/eu/vidalia_eu.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/fil/vidalia_fil.po b/fil/vidalia_fil.po
index a56be46..c8225c6 100755
--- a/fil/vidalia_fil.po
+++ b/fil/vidalia_fil.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/fo/vidalia_fo.po b/fo/vidalia_fo.po
index bc333d8..d3edefa 100755
--- a/fo/vidalia_fo.po
+++ b/fo/vidalia_fo.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: fo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/fur/vidalia_fur.po b/fur/vidalia_fur.po
index 1169170..ea6737c 100755
--- a/fur/vidalia_fur.po
+++ b/fur/vidalia_fur.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/fy/vidalia_fy.po b/fy/vidalia_fy.po
index bc333d8..4869d9a 100755
--- a/fy/vidalia_fy.po
+++ b/fy/vidalia_fy.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/ga/vidalia_ga.po b/ga/vidalia_ga.po
index 963a95b..8fc0f4e 100755
--- a/ga/vidalia_ga.po
+++ b/ga/vidalia_ga.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/gl/vidalia_gl.po b/gl/vidalia_gl.po
index e56c358..ff31693 100755
--- a/gl/vidalia_gl.po
+++ b/gl/vidalia_gl.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/gu/vidalia_gu.po b/gu/vidalia_gu.po
index 7228db6..c0a62f4 100755
--- a/gu/vidalia_gu.po
+++ b/gu/vidalia_gu.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/gun/vidalia_gun.po b/gun/vidalia_gun.po
index 2dd9b8a..9390666 100755
--- a/gun/vidalia_gun.po
+++ b/gun/vidalia_gun.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ha/vidalia_ha.po b/ha/vidalia_ha.po
index b5a9e84..7876968 100755
--- a/ha/vidalia_ha.po
+++ b/ha/vidalia_ha.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/hi/vidalia_hi.po b/hi/vidalia_hi.po
index b18a2f1..77857ec 100755
--- a/hi/vidalia_hi.po
+++ b/hi/vidalia_hi.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/hr/vidalia_hr.po b/hr/vidalia_hr.po
index 1625b25..f8842ee 100755
--- a/hr/vidalia_hr.po
+++ b/hr/vidalia_hr.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ht/vidalia_ht.po b/ht/vidalia_ht.po
index 464e8df..b189203 100755
--- a/ht/vidalia_ht.po
+++ b/ht/vidalia_ht.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/hu/vidalia_hu.po b/hu/vidalia_hu.po
index 8ba987c..51fb53d 100755
--- a/hu/vidalia_hu.po
+++ b/hu/vidalia_hu.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/hy/vidalia_hy.po b/hy/vidalia_hy.po
index bc333d8..de28665 100755
--- a/hy/vidalia_hy.po
+++ b/hy/vidalia_hy.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/is/vidalia_is.po b/is/vidalia_is.po
index 9c7adc7..2cf424e 100755
--- a/is/vidalia_is.po
+++ b/is/vidalia_is.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/jv/vidalia_jv.po b/jv/vidalia_jv.po
index bc333d8..d7a3c22 100755
--- a/jv/vidalia_jv.po
+++ b/jv/vidalia_jv.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: jv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/ka/vidalia_ka.po b/ka/vidalia_ka.po
index bc333d8..fe90f9b 100755
--- a/ka/vidalia_ka.po
+++ b/ka/vidalia_ka.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: ka\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/km/vidalia_km.po b/km/vidalia_km.po
index bc333d8..39ea622 100755
--- a/km/vidalia_km.po
+++ b/km/vidalia_km.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: km\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/kn/vidalia_kn.po b/kn/vidalia_kn.po
index 5f2684f..070319e 100755
--- a/kn/vidalia_kn.po
+++ b/kn/vidalia_kn.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ku/vidalia_ku.po b/ku/vidalia_ku.po
index bc333d8..578c5bf 100755
--- a/ku/vidalia_ku.po
+++ b/ku/vidalia_ku.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: ku\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/kw/vidalia_kw.po b/kw/vidalia_kw.po
index bc333d8..874921e 100755
--- a/kw/vidalia_kw.po
+++ b/kw/vidalia_kw.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: kw\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/ky/vidalia_ky.po b/ky/vidalia_ky.po
index bc333d8..cf80eb4 100755
--- a/ky/vidalia_ky.po
+++ b/ky/vidalia_ky.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: ky\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/lb/vidalia_lb.po b/lb/vidalia_lb.po
index 2f9d267..1332aae 100755
--- a/lb/vidalia_lb.po
+++ b/lb/vidalia_lb.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ln/vidalia_ln.po b/ln/vidalia_ln.po
index 5ee213a..9a97a61 100755
--- a/ln/vidalia_ln.po
+++ b/ln/vidalia_ln.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/lo/vidalia_lo.po b/lo/vidalia_lo.po
index b8944d6..62ec9c9 100755
--- a/lo/vidalia_lo.po
+++ b/lo/vidalia_lo.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/lt/vidalia_lt.po b/lt/vidalia_lt.po
index d4c2a5d..f13cc8c 100755
--- a/lt/vidalia_lt.po
+++ b/lt/vidalia_lt.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po
index 8a6e82b..af41bb9 100755
--- a/lv/vidalia_lv.po
+++ b/lv/vidalia_lv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/mg/vidalia_mg.po b/mg/vidalia_mg.po
index dcad8a1..520b2c8 100755
--- a/mg/vidalia_mg.po
+++ b/mg/vidalia_mg.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/mi/vidalia_mi.po b/mi/vidalia_mi.po
index 0ffb72c..cc147a2 100755
--- a/mi/vidalia_mi.po
+++ b/mi/vidalia_mi.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/mk/vidalia_mk.po b/mk/vidalia_mk.po
index 9e950b9..93634a6 100755
--- a/mk/vidalia_mk.po
+++ b/mk/vidalia_mk.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ml/vidalia_ml.po b/ml/vidalia_ml.po
index 030cc06..25886de 100755
--- a/ml/vidalia_ml.po
+++ b/ml/vidalia_ml.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/mn/vidalia_mn.po b/mn/vidalia_mn.po
index a7e9b3e..9737f9b 100755
--- a/mn/vidalia_mn.po
+++ b/mn/vidalia_mn.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/mr/vidalia_mr.po b/mr/vidalia_mr.po
index 1e90ae8..3ef3152 100755
--- a/mr/vidalia_mr.po
+++ b/mr/vidalia_mr.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ms/vidalia_ms.po b/ms/vidalia_ms.po
index c389176..5113b92 100755
--- a/ms/vidalia_ms.po
+++ b/ms/vidalia_ms.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/mt/vidalia_mt.po b/mt/vidalia_mt.po
index a8af285..213beb0 100755
--- a/mt/vidalia_mt.po
+++ b/mt/vidalia_mt.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/nah/vidalia_nah.po b/nah/vidalia_nah.po
index f90c4f6..0bf01c7 100755
--- a/nah/vidalia_nah.po
+++ b/nah/vidalia_nah.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/nap/vidalia_nap.po b/nap/vidalia_nap.po
index e87d448..ee03d97 100755
--- a/nap/vidalia_nap.po
+++ b/nap/vidalia_nap.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ne/vidalia_ne.po b/ne/vidalia_ne.po
index 7f4496a..ff7e86e 100755
--- a/ne/vidalia_ne.po
+++ b/ne/vidalia_ne.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/nn/vidalia_nn.po b/nn/vidalia_nn.po
index f476847..6ff743f 100755
--- a/nn/vidalia_nn.po
+++ b/nn/vidalia_nn.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/nso/vidalia_nso.po b/nso/vidalia_nso.po
index 5e68ab2..d605c8e 100755
--- a/nso/vidalia_nso.po
+++ b/nso/vidalia_nso.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/oc/vidalia_oc.po b/oc/vidalia_oc.po
index 191334a..2cc60e3 100755
--- a/oc/vidalia_oc.po
+++ b/oc/vidalia_oc.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/or/vidalia_or.po b/or/vidalia_or.po
index bc333d8..4ac0852 100755
--- a/or/vidalia_or.po
+++ b/or/vidalia_or.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/pa/vidalia_pa.po b/pa/vidalia_pa.po
index b89f84b..f4be58f 100755
--- a/pa/vidalia_pa.po
+++ b/pa/vidalia_pa.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/pap/vidalia_pap.po b/pap/vidalia_pap.po
index 65c86ef..a98afa3 100755
--- a/pap/vidalia_pap.po
+++ b/pap/vidalia_pap.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/pms/vidalia_pms.po b/pms/vidalia_pms.po
index c8ec183..1b772aa 100755
--- a/pms/vidalia_pms.po
+++ b/pms/vidalia_pms.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ps/vidalia_ps.po b/ps/vidalia_ps.po
index eef2b2d..d7ebbd8 100644
--- a/ps/vidalia_ps.po
+++ b/ps/vidalia_ps.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/pt_BR/vidalia_pt_BR.po b/pt_BR/vidalia_pt_BR.po
index f4961d9..2e6cc39 100755
--- a/pt_BR/vidalia_pt_BR.po
+++ b/pt_BR/vidalia_pt_BR.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/sco/vidalia_sco.po b/sco/vidalia_sco.po
index 014d688..b363280 100755
--- a/sco/vidalia_sco.po
+++ b/sco/vidalia_sco.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:09+0000\n"
+"PO-Revision-Date: 2011-09-03 13:30+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/sk/vidalia_sk.po b/sk/vidalia_sk.po
index bc333d8..eab08c6 100755
--- a/sk/vidalia_sk.po
+++ b/sk/vidalia_sk.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/sl/vidalia_sl.po b/sl/vidalia_sl.po
index 5176201..1014bf2 100755
--- a/sl/vidalia_sl.po
+++ b/sl/vidalia_sl.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -179,3 +207,34 @@ msgstr ""
 msgctxt "LanguageCode"
 msgid "en"
 msgstr ""
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
+
+msgctxt "FirefoxWarningPageUpperText"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
+"Tor will work with other browsers, such as Internet Explorer, but\n"
+"is easier to use with Firefox, which also does a better job of\n"
+"protecting your anonymity.\n"
+"\n"
+"If you would like to install Firefox, please press Cancel, then go\n"
+"to the Firefox download page at"
+msgstr ""
+
+msgctxt "FirefoxWarningPageLowerText"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
+"Or, if you would prefer to install Tor without Firefox, simply\n"
+"press Next to continue."
+msgstr ""
+
+
diff --git a/so/vidalia_so.po b/so/vidalia_so.po
index bc333d8..1446022 100755
--- a/so/vidalia_so.po
+++ b/so/vidalia_so.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: so\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/son/vidalia_son.po b/son/vidalia_son.po
index ebe32a1..4613705 100755
--- a/son/vidalia_son.po
+++ b/son/vidalia_son.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/sq/vidalia_sq.po b/sq/vidalia_sq.po
index bc333d8..cef938b 100755
--- a/sq/vidalia_sq.po
+++ b/sq/vidalia_sq.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/sr/vidalia_sr.po b/sr/vidalia_sr.po
index 90bf4a6..e9c88ef 100644
--- a/sr/vidalia_sr.po
+++ b/sr/vidalia_sr.po
@@ -1,16 +1,17 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
@@ -18,16 +19,17 @@ msgstr ""
 
 msgctxt "BundleWelcomeText"
 msgid ""
-"This wizard will guide you through the installation of Tor, "
-"Vidalia, Polipo, and Torbutton.\n\nTor is a system for using the "
-"Internet anonymously, helping you anonymize Web browsing and publishing, "
-"instant messaging, IRC, and more. Vidalia is a GUI that helps you "
-"control, monitor, and configure Tor.\n\nPolipo is a caching web proxy "
-"that helps increase performance of browsing the web through "
-"Tor.\n\nTorbutton is a Firefox extension that allows you to quickly "
-"enable or disable anonymous web browsing.\n\nIf you have previously "
-"installed Tor, Vidalia, Polipo, or Firefox, please make sure they are "
-"not running before continuing this installation.\n\n$_CLICK"
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -39,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -59,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -95,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -107,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -127,7 +141,9 @@ msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
 msgctxt "PolipoGroupDesc"
-msgid "Polipo is a caching web proxy that increases performance of web browsing through Tor."
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
 msgctxt "PolipoUninstDesc"
@@ -155,7 +171,9 @@ msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -195,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/st/vidalia_st.po b/st/vidalia_st.po
index bc333d8..293c055 100755
--- a/st/vidalia_st.po
+++ b/st/vidalia_st.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: st\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/su/vidalia_su.po b/su/vidalia_su.po
index d6bc462..a049411 100755
--- a/su/vidalia_su.po
+++ b/su/vidalia_su.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/sw/vidalia_sw.po b/sw/vidalia_sw.po
index c7e5a0d..971ba82 100755
--- a/sw/vidalia_sw.po
+++ b/sw/vidalia_sw.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ta/vidalia_ta.po b/ta/vidalia_ta.po
index d74e088..49a9a80 100755
--- a/ta/vidalia_ta.po
+++ b/ta/vidalia_ta.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/te/vidalia_te.po b/te/vidalia_te.po
index c538c48..0236406 100755
--- a/te/vidalia_te.po
+++ b/te/vidalia_te.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/tg/vidalia_tg.po b/tg/vidalia_tg.po
index 8a058c1..1d03e0f 100755
--- a/tg/vidalia_tg.po
+++ b/tg/vidalia_tg.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ti/vidalia_ti.po b/ti/vidalia_ti.po
index a6c9892..1a05a62 100755
--- a/ti/vidalia_ti.po
+++ b/ti/vidalia_ti.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/tk/vidalia_tk.po b/tk/vidalia_tk.po
index d6b3bc9..1815086 100755
--- a/tk/vidalia_tk.po
+++ b/tk/vidalia_tk.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ur/vidalia_ur.po b/ur/vidalia_ur.po
index 24408b2..eed2be4 100644
--- a/ur/vidalia_ur.po
+++ b/ur/vidalia_ur.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/ve/vidalia_ve.po b/ve/vidalia_ve.po
index 1246fe5..14a6fab 100755
--- a/ve/vidalia_ve.po
+++ b/ve/vidalia_ve.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/wa/vidalia_wa.po b/wa/vidalia_wa.po
index bc333d8..2dea9d5 100755
--- a/wa/vidalia_wa.po
+++ b/wa/vidalia_wa.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: wa\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/wo/vidalia_wo.po b/wo/vidalia_wo.po
index bc333d8..9203c8c 100755
--- a/wo/vidalia_wo.po
+++ b/wo/vidalia_wo.po
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations@xxxxxxxxxxxxxxxxxxx\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: wo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr ""
 
 msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@ msgid "${TOR_NAME} installation documentation"
 msgstr ""
 
 msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 
 msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@ msgid "${VIDALIA_NAME} setup"
 msgstr ""
 
 msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 
 msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@ msgid "Run ${VIDALIA_NAME}"
 msgstr ""
 
 msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
 msgstr ""
 
 msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@ msgid "Install ${TOR_DESC}."
 msgstr ""
 
 msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
 
 msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@ msgctxt "TorShortcutsDesc"
 msgid "Add ${TOR_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
 msgstr ""
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
 msgstr ""
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
 msgid "Add to Start Menu"
 msgstr ""
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
 msgstr ""
 
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
 msgid "Run At Startup"
 msgstr ""
 
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
 msgstr ""
 
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 msgstr ""
 
 msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,28 @@ msgid "Firefox is not installed"
 msgstr ""
 
 msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
 
 msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
 "Tor will work with other browsers, such as Internet Explorer, but\n"
 "is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
 "If you would like to install Firefox, please press Cancel, then go\n"
 "to the Firefox download page at"
 msgstr ""
 
 msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
 "Or, if you would prefer to install Tor without Firefox, simply\n"
 "press Next to continue."
 msgstr ""
+
+
diff --git a/zh_HK/vidalia_zh_HK.po b/zh_HK/vidalia_zh_HK.po
index 0da9632..b6ee9ad 100755
--- a/zh_HK/vidalia_zh_HK.po
+++ b/zh_HK/vidalia_zh_HK.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:10+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
diff --git a/zu/vidalia_zu.po b/zu/vidalia_zu.po
index f49c971..24ea1da 100755
--- a/zu/vidalia_zu.po
+++ b/zu/vidalia_zu.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2011-08-10 11:11+0000\n"
+"PO-Revision-Date: 2011-09-03 13:31+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
Prev by Author: [tor-commits] [translation/vidalia_installer] Update translations for vidalia_installer
Next by Author: [tor-commits] [translation/vidalia_installer] Update translations for vidalia_installer
Previous by thread: [tor-commits] [translation/vidalia_installer] Update translations for vidalia_installer
Next by thread: [tor-commits] [translation/vidalia_installer] Update translations for vidalia_installer
Index(es):
- Author
- Thread