[tor-commits] r4525: updated translations for vidalia installer (in vidalia/trunk/pkg/win32/po: .tx af ak am arn ast bg bn_IN csb cy de_CH dz eo eu fil fur ga gl gu gun ha hi hr ht hu is kn lb ln lo lt lv mg mi mk ml mn mr ms mt nah nap ne nn nso oc pa pap pms ps pt_BR sco son su sw ta te tg ti tk ur ve zh_HK zu)

vidalia-svn at svn.torproject.org vidalia-svn at svn.torproject.org
Wed Mar 2 09:45:38 UTC 2011


Author: runa
Date: 2011-03-02 09:45:37 +0000 (Wed, 02 Mar 2011)
New Revision: 4525

Modified:
   vidalia/trunk/pkg/win32/po/.tx/config
   vidalia/trunk/pkg/win32/po/af/vidalia_af.po
   vidalia/trunk/pkg/win32/po/ak/vidalia_ak.po
   vidalia/trunk/pkg/win32/po/am/vidalia_am.po
   vidalia/trunk/pkg/win32/po/arn/vidalia_arn.po
   vidalia/trunk/pkg/win32/po/ast/vidalia_ast.po
   vidalia/trunk/pkg/win32/po/bg/vidalia_bg.po
   vidalia/trunk/pkg/win32/po/bn_IN/vidalia_bn_IN.po
   vidalia/trunk/pkg/win32/po/csb/vidalia_csb.po
   vidalia/trunk/pkg/win32/po/cy/vidalia_cy.po
   vidalia/trunk/pkg/win32/po/de_CH/vidalia_de_CH.po
   vidalia/trunk/pkg/win32/po/dz/vidalia_dz.po
   vidalia/trunk/pkg/win32/po/eo/vidalia_eo.po
   vidalia/trunk/pkg/win32/po/eu/vidalia_eu.po
   vidalia/trunk/pkg/win32/po/fil/vidalia_fil.po
   vidalia/trunk/pkg/win32/po/fur/vidalia_fur.po
   vidalia/trunk/pkg/win32/po/ga/vidalia_ga.po
   vidalia/trunk/pkg/win32/po/gl/vidalia_gl.po
   vidalia/trunk/pkg/win32/po/gu/vidalia_gu.po
   vidalia/trunk/pkg/win32/po/gun/vidalia_gun.po
   vidalia/trunk/pkg/win32/po/ha/vidalia_ha.po
   vidalia/trunk/pkg/win32/po/hi/vidalia_hi.po
   vidalia/trunk/pkg/win32/po/hr/vidalia_hr.po
   vidalia/trunk/pkg/win32/po/ht/vidalia_ht.po
   vidalia/trunk/pkg/win32/po/hu/vidalia_hu.po
   vidalia/trunk/pkg/win32/po/is/vidalia_is.po
   vidalia/trunk/pkg/win32/po/kn/vidalia_kn.po
   vidalia/trunk/pkg/win32/po/lb/vidalia_lb.po
   vidalia/trunk/pkg/win32/po/ln/vidalia_ln.po
   vidalia/trunk/pkg/win32/po/lo/vidalia_lo.po
   vidalia/trunk/pkg/win32/po/lt/vidalia_lt.po
   vidalia/trunk/pkg/win32/po/lv/vidalia_lv.po
   vidalia/trunk/pkg/win32/po/mg/vidalia_mg.po
   vidalia/trunk/pkg/win32/po/mi/vidalia_mi.po
   vidalia/trunk/pkg/win32/po/mk/vidalia_mk.po
   vidalia/trunk/pkg/win32/po/ml/vidalia_ml.po
   vidalia/trunk/pkg/win32/po/mn/vidalia_mn.po
   vidalia/trunk/pkg/win32/po/mr/vidalia_mr.po
   vidalia/trunk/pkg/win32/po/ms/vidalia_ms.po
   vidalia/trunk/pkg/win32/po/mt/vidalia_mt.po
   vidalia/trunk/pkg/win32/po/nah/vidalia_nah.po
   vidalia/trunk/pkg/win32/po/nap/vidalia_nap.po
   vidalia/trunk/pkg/win32/po/ne/vidalia_ne.po
   vidalia/trunk/pkg/win32/po/nn/vidalia_nn.po
   vidalia/trunk/pkg/win32/po/nso/vidalia_nso.po
   vidalia/trunk/pkg/win32/po/oc/vidalia_oc.po
   vidalia/trunk/pkg/win32/po/pa/vidalia_pa.po
   vidalia/trunk/pkg/win32/po/pap/vidalia_pap.po
   vidalia/trunk/pkg/win32/po/pms/vidalia_pms.po
   vidalia/trunk/pkg/win32/po/ps/vidalia_ps.po
   vidalia/trunk/pkg/win32/po/pt_BR/vidalia_pt_BR.po
   vidalia/trunk/pkg/win32/po/sco/vidalia_sco.po
   vidalia/trunk/pkg/win32/po/son/vidalia_son.po
   vidalia/trunk/pkg/win32/po/su/vidalia_su.po
   vidalia/trunk/pkg/win32/po/sw/vidalia_sw.po
   vidalia/trunk/pkg/win32/po/ta/vidalia_ta.po
   vidalia/trunk/pkg/win32/po/te/vidalia_te.po
   vidalia/trunk/pkg/win32/po/tg/vidalia_tg.po
   vidalia/trunk/pkg/win32/po/ti/vidalia_ti.po
   vidalia/trunk/pkg/win32/po/tk/vidalia_tk.po
   vidalia/trunk/pkg/win32/po/ur/vidalia_ur.po
   vidalia/trunk/pkg/win32/po/ve/vidalia_ve.po
   vidalia/trunk/pkg/win32/po/zh_HK/vidalia_zh_HK.po
   vidalia/trunk/pkg/win32/po/zu/vidalia_zu.po
Log:
updated translations for vidalia installer

Modified: vidalia/trunk/pkg/win32/po/.tx/config
===================================================================
--- vidalia/trunk/pkg/win32/po/.tx/config	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/.tx/config	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,11 +1,11 @@
 [main]
-host = http://www.transifex.net
+host = https://www.transifex.net
 
 [torproject.vidalia-installer-vidalia-pot]
 source_file = templates/vidalia.pot
 source_lang = en
 trans.af = af/vidalia_af.po
-trans.ak = ak
+trans.ak = ak/vidalia_ak.po
 trans.am = am/vidalia_am.po
 trans.ar = ar/vidalia_ar.po
 trans.arn = arn/vidalia_arn.po

Modified: vidalia/trunk/pkg/win32/po/af/vidalia_af.po
===================================================================
--- vidalia/trunk/pkg/win32/po/af/vidalia_af.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/af/vidalia_af.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: af\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ak/vidalia_ak.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ak/vidalia_ak.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ak/vidalia_ak.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,15 +1,17 @@
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Vidalia Windows Installers\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Language: ak\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
@@ -17,16 +19,17 @@
 
 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"
@@ -38,7 +41,11 @@
 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"
@@ -58,7 +65,10 @@
 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"
@@ -94,7 +104,9 @@
 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"
@@ -106,7 +118,10 @@
 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"
@@ -126,7 +141,9 @@
 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"
@@ -154,7 +171,9 @@
 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"
@@ -194,23 +213,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/am/vidalia_am.po
===================================================================
--- vidalia/trunk/pkg/win32/po/am/vidalia_am.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/am/vidalia_am.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: am\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/arn/vidalia_arn.po
===================================================================
--- vidalia/trunk/pkg/win32/po/arn/vidalia_arn.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/arn/vidalia_arn.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: arn\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ast/vidalia_ast.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ast/vidalia_ast.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ast/vidalia_ast.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: ast\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/bg/vidalia_bg.po
===================================================================
--- vidalia/trunk/pkg/win32/po/bg/vidalia_bg.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/bg/vidalia_bg.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: bg\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/bn_IN/vidalia_bn_IN.po
===================================================================
--- vidalia/trunk/pkg/win32/po/bn_IN/vidalia_bn_IN.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/bn_IN/vidalia_bn_IN.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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_IN\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/csb/vidalia_csb.po
===================================================================
--- vidalia/trunk/pkg/win32/po/csb/vidalia_csb.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/csb/vidalia_csb.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: csb\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/cy/vidalia_cy.po
===================================================================
--- vidalia/trunk/pkg/win32/po/cy/vidalia_cy.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/cy/vidalia_cy.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:39+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: cy\n"
+"Plural-Forms: nplurals=4; plural=(n==2) ? 1 : 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/de_CH/vidalia_de_CH.po
===================================================================
--- vidalia/trunk/pkg/win32/po/de_CH/vidalia_de_CH.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/de_CH/vidalia_de_CH.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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_CH\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/dz/vidalia_dz.po
===================================================================
--- vidalia/trunk/pkg/win32/po/dz/vidalia_dz.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/dz/vidalia_dz.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: dz\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/eo/vidalia_eo.po
===================================================================
--- vidalia/trunk/pkg/win32/po/eo/vidalia_eo.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/eo/vidalia_eo.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: eo\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/eu/vidalia_eu.po
===================================================================
--- vidalia/trunk/pkg/win32/po/eu/vidalia_eu.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/eu/vidalia_eu.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: eu\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/fil/vidalia_fil.po
===================================================================
--- vidalia/trunk/pkg/win32/po/fil/vidalia_fil.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/fil/vidalia_fil.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: fil\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/fur/vidalia_fur.po
===================================================================
--- vidalia/trunk/pkg/win32/po/fur/vidalia_fur.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/fur/vidalia_fur.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: fur\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ga/vidalia_ga.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ga/vidalia_ga.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ga/vidalia_ga.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: ga\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4)\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/gl/vidalia_gl.po
===================================================================
--- vidalia/trunk/pkg/win32/po/gl/vidalia_gl.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/gl/vidalia_gl.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: gl\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/gu/vidalia_gu.po
===================================================================
--- vidalia/trunk/pkg/win32/po/gu/vidalia_gu.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/gu/vidalia_gu.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:39+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: gu\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/gun/vidalia_gun.po
===================================================================
--- vidalia/trunk/pkg/win32/po/gun/vidalia_gun.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/gun/vidalia_gun.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: gun\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ha/vidalia_ha.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ha/vidalia_ha.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ha/vidalia_ha.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: ha\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/hi/vidalia_hi.po
===================================================================
--- vidalia/trunk/pkg/win32/po/hi/vidalia_hi.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/hi/vidalia_hi.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: hi\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/hr/vidalia_hr.po
===================================================================
--- vidalia/trunk/pkg/win32/po/hr/vidalia_hr.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/hr/vidalia_hr.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: hr\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ht/vidalia_ht.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ht/vidalia_ht.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ht/vidalia_ht.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: ht\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/hu/vidalia_hu.po
===================================================================
--- vidalia/trunk/pkg/win32/po/hu/vidalia_hu.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/hu/vidalia_hu.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: hu\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/is/vidalia_is.po
===================================================================
--- vidalia/trunk/pkg/win32/po/is/vidalia_is.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/is/vidalia_is.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: is\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/kn/vidalia_kn.po
===================================================================
--- vidalia/trunk/pkg/win32/po/kn/vidalia_kn.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/kn/vidalia_kn.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: kn\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/lb/vidalia_lb.po
===================================================================
--- vidalia/trunk/pkg/win32/po/lb/vidalia_lb.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/lb/vidalia_lb.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: lb\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ln/vidalia_ln.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ln/vidalia_ln.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ln/vidalia_ln.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: ln\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/lo/vidalia_lo.po
===================================================================
--- vidalia/trunk/pkg/win32/po/lo/vidalia_lo.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/lo/vidalia_lo.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: lo\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/lt/vidalia_lt.po
===================================================================
--- vidalia/trunk/pkg/win32/po/lt/vidalia_lt.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/lt/vidalia_lt.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/lv/vidalia_lv.po
===================================================================
--- vidalia/trunk/pkg/win32/po/lv/vidalia_lv.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/lv/vidalia_lv.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/mg/vidalia_mg.po
===================================================================
--- vidalia/trunk/pkg/win32/po/mg/vidalia_mg.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/mg/vidalia_mg.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: mg\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/mi/vidalia_mi.po
===================================================================
--- vidalia/trunk/pkg/win32/po/mi/vidalia_mi.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/mi/vidalia_mi.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: mi\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/mk/vidalia_mk.po
===================================================================
--- vidalia/trunk/pkg/win32/po/mk/vidalia_mk.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/mk/vidalia_mk.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ml/vidalia_ml.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ml/vidalia_ml.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ml/vidalia_ml.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: ml\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/mn/vidalia_mn.po
===================================================================
--- vidalia/trunk/pkg/win32/po/mn/vidalia_mn.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/mn/vidalia_mn.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: mn\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/mr/vidalia_mr.po
===================================================================
--- vidalia/trunk/pkg/win32/po/mr/vidalia_mr.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/mr/vidalia_mr.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: mr\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ms/vidalia_ms.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ms/vidalia_ms.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ms/vidalia_ms.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: ms\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/mt/vidalia_mt.po
===================================================================
--- vidalia/trunk/pkg/win32/po/mt/vidalia_mt.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/mt/vidalia_mt.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: mt\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3)\n"
 
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/nah/vidalia_nah.po
===================================================================
--- vidalia/trunk/pkg/win32/po/nah/vidalia_nah.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/nah/vidalia_nah.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: nah\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/nap/vidalia_nap.po
===================================================================
--- vidalia/trunk/pkg/win32/po/nap/vidalia_nap.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/nap/vidalia_nap.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: nap\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ne/vidalia_ne.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ne/vidalia_ne.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ne/vidalia_ne.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: ne\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/nn/vidalia_nn.po
===================================================================
--- vidalia/trunk/pkg/win32/po/nn/vidalia_nn.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/nn/vidalia_nn.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: nn\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/nso/vidalia_nso.po
===================================================================
--- vidalia/trunk/pkg/win32/po/nso/vidalia_nso.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/nso/vidalia_nso.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:39+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: nso\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/oc/vidalia_oc.po
===================================================================
--- vidalia/trunk/pkg/win32/po/oc/vidalia_oc.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/oc/vidalia_oc.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: oc\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/pa/vidalia_pa.po
===================================================================
--- vidalia/trunk/pkg/win32/po/pa/vidalia_pa.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/pa/vidalia_pa.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: pa\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/pap/vidalia_pap.po
===================================================================
--- vidalia/trunk/pkg/win32/po/pap/vidalia_pap.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/pap/vidalia_pap.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: pap\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/pms/vidalia_pms.po
===================================================================
--- vidalia/trunk/pkg/win32/po/pms/vidalia_pms.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/pms/vidalia_pms.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: pms\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ps/vidalia_ps.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ps/vidalia_ps.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ps/vidalia_ps.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,16 +1,17 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: ps\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
@@ -18,16 +19,17 @@
 
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/pt_BR/vidalia_pt_BR.po
===================================================================
--- vidalia/trunk/pkg/win32/po/pt_BR/vidalia_pt_BR.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/pt_BR/vidalia_pt_BR.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: pt_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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/sco/vidalia_sco.po
===================================================================
--- vidalia/trunk/pkg/win32/po/sco/vidalia_sco.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/sco/vidalia_sco.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:39+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: sco\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/son/vidalia_son.po
===================================================================
--- vidalia/trunk/pkg/win32/po/son/vidalia_son.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/son/vidalia_son.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:39+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: son\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/su/vidalia_su.po
===================================================================
--- vidalia/trunk/pkg/win32/po/su/vidalia_su.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/su/vidalia_su.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: su\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/sw/vidalia_sw.po
===================================================================
--- vidalia/trunk/pkg/win32/po/sw/vidalia_sw.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/sw/vidalia_sw.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: sw\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ta/vidalia_ta.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ta/vidalia_ta.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ta/vidalia_ta.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: ta\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/te/vidalia_te.po
===================================================================
--- vidalia/trunk/pkg/win32/po/te/vidalia_te.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/te/vidalia_te.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: te\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/tg/vidalia_tg.po
===================================================================
--- vidalia/trunk/pkg/win32/po/tg/vidalia_tg.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/tg/vidalia_tg.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: tg\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ti/vidalia_ti.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ti/vidalia_ti.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ti/vidalia_ti.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: ti\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/tk/vidalia_tk.po
===================================================================
--- vidalia/trunk/pkg/win32/po/tk/vidalia_tk.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/tk/vidalia_tk.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: tk\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ur/vidalia_ur.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ur/vidalia_ur.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ur/vidalia_ur.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,15 +1,17 @@
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: Vidalia Windows Installers\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
 "Last-Translator: \n"
 "Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Language: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
@@ -17,16 +19,17 @@
 
 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"
@@ -38,7 +41,11 @@
 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"
@@ -58,7 +65,10 @@
 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"
@@ -94,7 +104,9 @@
 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"
@@ -106,7 +118,10 @@
 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"
@@ -126,7 +141,9 @@
 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"
@@ -154,7 +171,9 @@
 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"
@@ -194,23 +213,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/ve/vidalia_ve.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ve/vidalia_ve.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ve/vidalia_ve.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: ve\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/zh_HK/vidalia_zh_HK.po
===================================================================
--- vidalia/trunk/pkg/win32/po/zh_HK/vidalia_zh_HK.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/zh_HK/vidalia_zh_HK.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: zh_HK\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""

Modified: vidalia/trunk/pkg/win32/po/zu/vidalia_zu.po
===================================================================
--- vidalia/trunk/pkg/win32/po/zu/vidalia_zu.po	2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/zu/vidalia_zu.po	2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations at vidalia-project.net\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 at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations at vidalia-project.net\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: zu\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,26 @@
 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 ""



More information about the tor-commits mailing list