[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3065: msgmerge the new PO template strings to all the .po files. m (in vidalia/trunk/pkg/win32: cs de en es fa fi fr he it nl pl pt ro ru sv zh_CN zh_TW)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r3065: msgmerge the new PO template strings to all the .po files. m (in vidalia/trunk/pkg/win32: cs de en es fa fi fr he it nl pl pt ro ru sv zh_CN zh_TW)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Fri, 12 Sep 2008 20:29:30 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Fri, 12 Sep 2008 20:29:43 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx
Author: edmanm
Date: 2008-09-12 20:29:30 -0400 (Fri, 12 Sep 2008)
New Revision: 3065

Modified:
   vidalia/trunk/pkg/win32/cs/vidalia_cs.po
   vidalia/trunk/pkg/win32/de/vidalia_de.po
   vidalia/trunk/pkg/win32/en/vidalia_en.po
   vidalia/trunk/pkg/win32/es/vidalia_es.po
   vidalia/trunk/pkg/win32/fa/vidalia_fa.po
   vidalia/trunk/pkg/win32/fi/vidalia_fi.po
   vidalia/trunk/pkg/win32/fr/vidalia_fr.po
   vidalia/trunk/pkg/win32/he/vidalia_he.po
   vidalia/trunk/pkg/win32/it/vidalia_it.po
   vidalia/trunk/pkg/win32/nl/vidalia_nl.po
   vidalia/trunk/pkg/win32/pl/vidalia_pl.po
   vidalia/trunk/pkg/win32/pt/vidalia_pt.po
   vidalia/trunk/pkg/win32/ro/vidalia_ro.po
   vidalia/trunk/pkg/win32/ru/vidalia_ru.po
   vidalia/trunk/pkg/win32/sv/vidalia_sv.po
   vidalia/trunk/pkg/win32/zh_CN/vidalia_zh_CN.po
   vidalia/trunk/pkg/win32/zh_TW/vidalia_zh_TW.po
Log:
msgmerge the new PO template strings to all the .po files. msgmerge also saw
fit to shimmy around some of the entries, so the diff is larger than it
should be.


Modified: vidalia/trunk/pkg/win32/cs/vidalia_cs.po
===================================================================
--- vidalia/trunk/pkg/win32/cs/vidalia_cs.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/cs/vidalia_cs.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -74,8 +74,8 @@
 "If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 "Instalace je dokončena.\n"
-"Prosím navštivte https://www.torproject.org/docs/tor-doc-windows kde získáte více "
-"informací, jak nakonfigurovat aplikace tak, aby používaly Tor.\n"
+"Prosím navštivte https://www.torproject.org/docs/tor-doc-windows kde získáte "
+"více informací, jak nakonfigurovat aplikace tak, aby používaly Tor.\n"
 "\n"
 "Jestliže jste instalovali Torbutton, je nutné restartovat Firefox."
 
@@ -162,10 +162,12 @@
 
 msgctxt "TorAskOverwriteTorrc"
 msgid ""
-"You already have a Tor configuration file.$\n$\n"
+"You already have a Tor configuration file.$\n"
+"$\n"
 "Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
-"Vy již máte Tor konfigurační soubor.$\n$\n"
+"Vy již máte Tor konfigurační soubor.$\n"
+"$\n"
 "Chcete jej přepsat defaultním ukázkovým konfiguračním souborem?"
 
 msgctxt "TorDocumentation"
@@ -257,3 +259,12 @@
 msgctxt "LanguageCode"
 msgid "en"
 msgstr "cs"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/de/vidalia_de.po
===================================================================
--- vidalia/trunk/pkg/win32/de/vidalia_de.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/de/vidalia_de.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Vidalia\n"
 "Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-17 02:30+0000\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
 "PO-Revision-Date: 2008-07-17 02:46+0000\n"
 "Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
@@ -12,190 +12,252 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "${VIDALIA_NAME} zu Ihrem StartmenÂ¸ hinzufÂ¸gen."
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} Setup"
 
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+
 msgctxt "BundleWelcomeTitle"
 msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
 msgstr "Willkommen beim ${BUNDLE_NAME} Installations-Assistent"
 
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "Beim Systemstart ausfÂ¸hren"
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} Installations-Dokumentation"
 
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "de"
-
-msgctxt "BundleSetupCaption"
-msgid "${BUNDLE_NAME} setup"
-msgstr "${BUNDLE_NAME} Setup"
-
-#, fuzzy
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia ist eine Oberflâ€°che zur Einrichtung, Steuerung und â€¹berwachung von Tor."
-
-#, fuzzy
-msgctxt "VidaliaGroupDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia ist eine Oberflâ€°che zur Einrichtung, Steuerung und â€¹berwachung von Tor."
-
 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 ""
 "Die Installation wird abgeschlossen.\n"
 "Bitte besuchen Sie https://www.torproject.org/docs/tor-doc-windows um zu "
 "erfahren, wie Sie Ihre Anwendungen zur Benutzung mit Tor einrichten kË†nnen.\n"
 
-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"
-msgstr ""
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Installierte Anwendungen jetzt starten"
 
 #, fuzzy
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "${PRIVOXY_NAME} zu Ihrem StartmenÂ¸ hinzufÂ¸gen."
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia ist eine Oberflâ€°che zur Einrichtung, Steuerung und â€¹berwachung von "
+"Tor."
 
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Entferne ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} Setup"
+
 #, fuzzy
 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"
-msgstr "Dieser Assistent fÂ¸hrt Sie durch die Installation von ${VIDALIA_DESC}.\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 ""
+"Dieser Assistent fÂ¸hrt Sie durch die Installation von ${VIDALIA_DESC}.\n"
+"\n"
+"$_CLICK"
 
-#, fuzzy
-msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
-msgstr "Tor ist ein System, um das Internet anonym zu nutzen. Es anonymisiert das Browsen, das VerË†ffentlichen von Inhalten, Instant Messaging, IRC, usw."
-
 msgctxt "VidaliaWelcomeTitle"
 msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 msgstr "Willkommen beim ${VIDALIA_NAME} Installations-Assistent"
 
-#, fuzzy
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "Die ${TORBUTTON_DESC}-Erweiterung zu Firefox hinzufÂ¸gen."
-
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr "Entferne ${TOR_DESC}."
-
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "Firefox konnte nicht gefunden werden. Torbutton wird nicht installiert."
-
 msgctxt "VidaliaLinkText"
 msgid "${VIDALIA_NAME} homepage"
 msgstr "${VIDALIA_NAME} Homepage"
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "Installiere ${PRIVOXY_DESC}."
+#, fuzzy
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia ist eine Oberflâ€°che zur Einrichtung, Steuerung und â€¹berwachung von "
+"Tor."
 
-msgctxt "AppData"
-msgid "Application Data"
-msgstr "Anwendungsdaten"
+#, fuzzy
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Beim Systemstart ausfÂ¸hren"
 
 #, fuzzy
-msgctxt "PrivoxyShortcuts"
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "${VIDALIA_NAME} beim Systemstart automatisch ausfÂ¸hren."
+
+#, fuzzy
+msgctxt "VidaliaShortcuts"
 msgid "Add to Start Menu"
 msgstr "Zum StartmenÂ¸ hinzufÂ¸gen"
 
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "${TOR_NAME} Installations-Dokumentation"
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "${VIDALIA_NAME} zu Ihrem StartmenÂ¸ hinzufÂ¸gen."
 
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "${VIDALIA_NAME} jetzt starten"
+
 #, fuzzy
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-msgstr "Zu Firefox hinzufÂ¸gen"
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor ist ein System, um das Internet anonym zu nutzen. Es anonymisiert das "
+"Browsen, das VerË†ffentlichen von Inhalten, Instant Messaging, IRC, usw."
 
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Entferne ${TOR_DESC}."
+
 msgctxt "TorAppDesc"
 msgid "Install ${TOR_DESC}."
 msgstr "Installiere ${TOR_DESC}."
 
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "Installierte Anwendungen jetzt starten"
-
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "${VIDALIA_NAME} Setup"
-
 #, fuzzy
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "${VIDALIA_NAME} beim Systemstart automatisch ausfÂ¸hren."
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Sie haben bereits eine Tor Konfigurationsdatei.$\n"
+"$\n"
+"Soll diese mit der allgemeinen Beispiel-Konfigurationsdatei Â¸berschrieben "
+"werden?"
 
 msgctxt "TorDocumentation"
 msgid "Documentation"
 msgstr "Dokumentation"
 
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr "Entferne ${VIDALIA_DESC}."
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Installiere ${TOR_NAME} Dokumentation."
 
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
-msgstr "Entferne ${PRIVOXY_DESC}."
-
 #, fuzzy
 msgctxt "TorShortcuts"
 msgid "Add to Start Menu"
 msgstr "Zum StartmenÂ¸ hinzufÂ¸gen"
 
 #, fuzzy
-msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
-msgstr "Sie haben bereits eine Tor Konfigurationsdatei.$\n$\nSoll diese mit der allgemeinen Beispiel-Konfigurationsdatei Â¸berschrieben werden?"
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "${TOR_NAME} zu Ihrem StartmenÂ¸ hinzufÂ¸gen."
 
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "${VIDALIA_NAME} jetzt starten"
-
 #, fuzzy
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
-msgstr "${PRIVOXY_NAME} beim Systemstart automatisch ausfÂ¸hren."
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr ""
+"Privoxy ist ein filternder Webproxy, der Ihnen hilft, Ihre Privatphâ€°re zu "
+"schÂ¸tzen und Werbung, Banner und Popups entfernt."
 
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr "Entferne ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "Installiere ${PRIVOXY_DESC}."
+
 #, fuzzy
-msgctxt "VidaliaShortcuts"
+msgctxt "PrivoxyShortcuts"
 msgid "Add to Start Menu"
 msgstr "Zum StartmenÂ¸ hinzufÂ¸gen"
 
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "Installiere ${TOR_NAME} Dokumentation."
+#, fuzzy
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "${PRIVOXY_NAME} zu Ihrem StartmenÂ¸ hinzufÂ¸gen."
 
-msgctxt "AppDataUninstDesc"
-msgid "Remove saved application data and configuration files."
-msgstr "Entferne gespeicherte Anwendungsdaten und Konfigurationsdateien."
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "Beim Systemstart ausfÂ¸hren"
 
 #, fuzzy
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "${TOR_NAME} zu Ihrem StartmenÂ¸ hinzufÂ¸gen."
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr "${PRIVOXY_NAME} beim Systemstart automatisch ausfÂ¸hren."
 
 #, fuzzy
 msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
-msgstr "Torbutton ist eine Erweiterung fÂ¸r Firefox, die das schnelle An- und Ausschalten des anonymes Webbrowsens ermË†glicht."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton ist eine Erweiterung fÂ¸r Firefox, die das schnelle An- und "
+"Ausschalten des anonymes Webbrowsens ermË†glicht."
 
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Entferne ${TORBUTTON_DESC}."
+
 msgctxt "TorbuttonAppDesc"
 msgid "Install ${TORBUTTON_DESC}."
 msgstr "Installiere ${TORBUTTON_DESC}."
 
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
-msgstr "Entferne ${TORBUTTON_DESC}."
+#, fuzzy
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Zu Firefox hinzufÂ¸gen"
 
 #, fuzzy
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
-msgstr "Privoxy ist ein filternder Webproxy, der Ihnen hilft, Ihre Privatphâ€°re zu schÂ¸tzen und Werbung, Banner und Popups entfernt."
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Die ${TORBUTTON_DESC}-Erweiterung zu Firefox hinzufÂ¸gen."
 
-#, fuzzy
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "Beim Systemstart ausfÂ¸hren"
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Firefox konnte nicht gefunden werden. Torbutton wird nicht installiert."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Anwendungsdaten"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Entferne gespeicherte Anwendungsdaten und Konfigurationsdateien."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "de"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/en/vidalia_en.po
===================================================================
--- vidalia/trunk/pkg/win32/en/vidalia_en.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/en/vidalia_en.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Vidalia\n"
 "Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-17 02:48+0000\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
 "PO-Revision-Date: 2008-07-17 02:50+0000\n"
 "Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
@@ -12,36 +12,63 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "Add ${VIDALIA_NAME} to your Start menu."
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} setup"
 
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+
 msgctxt "BundleWelcomeTitle"
 msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
 msgstr "Welcome to the ${BUNDLE_NAME} Setup Wizard"
 
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "Run At Startup"
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} installation documentation"
 
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "en"
-
-msgctxt "BundleSetupCaption"
-msgid "${BUNDLE_NAME} setup"
-msgstr "${BUNDLE_NAME} setup"
-
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-
-msgctxt "VidaliaGroupDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-
 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 ""
 "Installation is complete.\n"
 "Please see https://www.torproject.org/docs/tor-doc-windows to learn how to "
@@ -49,138 +76,185 @@
 "\n"
 "If you installed Torbutton, you will need to restart Firefox."
 
-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"
-msgstr "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"
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Run installed components now"
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia is a GUI that helps you control, monitor, and configure Tor."
 
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Remove ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} setup"
+
 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"
-msgstr "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 ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 
-msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
-msgstr "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
-
 msgctxt "VidaliaWelcomeTitle"
 msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 msgstr "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "Add the ${TORBUTTON_DESC} extension to Firefox."
-
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr "Remove ${TOR_DESC}."
-
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "Firefox was not found on your system. Not installing Torbutton."
-
 msgctxt "VidaliaLinkText"
 msgid "${VIDALIA_NAME} homepage"
 msgstr "${VIDALIA_NAME} homepage"
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "Install ${PRIVOXY_DESC}."
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia is a GUI that helps you control, monitor, and configure Tor."
 
-msgctxt "AppData"
-msgid "Application Data"
-msgstr "Application Data"
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Run At Startup"
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Automatically run ${VIDALIA_NAME} at startup."
+
+msgctxt "VidaliaShortcuts"
 msgid "Add to Start Menu"
 msgstr "Add to Start Menu"
 
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "${TOR_NAME} installation documentation"
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Add ${VIDALIA_NAME} to your Start menu."
 
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-msgstr "Add to Firefox"
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Run ${VIDALIA_NAME} now"
 
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Remove ${TOR_DESC}."
+
 msgctxt "TorAppDesc"
 msgid "Install ${TOR_DESC}."
 msgstr "Install ${TOR_DESC}."
 
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "Run installed components now"
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
 
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "${VIDALIA_NAME} setup"
-
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "Automatically run ${VIDALIA_NAME} at startup."
-
 msgctxt "TorDocumentation"
 msgid "Documentation"
 msgstr "Documentation"
 
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr "Remove ${VIDALIA_DESC}."
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Install ${TOR_NAME} documentation."
 
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Add to Start Menu"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Add ${TOR_NAME} to your Start menu."
+
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+
 msgctxt "PrivoxyUninstDesc"
 msgid "Remove ${PRIVOXY_DESC}."
 msgstr "Remove ${PRIVOXY_DESC}."
 
-msgctxt "TorShortcuts"
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "Install ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
 msgid "Add to Start Menu"
 msgstr "Add to Start Menu"
 
-msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
-msgstr "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "Add ${PRIVOXY_NAME} to your Start menu."
 
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "Run ${VIDALIA_NAME} now"
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "Run At Startup"
 
 msgctxt "PrivoxyStartupDesc"
 msgid "Automatically run ${PRIVOXY_NAME} at startup."
 msgstr "Automatically run ${PRIVOXY_NAME} at startup."
 
-msgctxt "VidaliaShortcuts"
-msgid "Add to Start Menu"
-msgstr "Add to Start Menu"
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
 
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "Install ${TOR_NAME} documentation."
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Remove ${TORBUTTON_DESC}."
 
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Install ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Add to Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Add the ${TORBUTTON_DESC} extension to Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "Firefox was not found on your system. Not installing Torbutton."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application Data"
+
 msgctxt "AppDataUninstDesc"
 msgid "Remove saved application data and configuration files."
 msgstr "Remove saved application data and configuration files."
 
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "Add ${TOR_NAME} to your Start menu."
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "en"
 
-msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
-msgstr "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
 
-msgctxt "TorbuttonAppDesc"
-msgid "Install ${TORBUTTON_DESC}."
-msgstr "Install ${TORBUTTON_DESC}."
-
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
-msgstr "Remove ${TORBUTTON_DESC}."
-
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
-msgstr "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
-
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "Run At Startup"
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/es/vidalia_es.po
===================================================================
--- vidalia/trunk/pkg/win32/es/vidalia_es.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/es/vidalia_es.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -61,8 +61,8 @@
 "If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 "La instalación ha finalizado.\n"
-"Por favor vea https://www.torproject.org/docs/tor-doc-windows para aprender como "
-"configurar sus aplicaciones para que usen Tor.\n"
+"Por favor vea https://www.torproject.org/docs/tor-doc-windows para aprender "
+"como configurar sus aplicaciones para que usen Tor.\n"
 "\n"
 "Si instalo Torbutton, necesitara reiniciar Firefox."
 
@@ -141,10 +141,12 @@
 
 msgctxt "TorAskOverwriteTorrc"
 msgid ""
-"You already have a Tor configuration file.$\n$\n"
+"You already have a Tor configuration file.$\n"
+"$\n"
 "Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
-"Ya tiene un archivo de configuración de Tor.$\n$\n"
+"Ya tiene un archivo de configuración de Tor.$\n"
+"$\n"
 "¿Desea sobreescribirlo con el archivo de configuración de muestra "
 "predeterminado?"
 
@@ -231,3 +233,12 @@
 msgctxt "LanguageCode"
 msgid "en"
 msgstr "es"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/fa/vidalia_fa.po
===================================================================
--- vidalia/trunk/pkg/win32/fa/vidalia_fa.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/fa/vidalia_fa.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Vidalia\n"
 "Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-17 02:33+0000\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
 "PO-Revision-Date: 2008-07-17 03:19+0000\n"
 "Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
@@ -12,203 +12,260 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "افزودن ${VIDALIA_NAME} به فهرست آغاز."
+#, fuzzy
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "بر?ا?? ${BUNDLE_NAME}"
 
 #, fuzzy
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"ا?ن دست?ار شما را در سرتاسر ?ار?ذار? تور، و?دال?ا، ?ر?وا?س? و د?مه تور هدا?ت "
+"م? ?ند.\n"
+"\n"
+"ا?ر شما ??شتر تور، و?دال?ا، ?ر?وا?س? ?ا فا?رفا?س را ?ار?ذار? ?رده ا?د، "
+"خواهشمند است ??ش از ادامه دادن ا?ن ?ار?ذار? اطم?نان ??دا ?ن?د ?ه آنها درحال "
+"اجرا نم? باشند.\n"
+"\n"
+"$_CLICK"
+
+#, fuzzy
 msgctxt "BundleWelcomeTitle"
 msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
 msgstr "به دست?ار بر?ا?? ${BUNDLE_NAME} خوش آمد?د"
 
 #, fuzzy
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "اجرا?ردن در راه انداز?"
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "مستندات ?ار?ذار? ${TOR_NAME}"
 
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "fa"
-
 #, fuzzy
-msgctxt "BundleSetupCaption"
-msgid "${BUNDLE_NAME} setup"
-msgstr "بر?ا?? ${BUNDLE_NAME}"
+msgctxt "BundleFinishText"
+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 ""
+"?ار?ذار? انجام شد.\n"
+" خواهشمند است برا? آ?اه? ?افتن از ??ون?? ???ربند? ?ردن برنامه ها? ?اربرد?تان "
+"برا? ب?اربردن تور https://www.torproject.org/docs/tor-doc-windows را مشاهده ?"
+"ن?د."
 
 #, fuzzy
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "?ار?ذار? ${VIDALIA_DESC}."
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "اجرا?ردن مولفه ها? ?ار?ذار? شده"
 
 #, fuzzy
 msgctxt "VidaliaGroupDesc"
 msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
 msgstr "?ار?ذار? ${VIDALIA_DESC}."
 
-#, fuzzy
-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."
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
 msgstr ""
-"?ار?ذار? انجام شد.\n"
-" خواهشمند است برا? آ?اه? ?افتن از ??ون?? ???ربند? ?ردن برنامه ها? ?اربرد?تان "
-"برا? ب?اربردن تور https://www.torproject.org/docs/tor-doc-windows را مشاهده "
-"?ن?د."
 
 #, fuzzy
-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"
-msgstr "ا?ن دست?ار شما را در سرتاسر ?ار?ذار? تور، و?دال?ا، ?ر?وا?س? و د?مه تور هدا?ت م? ?ند.\n\nا?ر شما ??شتر تور، و?دال?ا، ?ر?وا?س? ?ا فا?رفا?س را ?ار?ذار? ?رده ا?د، خواهشمند است ??ش از ادامه دادن ا?ن ?ار?ذار? اطم?نان ??دا ?ن?د ?ه آنها درحال اجرا نم? باشند.\n\n$_CLICK"
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "بر?ا?? ${VIDALIA_NAME}"
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "افزودن ${PRIVOXY_NAME} به فهرست آغاز."
-
 #, fuzzy
 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"
-msgstr "ا?ن دست?ار شما را در سرتاسر ?ار?ذار? ${VIDALIA_DESC} هدا?ت م? ?ند.\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 ""
+"ا?ن دست?ار شما را در سرتاسر ?ار?ذار? ${VIDALIA_DESC} هدا?ت م? ?ند.\n"
+"\n"
+"$_CLICK"
 
 #, fuzzy
-msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
-msgstr "?ار?ذار? ${TOR_DESC}."
-
-#, fuzzy
 msgctxt "VidaliaWelcomeTitle"
 msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 msgstr "به دست?ار بر?ا?? ${VIDALIA_NAME} خوش آمد?د"
 
 #, fuzzy
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "افزودن ?سوند ${TORBUTTON_DESC} به فا?رفا?س."
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "بر?ه اصل? ${VIDALIA_NAME}"
 
 #, fuzzy
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr ""
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "?ار?ذار? ${VIDALIA_DESC}."
 
 #, fuzzy
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "فا?رفا?س در س?ستم شما ??دا نشد. ?ار?ذار? نشدن د?مه تور."
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "اجرا ?ردن در راه انداز?"
 
 #, fuzzy
-msgctxt "VidaliaLinkText"
-msgid "${VIDALIA_NAME} homepage"
-msgstr "بر?ه اصل? ${VIDALIA_NAME}"
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "اجرا ?ردن ${VIDALIA_NAME} در راه انداز? بطور خود?ار."
 
-#, fuzzy
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "?ار?ذار? ${PRIVOXY_DESC}."
-
-msgctxt "AppData"
-msgid "Application Data"
-msgstr ""
-
-msgctxt "PrivoxyShortcuts"
+msgctxt "VidaliaShortcuts"
 msgid "Add to Start Menu"
 msgstr "افزودن به فهرست آغاز"
 
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "افزودن ${VIDALIA_NAME} به فهرست آغاز."
+
 #, fuzzy
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "مستندات ?ار?ذار? ${TOR_NAME}"
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "اجرا?ردن ${VIDALIA_NAME}"
 
 #, fuzzy
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-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."
+msgstr "?ار?ذار? ${TOR_DESC}."
 
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr ""
+
 #, fuzzy
 msgctxt "TorAppDesc"
 msgid "Install ${TOR_DESC}."
 msgstr "?ار?ذار? ${TOR_DESC}."
 
 #, fuzzy
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "اجرا?ردن مولفه ها? ?ار?ذار? شده"
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"شما ??شتر دارا? ?? ?رونده ???ربند? تور م? باش?د.$\n"
+"$\n"
+"آ?ا م? خواه?د آن را با ?رونده ???ربند? نمونه ??ش ?ز?ده جا? نوشت ?ن?د؟"
 
-#, fuzzy
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "بر?ا?? ${VIDALIA_NAME}"
-
-#, fuzzy
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "اجرا ?ردن ${VIDALIA_NAME} در راه انداز? بطور خود?ار."
-
 msgctxt "TorDocumentation"
 msgid "Documentation"
 msgstr "مستندات"
 
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr ""
+#, fuzzy
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "?ار?ذار? مستندات ${TOR_NAME}."
 
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "افزودن به فهرست آغاز"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "افزودن ${TOR_NAME} به فهرست آغاز."
+
+#, fuzzy
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr "?ار?ذار? ${PRIVOXY_DESC}."
+
 msgctxt "PrivoxyUninstDesc"
 msgid "Remove ${PRIVOXY_DESC}."
 msgstr ""
 
-msgctxt "TorShortcuts"
+#, fuzzy
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "?ار?ذار? ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
 msgid "Add to Start Menu"
 msgstr "افزودن به فهرست آغاز"
 
-#, fuzzy
-msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
-msgstr "شما ??شتر دارا? ?? ?رونده ???ربند? تور م? باش?د.$\n$\nآ?ا م? خواه?د آن را با ?رونده ???ربند? نمونه ??ش ?ز?ده جا? نوشت ?ن?د؟"
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "افزودن ${PRIVOXY_NAME} به فهرست آغاز."
 
 #, fuzzy
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "اجرا?ردن ${VIDALIA_NAME}"
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "اجرا?ردن در راه انداز?"
 
 #, fuzzy
 msgctxt "PrivoxyStartupDesc"
 msgid "Automatically run ${PRIVOXY_NAME} at startup."
 msgstr "اجرا ?ردن ${PRIVOXY_NAME} در راه انداز? بطور خود?ار."
 
-msgctxt "VidaliaShortcuts"
-msgid "Add to Start Menu"
-msgstr "افزودن به فهرست آغاز"
-
 #, fuzzy
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "?ار?ذار? مستندات ${TOR_NAME}."
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr "?ار?ذار? ${TORBUTTON_DESC}."
 
-msgctxt "AppDataUninstDesc"
-msgid "Remove saved application data and configuration files."
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
 msgstr ""
 
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "افزودن ${TOR_NAME} به فهرست آغاز."
-
 #, fuzzy
-msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
-msgstr "?ار?ذار? ${TORBUTTON_DESC}."
-
-#, fuzzy
 msgctxt "TorbuttonAppDesc"
 msgid "Install ${TORBUTTON_DESC}."
 msgstr "?ار?ذار? ${TORBUTTON_DESC}."
 
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
-msgstr ""
+#, fuzzy
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "افزودن به فا?رفا?س"
 
 #, fuzzy
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
-msgstr "?ار?ذار? ${PRIVOXY_DESC}."
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "افزودن ?سوند ${TORBUTTON_DESC} به فا?رفا?س."
 
 #, fuzzy
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "اجرا ?ردن در راه انداز?"
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "فا?رفا?س در س?ستم شما ??دا نشد. ?ار?ذار? نشدن د?مه تور."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr ""
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "fa"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/fi/vidalia_fi.po
===================================================================
--- vidalia/trunk/pkg/win32/fi/vidalia_fi.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/fi/vidalia_fi.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -68,8 +68,8 @@
 "If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 "Asennus on valmis.\n"
-"Ole hyvä ja tutustu https://www.torproject.org/docs/tor-doc-windows -ohjesivuun "
-"oppiakseen kuinka voi asettaa ohjelmat käyttämään Tor-ohjelmaa.\n"
+"Ole hyvä ja tutustu https://www.torproject.org/docs/tor-doc-windows -"
+"ohjesivuun oppiakseen kuinka voi asettaa ohjelmat käyttämään Tor-ohjelmaa.\n"
 "Jos Torbutton on asennettu, niin Firefox täytyy käynnistää uudelleen."
 
 msgctxt "BundleRunNow"
@@ -154,10 +154,12 @@
 
 msgctxt "TorAskOverwriteTorrc"
 msgid ""
-"You already have a Tor configuration file.$\n$\n"
+"You already have a Tor configuration file.$\n"
+"$\n"
 "Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
-"Sinulla on jo ennestään Tor-asetustiedosto.$\n$\n"
+"Sinulla on jo ennestään Tor-asetustiedosto.$\n"
+"$\n"
 "Haluatko, että se korvataan oletusesimerkillä?"
 
 msgctxt "TorDocumentation"
@@ -248,3 +250,12 @@
 msgctxt "LanguageCode"
 msgid "en"
 msgstr "fi"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/fr/vidalia_fr.po
===================================================================
--- vidalia/trunk/pkg/win32/fr/vidalia_fr.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/fr/vidalia_fr.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Vidalia\n"
 "Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-17 02:16+0000\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
 "PO-Revision-Date: 2008-07-18 08:54+0000\n"
 "Last-Translator: Mfr <mfr@xxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
@@ -12,53 +12,38 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "Ajouter ${VIDALIA_NAME} à votre Menu Démarrer."
-
-msgctxt "BundleWelcomeTitle"
-msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
-msgstr "Bienvenue dans l'Assistant d'installation de ${BUNDLE_NAME}"
-
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "Lancer au démarrage"
-
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "fr"
-
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr "Mise à jour de ${BUNDLE_NAME}"
 
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr ""
-"Vidalia est un logiciel qui vous aide à contrôler,surveiller et configurer "
-"Tor."
-
-msgctxt "VidaliaGroupDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr ""
-"Vidalia est un logiciel qui vous aide à contrôler,surveiller et configurer "
-"Tor."
-
-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."
-msgstr "L'installation est terminée.\nConsultez la page https://www.torproject.org/docs/tor-doc-windows pour apprendre comment configurer vos applications avec Tor.\n\nSi vous venez d'installer Torbutton, vous devrez redémarrer Firefox."
-
 # GUI traduit en logiciel pour plus de clarté
 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, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
 "Cet assistant vous guidera pendant l'installation de Tor, Vidalia, Privoxy, "
 "et de Torbutton.\n"
 "\n"
 "Tor est un système pour utiliser internet anonymement, vous aidant à "
 "anonymer la navigation Web, la publication, la messagerie instantanée, "
-"l'IRC, et plus encore. Vidalia est un logiciel qui vous aide à "
-"contrôler,surveiller et configurer Tor.\n"
+"l'IRC, et plus encore. Vidalia est un logiciel qui vous aide à contrôler,"
+"surveiller et configurer Tor.\n"
 "\n"
 "Privoxy est un mandataire proxy web de filtrage qui protège votre anonymat "
 "et aide à supprimer les publicités, bannières et les popups.\n"
@@ -71,146 +56,215 @@
 "\n"
 "$_CLICK"
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "Ajouter ${PRIVOXY_NAME} à votre Menu Démarrer."
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Bienvenue dans l'Assistant d'installation de ${BUNDLE_NAME}"
 
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Documentation de l'installation de ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+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 ""
+"L'installation est terminée.\n"
+"Consultez la page https://www.torproject.org/docs/tor-doc-windows pour "
+"apprendre comment configurer vos applications avec Tor.\n"
+"\n"
+"Si vous venez d'installer Torbutton, vous devrez redémarrer Firefox."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Démarrer les composants installés maintenant"
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia est un logiciel qui vous aide à contrôler,surveiller et configurer "
+"Tor."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Supprimer ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Mise à jour de ${VIDALIA_NAME}"
+
 # GUI traduit en logiciel pour plus de clarté
 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 ""
 "Cet assistant vous guidera pendant l'installation de Vidalia, un logiciel "
 "qui vous aide à contrôler,surveiller et configurer Tor.\n"
 "\n"
 "$_CLICK"
 
-msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
-msgstr ""
-"Tor est un système pour utiliser internet anonymement, vous aidant à "
-"anonymer la navigation Web, la publication, la messagerie instantanée, "
-"l'IRC, et plus encore."
-
 msgctxt "VidaliaWelcomeTitle"
 msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 msgstr "Bienvenue dans l'Assistant d'installation de ${VIDALIA_NAME}"
 
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "Ajouter l'extension ${TORBUTTON_DESC} à Firefox."
-
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr "Supprimer ${TOR_DESC}."
-
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "Firefox n'a pas été trouvé sur votre système. Torbutton ne sera pas installé."
-
 msgctxt "VidaliaLinkText"
 msgid "${VIDALIA_NAME} homepage"
 msgstr "Site Web de ${VIDALIA_NAME}"
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "Installer ${PRIVOXY_DESC}."
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia est un logiciel qui vous aide à contrôler,surveiller et configurer "
+"Tor."
 
-msgctxt "AppData"
-msgid "Application Data"
-msgstr "Données de l'Application"
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Lancer au démarrage"
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Lancer automatiquement ${VIDALIA_NAME} au démarrage."
+
+msgctxt "VidaliaShortcuts"
 msgid "Add to Start Menu"
 msgstr "Ajouter au Menu Démarrer"
 
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "Documentation de l'installation de ${TOR_NAME}"
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Ajouter ${VIDALIA_NAME} à votre Menu Démarrer."
 
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-msgstr "Ajouter à Firefox"
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Lancer ${VIDALIA_NAME}"
 
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor est un système pour utiliser internet anonymement, vous aidant à "
+"anonymer la navigation Web, la publication, la messagerie instantanée, "
+"l'IRC, et plus encore."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Supprimer ${TOR_DESC}."
+
 msgctxt "TorAppDesc"
 msgid "Install ${TOR_DESC}."
 msgstr "Installer ${TOR_DESC}."
 
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "Démarrer les composants installés maintenant"
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Vous avez déjà un fichier de configuration de Tor.$\n"
+"$\n"
+"Voulez-vous le remplacer par le fichier de configuration par défaut?"
 
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "Mise à jour de ${VIDALIA_NAME}"
-
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "Lancer automatiquement ${VIDALIA_NAME} au démarrage."
-
 msgctxt "TorDocumentation"
 msgid "Documentation"
 msgstr "Documentation"
 
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr "Supprimer ${VIDALIA_DESC}."
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Installer la documentation de ${TOR_NAME}."
 
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Ajouter au Menu Démarrer"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Ajouter ${TOR_NAME} à votre Menu Démarrer."
+
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr ""
+"Privoxy est un mandataire proxy web de filtrage qui protège votre anonymat "
+"et aide à supprimer les publicités, bannières et les popups."
+
 msgctxt "PrivoxyUninstDesc"
 msgid "Remove ${PRIVOXY_DESC}."
 msgstr "Supprimer ${PRIVOXY_DESC}."
 
-msgctxt "TorShortcuts"
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "Installer ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
 msgid "Add to Start Menu"
 msgstr "Ajouter au Menu Démarrer"
 
-msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
-msgstr "Vous avez déjà un fichier de configuration de Tor.$\n$\nVoulez-vous le remplacer par le fichier de configuration par défaut?"
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "Ajouter ${PRIVOXY_NAME} à votre Menu Démarrer."
 
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "Lancer ${VIDALIA_NAME}"
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "Lancer au démarrage"
 
 msgctxt "PrivoxyStartupDesc"
 msgid "Automatically run ${PRIVOXY_NAME} at startup."
 msgstr "Lancer automatiquement ${PRIVOXY_NAME} au démarrage."
 
-msgctxt "VidaliaShortcuts"
-msgid "Add to Start Menu"
-msgstr "Ajouter au Menu Démarrer"
-
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "Installer la documentation de ${TOR_NAME}."
-
-msgctxt "AppDataUninstDesc"
-msgid "Remove saved application data and configuration files."
-msgstr "Supprimer les fichiers de configuration et les données de l'application."
-
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "Ajouter ${TOR_NAME} à votre Menu Démarrer."
-
 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 ""
 "Torbutton est un module complémentaire de Firefox qui vous permet d'activer "
 "ou de désactiver rapidement la navigation anonyme."
 
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Supprimer ${TORBUTTON_DESC}."
+
 msgctxt "TorbuttonAppDesc"
 msgid "Install ${TORBUTTON_DESC}."
 msgstr "Installer ${TORBUTTON_DESC}."
 
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
-msgstr "Supprimer ${TORBUTTON_DESC}."
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Ajouter à Firefox"
 
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Ajouter l'extension ${TORBUTTON_DESC} à Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
 msgstr ""
-"Privoxy est un mandataire proxy web de filtrage qui protège votre anonymat "
-"et aide à supprimer les publicités, bannières et les popups."
+"Firefox n'a pas été trouvé sur votre système. Torbutton ne sera pas installé."
 
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "Lancer au démarrage"
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Données de l'Application"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr ""
+"Supprimer les fichiers de configuration et les données de l'application."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "fr"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/he/vidalia_he.po
===================================================================
--- vidalia/trunk/pkg/win32/he/vidalia_he.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/he/vidalia_he.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Vidalia\n"
 "Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-17 02:32+0000\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
 "PO-Revision-Date: 2008-07-17 03:13+0000\n"
 "Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
@@ -12,36 +12,60 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "הוסף את ${VIDALIA_NAME} לתפריט התחלה."
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "התקנת ${BUNDLE_NAME}"
 
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"אשף זה ינחה אותך בעת התקנת Tor, Vidalia, Privoxy ו-Torbutton.\n"
+"\n"
+"Tor היא מערכת לשימוש אנונימי באינטרנט, לגלישה ופרסום אתרי רשת, תקשרות מסרים "
+"מידיים, IRC ועוד. Vidalia היא ממשק גראפי לשליטה, ניטור והגדרת Tor.\n"
+"\n"
+"Privoxy הוא שרת פרוקסי מסנן המגן על פרטיותך ועוזר להסיר פרסומות וחלונות "
+"קופצים.\n"
+"\n"
+"Torbutton היא הרחבת Firefox המאפשרת להפעיל ולכבות גלישה אנונימית במהירות.\n"
+"\n"
+"אם התקנת Tor, Vidalia, Privoxy או Firefox בעבר, אנא ודא שהם לא פעילים לפני "
+"המשך ההתקנה.\n"
+"\n"
+"$_CLICK"
+
 msgctxt "BundleWelcomeTitle"
 msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
 msgstr "ברוכים הבאים לאשף התקנת ${BUNDLE_NAME}"
 
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "הרץ בעת אתחול"
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "מסמכי התקנה של ${TOR_NAME}"
 
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "he"
-
-msgctxt "BundleSetupCaption"
-msgid "${BUNDLE_NAME} setup"
-msgstr "התקנת ${BUNDLE_NAME}"
-
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia הינו ממשק גרפי המאפשר שליטה, ניטור והגדרת Tor."
-
-msgctxt "VidaliaGroupDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia הינו ממשק גרפי המאפשר שליטה, ניטור והגדרת Tor."
-
 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 ""
 "ההתקנה הסתיימה.\n"
 "אנא ראה https://www.torproject.org/docs/tor-doc-windows על מנת ללמוד כיצד "
@@ -49,138 +73,184 @@
 "\n"
 " אם התקנת Torbutton יש צורך להתחיל מחדש את Firefox."
 
-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"
-msgstr "אשף זה ינחה אותך בעת התקנת Tor, Vidalia, Privoxy ו-Torbutton.\n\nTor היא מערכת לשימוש אנונימי באינטרנט, לגלישה ופרסום אתרי רשת, תקשרות מסרים מידיים, IRC ועוד. Vidalia היא ממשק גראפי לשליטה, ניטור והגדרת Tor.\n\nPrivoxy הוא שרת פרוקסי מסנן המגן על פרטיותך ועוזר להסיר פרסומות וחלונות קופצים.\n\nTorbutton היא הרחבת Firefox המאפשרת להפעיל ולכבות גלישה אנונימית במהירות.\n\nאם התקנת Tor, Vidalia, Privoxy או Firefox בעבר, אנא ודא שהם לא פעילים לפני המשך ההתקנה.\n\n$_CLICK"
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "הרץ רכיבים מותקנים כעת"
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "הוסף את ${PRIVOXY_NAME} לתפריט התחלה."
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia הינו ממשק גרפי המאפשר שליטה, ניטור והגדרת Tor."
 
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "הסר ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "התקנת ${VIDALIA_NAME}"
+
 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"
-msgstr "אשף זה ידריך אותך במהלך התקנת Vidalia, ממשק גרפי העוזר בשליטה, ניטור והגדרת 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 ""
+"אשף זה ידריך אותך במהלך התקנת Vidalia, ממשק גרפי העוזר בשליטה, ניטור והגדרת "
+"Tor.\n"
+"\n"
+"$_CLICK"
 
-msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
-msgstr "Tor היא מערכת לשימוש אנונימי באינטרנט, לגלישה ופרסום אתרי רשת, תקשרות מסרים מידיים, IRC ועוד."
-
 msgctxt "VidaliaWelcomeTitle"
 msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 msgstr "ברוכים הבאים לאשף התקנת ${VIDALIA_NAME}"
 
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "הוסף את הרחבת ${TORBUTTON_DESC} ל-Firefox."
-
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr "הסר ${TOR_DESC}."
-
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "Firefox לא נמצא במערכת. לא מתקין Torbutton."
-
 msgctxt "VidaliaLinkText"
 msgid "${VIDALIA_NAME} homepage"
 msgstr "עמוד הבית של ${VIDALIA_NAME}"
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "התקן ${PRIVOXY_DESC}."
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia הינו ממשק גרפי המאפשר שליטה, ניטור והגדרת Tor."
 
-msgctxt "AppData"
-msgid "Application Data"
-msgstr "מידע תוכנה"
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "הרץ בעת אתחול"
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "הרץ ${VIDALIA_NAME} אוטומטית בעת אתחול."
+
+msgctxt "VidaliaShortcuts"
 msgid "Add to Start Menu"
 msgstr "הוסף לתפריט התחלה"
 
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "מסמכי התקנה של ${TOR_NAME}"
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "הוסף את ${VIDALIA_NAME} לתפריט התחלה."
 
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-msgstr "הוסף ל-Firefox"
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "הרץ את ${VIDALIA_NAME} כעת"
 
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor היא מערכת לשימוש אנונימי באינטרנט, לגלישה ופרסום אתרי רשת, תקשרות מסרים "
+"מידיים, IRC ועוד."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "הסר ${TOR_DESC}."
+
 msgctxt "TorAppDesc"
 msgid "Install ${TOR_DESC}."
 msgstr "התקן ${TOR_DESC}."
 
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "הרץ רכיבים מותקנים כעת"
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"קובץ הגדרות Tor נמצא.$\n"
+"$\n"
+"האם ברצונך להחליפו בקובץ הגדרות ברירת המחדל?"
 
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "התקנת ${VIDALIA_NAME}"
-
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "הרץ ${VIDALIA_NAME} אוטומטית בעת אתחול."
-
 msgctxt "TorDocumentation"
 msgid "Documentation"
 msgstr "מסמכים"
 
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr "הסר ${VIDALIA_DESC}."
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "התקן מסמכי ${TOR_NAME}."
 
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "הוסף לתפריט התחלה"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "הוסף את ${TOR_NAME} לתפריט התחלה."
+
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr ""
+"Privoxy הינו שרת פרוקסי מסנן המגן על פרטיותך ועוזר בהסרת פרסומות וחלונות "
+"קופצים."
+
 msgctxt "PrivoxyUninstDesc"
 msgid "Remove ${PRIVOXY_DESC}."
 msgstr "הסר ${PRIVOXY_DESC}."
 
-msgctxt "TorShortcuts"
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "התקן ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
 msgid "Add to Start Menu"
 msgstr "הוסף לתפריט התחלה"
 
-msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
-msgstr "קובץ הגדרות Tor נמצא.$\n$\nהאם ברצונך להחליפו בקובץ הגדרות ברירת המחדל?"
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "הוסף את ${PRIVOXY_NAME} לתפריט התחלה."
 
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "הרץ את ${VIDALIA_NAME} כעת"
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "הרץ בעת אתחול"
 
 msgctxt "PrivoxyStartupDesc"
 msgid "Automatically run ${PRIVOXY_NAME} at startup."
 msgstr "הרץ ${PRIVOXY_NAME} אוטומטית בעת אתחול."
 
-msgctxt "VidaliaShortcuts"
-msgid "Add to Start Menu"
-msgstr "הוסף לתפריט התחלה"
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton הינה הרחבת Firefox המאפשרת הפעלה וכיבוי מהיר של גלישה אנונימית."
 
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "התקן מסמכי ${TOR_NAME}."
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "הסר ${TORBUTTON_DESC}."
 
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "התקן ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "הוסף ל-Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "הוסף את הרחבת ${TORBUTTON_DESC} ל-Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "Firefox לא נמצא במערכת. לא מתקין Torbutton."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "מידע תוכנה"
+
 msgctxt "AppDataUninstDesc"
 msgid "Remove saved application data and configuration files."
 msgstr "הסר מידע תוכנה שמור וקבצי הגדרה."
 
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "הוסף את ${TOR_NAME} לתפריט התחלה."
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "he"
 
-msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
-msgstr "Torbutton הינה הרחבת Firefox המאפשרת הפעלה וכיבוי מהיר של גלישה אנונימית."
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
 
-msgctxt "TorbuttonAppDesc"
-msgid "Install ${TORBUTTON_DESC}."
-msgstr "התקן ${TORBUTTON_DESC}."
-
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
-msgstr "הסר ${TORBUTTON_DESC}."
-
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
-msgstr "Privoxy הינו שרת פרוקסי מסנן המגן על פרטיותך ועוזר בהסרת פרסומות וחלונות קופצים."
-
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "הרץ בעת אתחול"
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/it/vidalia_it.po
===================================================================
--- vidalia/trunk/pkg/win32/it/vidalia_it.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/it/vidalia_it.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Vidalia\n"
 "Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-17 02:31+0000\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
 "PO-Revision-Date: 2008-07-17 02:52+0000\n"
 "Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
@@ -12,36 +12,65 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "Aggiunge ${VIDALIA_NAME} alla cartella Progammi del menu Start."
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "Installazione di ${BUNDLE_NAME}"
 
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Questo wizard assisterà nell'installazione di Tor, Vidalia, Privoxy e "
+"Torbutton.\n"
+"\n"
+"Tor è un software che consente di navigare anonimamente Internet, assistendo "
+"nell'anonimizzare le pagine visitate e pubblicate, i sistemi di "
+"messaggistica istantanea, IRC e altro ancora. Vidalia è una GUI che "
+"semplifica il controllo e la configurazione di Tor.\n"
+"\n"
+"Privoxy è un proxy filtrante che protegge la privacy e rimuove pubblicità "
+"(ad, banner e popup).\n"
+"\n"
+"Torbutton è un'estensione di Firefox che consente di attivare o disattivare "
+"rapidamente la navigazione anonima.\n"
+"\n"
+"Se esistono già precedenti installazioni di Tor, Vidalia, Privoxy o Firefox "
+"è consigliabile assicurarsi che questi programmi siano chiusi prima di "
+"continuare con l'installazione.\n"
+"\n"
+"$_CLICK"
+
 msgctxt "BundleWelcomeTitle"
 msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
 msgstr "Benvenuti nell'installazione guidata di ${BUNDLE_NAME}"
 
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "Attiva all'avvio del pc"
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Documenti sull'installazione di ${TOR_NAME}"
 
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "it"
-
-msgctxt "BundleSetupCaption"
-msgid "${BUNDLE_NAME} setup"
-msgstr "Installazione di ${BUNDLE_NAME}"
-
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia è un programma di configurazione e controllo grafico per Tor."
-
-msgctxt "VidaliaGroupDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia è un programma di configurazione e controllo grafico per Tor."
-
 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 ""
 "L'installazione è stata completata.\n"
 "Consultare https://www.torproject.org/docs/tor-doc-windows per informazioni "
@@ -49,138 +78,187 @@
 "\n"
 "Se Torbutton è stato installato sarà necessario riavviare Firefox."
 
-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"
-msgstr "Questo wizard assisterà nell'installazione di Tor, Vidalia, Privoxy e Torbutton.\n\nTor è un software che consente di navigare anonimamente Internet, assistendo nell'anonimizzare le pagine visitate e pubblicate, i sistemi di messaggistica istantanea, IRC e altro ancora. Vidalia è una GUI che semplifica il controllo e la configurazione di Tor.\n\nPrivoxy è un proxy filtrante che protegge la privacy e rimuove pubblicità (ad, banner e popup).\n\nTorbutton è un'estensione di Firefox che consente di attivare o disattivare rapidamente la navigazione anonima.\n\nSe esistono già precedenti installazioni di Tor, Vidalia, Privoxy o Firefox è consigliabile assicurarsi che questi programmi siano chiusi prima di continuare con l'installazione.\n\n$_CLICK"
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Avvia ora i componenti installati"
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "Aggiunge ${PRIVOXY_NAME} alla cartella Programmi del menu Start."
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia è un programma di configurazione e controllo grafico per Tor."
 
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Disinstalla ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Installazione di ${VIDALIA_NAME}"
+
 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"
-msgstr "Questa procedura guidata assisterà nell'installazione di Vidalia, un programma grafico di controllo e configurazione di 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 ""
+"Questa procedura guidata assisterà nell'installazione di Vidalia, un "
+"programma grafico di controllo e configurazione di Tor.\n"
+"\n"
+"$_CLICK"
 
-msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
-msgstr "Tor è un sistema per usare anonimamente Internet, favorire l'anonimato nella navigazione e nella pubblicazione Web, messaggistica istantanea, IRC, e altro ancora."
-
 msgctxt "VidaliaWelcomeTitle"
 msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 msgstr "Benvenuti nell'installazione guidata di ${VIDALIA_NAME}"
 
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "Aggiunge l'estensione ${TORBUTTON_DESC} a Firefox."
-
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr "Disinstalla ${TOR_DESC}."
-
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "Firefox non è stato trovato nel sistema. Torbutton non sarà installato."
-
 msgctxt "VidaliaLinkText"
 msgid "${VIDALIA_NAME} homepage"
 msgstr "Homepage del progetto ${VIDALIA_NAME}"
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "Installa ${PRIVOXY_DESC}."
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Vidalia è un programma di configurazione e controllo grafico per Tor."
 
-msgctxt "AppData"
-msgid "Application Data"
-msgstr "Application Data"
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Attiva all'avvio del pc"
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Avvia ${VIDALIA_NAME} all'accensione del pc."
+
+msgctxt "VidaliaShortcuts"
 msgid "Add to Start Menu"
 msgstr "Aggiungi al menu Start"
 
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "Documenti sull'installazione di ${TOR_NAME}"
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Aggiunge ${VIDALIA_NAME} alla cartella Progammi del menu Start."
 
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-msgstr "Aggiungi a Firefox"
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Avvia ${VIDALIA_NAME} adesso"
 
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor è un sistema per usare anonimamente Internet, favorire l'anonimato nella "
+"navigazione e nella pubblicazione Web, messaggistica istantanea, IRC, e "
+"altro ancora."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Disinstalla ${TOR_DESC}."
+
 msgctxt "TorAppDesc"
 msgid "Install ${TOR_DESC}."
 msgstr "Installa ${TOR_DESC}."
 
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "Avvia ora i componenti installati"
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Un file di configurazione Tor è già presente nel sistema.$\n"
+"$\n"
+"Sovrascriverlo con il file di configurazione standard?"
 
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "Installazione di ${VIDALIA_NAME}"
-
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "Avvia ${VIDALIA_NAME} all'accensione del pc."
-
 msgctxt "TorDocumentation"
 msgid "Documentation"
 msgstr "Documentazione"
 
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr "Disinstalla ${VIDALIA_DESC}."
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Installa la documentazione di ${TOR_NAME}."
 
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Aggiungi al menu Start"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Aggiunge ${TOR_NAME} alla cartella Programmi del menu Start."
+
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr ""
+"Privoxy è un proxy web filtrante che protegge la privacy e aiuta a rimuovere "
+"pubblicità (ad, banner e popup)."
+
 msgctxt "PrivoxyUninstDesc"
 msgid "Remove ${PRIVOXY_DESC}."
 msgstr "Disinstalla ${PRIVOXY_DESC}."
 
-msgctxt "TorShortcuts"
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "Installa ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
 msgid "Add to Start Menu"
 msgstr "Aggiungi al menu Start"
 
-msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
-msgstr "Un file di configurazione Tor è già presente nel sistema.$\n$\nSovrascriverlo con il file di configurazione standard?"
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "Aggiunge ${PRIVOXY_NAME} alla cartella Programmi del menu Start."
 
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "Avvia ${VIDALIA_NAME} adesso"
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "Attiva all'avvio del pc"
 
 msgctxt "PrivoxyStartupDesc"
 msgid "Automatically run ${PRIVOXY_NAME} at startup."
 msgstr "Avvia ${PRIVOXY_NAME} all'accensione del pc."
 
-msgctxt "VidaliaShortcuts"
-msgid "Add to Start Menu"
-msgstr "Aggiungi al menu Start"
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton è un'estensione per Firefox che consente di attivare o disattivare "
+"rapidamente la navigazione anonima."
 
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "Installa la documentazione di ${TOR_NAME}."
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Disinstalla ${TORBUTTON_DESC}."
 
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Installa ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Aggiungi a Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Aggiunge l'estensione ${TORBUTTON_DESC} a Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Firefox non è stato trovato nel sistema. Torbutton non sarà installato."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application Data"
+
 msgctxt "AppDataUninstDesc"
 msgid "Remove saved application data and configuration files."
 msgstr "Remove saved application data and configuration files."
 
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "Aggiunge ${TOR_NAME} alla cartella Programmi del menu Start."
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "it"
 
-msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
-msgstr "Torbutton è un'estensione per Firefox che consente di attivare o disattivare rapidamente la navigazione anonima."
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
 
-msgctxt "TorbuttonAppDesc"
-msgid "Install ${TORBUTTON_DESC}."
-msgstr "Installa ${TORBUTTON_DESC}."
-
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
-msgstr "Disinstalla ${TORBUTTON_DESC}."
-
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
-msgstr "Privoxy è un proxy web filtrante che protegge la privacy e aiuta a rimuovere pubblicità (ad, banner e popup)."
-
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "Attiva all'avvio del pc"
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/nl/vidalia_nl.po
===================================================================
--- vidalia/trunk/pkg/win32/nl/vidalia_nl.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/nl/vidalia_nl.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Vidalia\n"
 "Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-17 02:31+0000\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
 "PO-Revision-Date: 2008-07-17 02:56+0000\n"
 "Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
@@ -12,36 +12,54 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "Voeg ${VIDALIA_NAME} toe aan uw Start menu."
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} setup"
 
+#, fuzzy
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Deze wizard zal u leiden door de installatie van Tor, Vidalia, Privoxy, and "
+"Torbutton.\n"
+"\n"
+"Indien u eerder Tor, Vidalia, Privoxy, of Firefox heeft geïnstalleerd, zorg "
+"dan dat deze zijn afgesloten voordat u verder gaat met deze installatie.\n"
+"\n"
+"$_CLICK"
+
 msgctxt "BundleWelcomeTitle"
 msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
 msgstr "Welkom bij de ${BUNDLE_NAME} Setup Wizard"
 
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "Start automatisch"
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} installatie documentatie"
 
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "nl"
-
-msgctxt "BundleSetupCaption"
-msgid "${BUNDLE_NAME} setup"
-msgstr "${BUNDLE_NAME} setup"
-
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Installeer ${VIDALIA_DESC}."
-
-msgctxt "VidaliaGroupDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Installeer ${VIDALIA_DESC}."
-
 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 ""
 "De installatie is voltooid.\n"
 "Bekijk alstublieft https://www.torproject.org/docs/tor-doc-windows voor meer "
@@ -49,139 +67,179 @@
 "\n"
 "Indien u Torbutton heeft geïnstalleerd, dient u Firefox te herstarten."
 
-#, fuzzy
-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"
-msgstr "Deze wizard zal u leiden door de installatie van Tor, Vidalia, Privoxy, and Torbutton.\n\nIndien u eerder Tor, Vidalia, Privoxy, of Firefox heeft geïnstalleerd, zorg dan dat deze zijn afgesloten voordat u verder gaat met deze installatie.\n\n$_CLICK"
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Start de geïnstalleerde onderdelen nu"
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "Voeg ${PRIVOXY_NAME} toe aan uw Start menu."
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Installeer ${VIDALIA_DESC}."
 
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Verwijder ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} setup"
+
 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"
-msgstr "Deze wizard zal u leiden door de installatie van ${VIDALIA_DESC}.\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 ""
+"Deze wizard zal u leiden door de installatie van ${VIDALIA_DESC}.\n"
+"\n"
+"$_CLICK"
 
-msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
-msgstr "Installeer ${TOR_DESC}."
-
 msgctxt "VidaliaWelcomeTitle"
 msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 msgstr "Welkom bij de ${VIDALIA_NAME} Setup Wizard"
 
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "Voeg de ${TORBUTTON_DESC} extensie toe aan Firefox."
-
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr "Verwijder ${TOR_DESC}."
-
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "Firefox werd niet gevonden op uw systeem. Torbutton wordt niet geïnstalleerd."
-
 msgctxt "VidaliaLinkText"
 msgid "${VIDALIA_NAME} homepage"
 msgstr "${VIDALIA_NAME} homepage"
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "Installeer ${PRIVOXY_DESC}."
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "Installeer ${VIDALIA_DESC}."
 
-msgctxt "AppData"
-msgid "Application Data"
-msgstr "Application Data"
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Start automatisch"
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Start ${VIDALIA_NAME} automatisch bij het opstarten van Windows."
+
+msgctxt "VidaliaShortcuts"
 msgid "Add to Start Menu"
 msgstr "Voeg toe aan Start Menu"
 
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "${TOR_NAME} installatie documentatie"
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Voeg ${VIDALIA_NAME} toe aan uw Start menu."
 
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-msgstr "Voeg toe aan Firefox"
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Start ${VIDALIA_NAME} nu"
 
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr "Installeer ${TOR_DESC}."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Verwijder ${TOR_DESC}."
+
 msgctxt "TorAppDesc"
 msgid "Install ${TOR_DESC}."
 msgstr "Installeer ${TOR_DESC}."
 
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "Start de geïnstalleerde onderdelen nu"
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"U heeft reeds een Tor configuratie bestand.$\n"
+"$\n"
+"Wilt u het overschrijven met het standaard voorbeeld configuratie bestand?"
 
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "${VIDALIA_NAME} setup"
-
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "Start ${VIDALIA_NAME} automatisch bij het opstarten van Windows."
-
 msgctxt "TorDocumentation"
 msgid "Documentation"
 msgstr "Documentatie"
 
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr "Verwijder ${VIDALIA_DESC}."
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Installeer ${TOR_NAME} documentatie."
 
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Voeg toe aan Start Menu"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Voeg ${TOR_NAME} toe aan uw Start menu."
+
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr ""
+
 msgctxt "PrivoxyUninstDesc"
 msgid "Remove ${PRIVOXY_DESC}."
 msgstr "Verwijder ${PRIVOXY_DESC}."
 
-msgctxt "TorShortcuts"
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "Installeer ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
 msgid "Add to Start Menu"
 msgstr "Voeg toe aan Start Menu"
 
-msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
-msgstr "U heeft reeds een Tor configuratie bestand.$\n$\nWilt u het overschrijven met het standaard voorbeeld configuratie bestand?"
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "Voeg ${PRIVOXY_NAME} toe aan uw Start menu."
 
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "Start ${VIDALIA_NAME} nu"
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "Start automatisch"
 
 msgctxt "PrivoxyStartupDesc"
 msgid "Automatically run ${PRIVOXY_NAME} at startup."
 msgstr "Start ${PRIVOXY_NAME} automatisch bij het opstarten van Windows."
 
-msgctxt "VidaliaShortcuts"
-msgid "Add to Start Menu"
-msgstr "Voeg toe aan Start Menu"
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
 
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "Installeer ${TOR_NAME} documentatie."
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Verwijder ${TORBUTTON_DESC}."
 
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Installeer ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Voeg toe aan Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Voeg de ${TORBUTTON_DESC} extensie toe aan Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Firefox werd niet gevonden op uw systeem. Torbutton wordt niet geïnstalleerd."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application Data"
+
 msgctxt "AppDataUninstDesc"
 msgid "Remove saved application data and configuration files."
 msgstr "Remove saved application data and configuration files."
 
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "Voeg ${TOR_NAME} toe aan uw Start menu."
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "nl"
 
-msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
 msgstr ""
 
-msgctxt "TorbuttonAppDesc"
-msgid "Install ${TORBUTTON_DESC}."
-msgstr "Installeer ${TORBUTTON_DESC}."
-
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
-msgstr "Verwijder ${TORBUTTON_DESC}."
-
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
 msgstr ""
-
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "Start automatisch"

Modified: vidalia/trunk/pkg/win32/pl/vidalia_pl.po
===================================================================
--- vidalia/trunk/pkg/win32/pl/vidalia_pl.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/pl/vidalia_pl.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -1,255 +1,270 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: Vidalia Windows Installers\n"
-"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: 2008-07-12 05:29+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-
-msgctxt "BundleSetupCaption"
-msgid "${BUNDLE_NAME} setup"
-msgstr "Instalator ${BUNDLE_NAME}"
-
-msgctxt "BundleWelcomeText"
-msgid ""
-"This wizard will guide you through the installation of Tor, Vidalia, "
-"Privoxy, 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"
-"Privoxy is a filtering web proxy that protects your privacy and helps remove "
-"ads, banners, and popups.\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, Privoxy, or Firefox, please "
-"make sure they are not running before continuing this installation.\n"
-"\n"
-"$_CLICK"
-msgstr ""
-"Kreator przeprowadzi Cię przez instalację Tora, Vidalii, Privoxy oraz "
-"Torbuttona.\n"
-"\n"
-"Tor jest systemem pozwalającym anonimowo surfować po internecie, pomaga "
-"zachować anonimowość podczas przeglądania i publikacji stron www, "
-"używania komunikatorów, IRC i innych. Vidalia jest graficznym interfejsem "
-"użytkownika, który pomaga sterować, monitorować i konfigurować Tora.\n\n"
-"Privoxy jest lokalnym serwerem proxy, który filtrując chroni Twoją "
-"prywatność i pomaga usuwać reklamy, bannery oraz popupy.\n"
-"\n"
-"Torbutton jest rozszerzeniem Firefoxa, które umożliwa w szybki sposób "
-"przełączanie się w tryb anonimowego surfowania.\n"
-"\n"
-"Jeśli poprzednio instalowałeś Tora, Vidalię, Privoxy lub Firefoxa, "
-"upewnij się, że żadne z nich nie jest w tej chwili uruchomione, zanim "
-"kontynuujesz tę instalację.\n"
-"\n"
-"$_CLICK"
-
-msgctxt "BundleWelcomeTitle"
-msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
-msgstr "Witaj w Kreatorze Instalacji ${BUNDLE_NAME}"
-
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "Dokumentacja instalacji ${TOR_NAME}"
-
-msgctxt "BundleFinishText"
-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 ""
-"Instalacja zakończona.\n"
-"Proszę zobaczyć https://www.torproject.org/docs/tor-doc-windows aby dowiedzieć "
-"sić, jak skonfigurować aplikacje do współpracy z Torem.\n"
-"\n"
-"Jeśli instalowałeś Torbutton'a, będziesz musiał uruchomić ponownie "
-"Firefox'a."
-
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "Uruchom teraz zainstalowane komponenty."
-
-msgctxt "VidaliaGroupDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia jest graficznym interfejsem użytkownika, który pomaga sterować, monitorować i konfigurować Tora."
-
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr "Usuń ${VIDALIA_DESC}."
-
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "Instalator ${VIDALIA_NAME}"
-
-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"
-msgstr ""
-"Kreator przeprowadzi Cię przez proces instalacji Vidalii, graficznego "
-"interfejsu użytkownika który umożliwia sterowanie, monitorowanie i "
-"konfigurację Tora.\n"
-"$_CLICK"
-
-msgctxt "VidaliaWelcomeTitle"
-msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
-msgstr "Witaj w Kreatorze Instalacji ${VIDALIA_NAME}"
-
-msgctxt "VidaliaLinkText"
-msgid "${VIDALIA_NAME} homepage"
-msgstr "Strona domowa ${VIDALIA_NAME}"
-
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr ""
-"Vidalia jest graficznym interfejsem użytkownika, który umożliwa "
-"sterowanie, monitorowanie i konfigurację Tora."
-
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "Uruchom na starcie"
-
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "Automatycznie uruchamia ${VIDALIA_NAME} przy starcie systemu."
-
-msgctxt "VidaliaShortcuts"
-msgid "Add to Start Menu"
-msgstr "Dodaj do Menu Start"
-
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "Dodaje skrót ${VIDALIA_NAME} do Twojego Menu Start."
-
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "Uruchom ${VIDALIA_NAME}"
-
-msgctxt "TorGroupDesc"
-msgid ""
-"Tor is a system for using the Internet anonymously, helping you anonymize "
-"Web browsing and publishing, instant messaging, IRC, and more."
-msgstr ""
-"Tor jest systemem umożliwiającym anonimowe użytkowanie Internetu, "
-"pomagając pozostać Ci anonimowym podczas przeglądania stron www, "
-"wysyłania plików, komunikacji, IRC i innych."
-
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr "Usuń ${TOR_DESC}."
-
-msgctxt "TorAppDesc"
-msgid "Install ${TOR_DESC}."
-msgstr "Instaluj ${TOR_DESC}."
-
-msgctxt "TorAskOverwriteTorrc"
-msgid ""
-"You already have a Tor configuration file.$\n$\n"
-"Do you want to overwrite it with the default sample configuration file?"
-msgstr ""
-"Posiadasz już plik konfiguracyjny Tora.$\n$\n"
-"Czy chcesz nadpisać go przykładowym domyślnym plikiem konfiguracyjnym ?"
-
-msgctxt "TorDocumentation"
-msgid "Documentation"
-msgstr "Dokumentacja"
-
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "Instaluj dokumentację ${TOR_NAME}."
-
-msgctxt "TorShortcuts"
-msgid "Add to Start Menu"
-msgstr "Dodaj do Menu Start"
-
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "Dodaje ${TOR_NAME} do Twojego Menu Start"
-
-msgctxt "PrivoxyGroupDesc"
-msgid ""
-"Privoxy is a filtering web proxy that protects your privacy and helps remove "
-"ads, banners, and popups."
-msgstr ""
-"Privoxy jest lokalnym serwerem proxy, który filtruje i chroni Twoją "
-"prywatność usuwając reklamy, bannery i popupy."
-
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
-msgstr "Usuń ${PRIVOXY_DESC}."
-
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "Instaluj ${PRIVOXY_DESC}."
-
-msgctxt "PrivoxyShortcuts"
-msgid "Add to Start Menu"
-msgstr "Dodaj do Menu Start"
-
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "Dodaje ${PRIVOXY_NAME} do Twojego Menu Start"
-
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "Uruchamiaj na starcie"
-
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
-msgstr "Automatycznie uruchamia ${PRIVOXY_NAME} na starcie systemu."
-
-msgctxt "TorbuttonGroupDesc"
-msgid ""
-"Torbutton is a Firefox extension that allows you to quickly enable or "
-"disable anonymous web browsing."
-msgstr ""
-"Torbutton jest rozszerzeniem Firefoxa, które umożliwia włączanie i "
-"wyłączanie anonimowego przeglądania stron www w szybki sposób."
-
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
-msgstr "Usuń ${TORBUTTON_DESC}."
-
-msgctxt "TorbuttonAppDesc"
-msgid "Install ${TORBUTTON_DESC}."
-msgstr "Instaluj ${TORBUTTON_DESC}."
-
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-msgstr "Dodaj do Firefoxa"
-
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "Dodaje rozszerzenie ${TORBUTTON_DESC} do Firefoxa."
-
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "Firefox nie został znaleziony w Twoim systemie. Torbutton nie zostanie zainstalowany."
-"Firefox nie został znaleziony w systemie. Instalacja Torbuttona zaniechana."
-
-msgctxt "AppData"
-msgid "Application Data"
-msgstr "Dane aplikacji"
-
-msgctxt "AppDataUninstDesc"
-msgid "Remove saved application data and configuration files."
-msgstr "Usuń dane aplikacji oraz pliki konfiguracyjne."
-
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "pl"
\ No newline at end of file
+msgid ""
+msgstr ""
+"Project-Id-Version: Vidalia Windows Installers\n"
+"Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
+"PO-Revision-Date: 2008-07-12 05:29+0000\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "Instalator ${BUNDLE_NAME}"
+
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Kreator przeprowadzi Cię przez instalację Tora, Vidalii, Privoxy oraz "
+"Torbuttona.\n"
+"\n"
+"Tor jest systemem pozwalającym anonimowo surfować po internecie, pomaga "
+"zachować anonimowość podczas przeglądania i publikacji stron www, używania "
+"komunikatorów, IRC i innych. Vidalia jest graficznym interfejsem "
+"użytkownika, który pomaga sterować, monitorować i konfigurować Tora.\n"
+"\n"
+"Privoxy jest lokalnym serwerem proxy, który filtrując chroni Twoją "
+"prywatność i pomaga usuwać reklamy, bannery oraz popupy.\n"
+"\n"
+"Torbutton jest rozszerzeniem Firefoxa, które umożliwa w szybki sposób "
+"przełączanie się w tryb anonimowego surfowania.\n"
+"\n"
+"Jeśli poprzednio instalowałeś Tora, Vidalię, Privoxy lub Firefoxa, upewnij "
+"się, że żadne z nich nie jest w tej chwili uruchomione, zanim kontynuujesz "
+"tę instalację.\n"
+"\n"
+"$_CLICK"
+
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Witaj w Kreatorze Instalacji ${BUNDLE_NAME}"
+
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Dokumentacja instalacji ${TOR_NAME}"
+
+msgctxt "BundleFinishText"
+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 ""
+"Instalacja zakończona.\n"
+"Proszę zobaczyć https://www.torproject.org/docs/tor-doc-windows aby "
+"dowiedzieć sić, jak skonfigurować aplikacje do współpracy z Torem.\n"
+"\n"
+"Jeśli instalowałeś Torbutton'a, będziesz musiał uruchomić ponownie Firefox'a."
+
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Uruchom teraz zainstalowane komponenty."
+
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia jest graficznym interfejsem użytkownika, który pomaga sterować, "
+"monitorować i konfigurować Tora."
+
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Usuń ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Instalator ${VIDALIA_NAME}"
+
+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"
+msgstr ""
+"Kreator przeprowadzi Cię przez proces instalacji Vidalii, graficznego "
+"interfejsu użytkownika który umożliwia sterowanie, monitorowanie i "
+"konfigurację Tora.\n"
+"$_CLICK"
+
+msgctxt "VidaliaWelcomeTitle"
+msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
+msgstr "Witaj w Kreatorze Instalacji ${VIDALIA_NAME}"
+
+msgctxt "VidaliaLinkText"
+msgid "${VIDALIA_NAME} homepage"
+msgstr "Strona domowa ${VIDALIA_NAME}"
+
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia jest graficznym interfejsem użytkownika, który umożliwa sterowanie, "
+"monitorowanie i konfigurację Tora."
+
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Uruchom na starcie"
+
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Automatycznie uruchamia ${VIDALIA_NAME} przy starcie systemu."
+
+msgctxt "VidaliaShortcuts"
+msgid "Add to Start Menu"
+msgstr "Dodaj do Menu Start"
+
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Dodaje skrót ${VIDALIA_NAME} do Twojego Menu Start."
+
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Uruchom ${VIDALIA_NAME}"
+
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor jest systemem umożliwiającym anonimowe użytkowanie Internetu, pomagając "
+"pozostać Ci anonimowym podczas przeglądania stron www, wysyłania plików, "
+"komunikacji, IRC i innych."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Usuń ${TOR_DESC}."
+
+msgctxt "TorAppDesc"
+msgid "Install ${TOR_DESC}."
+msgstr "Instaluj ${TOR_DESC}."
+
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Posiadasz już plik konfiguracyjny Tora.$\n"
+"$\n"
+"Czy chcesz nadpisać go przykładowym domyślnym plikiem konfiguracyjnym ?"
+
+msgctxt "TorDocumentation"
+msgid "Documentation"
+msgstr "Dokumentacja"
+
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Instaluj dokumentację ${TOR_NAME}."
+
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Dodaj do Menu Start"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Dodaje ${TOR_NAME} do Twojego Menu Start"
+
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr ""
+"Privoxy jest lokalnym serwerem proxy, który filtruje i chroni Twoją "
+"prywatność usuwając reklamy, bannery i popupy."
+
+msgctxt "PrivoxyUninstDesc"
+msgid "Remove ${PRIVOXY_DESC}."
+msgstr "Usuń ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "Instaluj ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
+msgid "Add to Start Menu"
+msgstr "Dodaj do Menu Start"
+
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "Dodaje ${PRIVOXY_NAME} do Twojego Menu Start"
+
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "Uruchamiaj na starcie"
+
+msgctxt "PrivoxyStartupDesc"
+msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgstr "Automatycznie uruchamia ${PRIVOXY_NAME} na starcie systemu."
+
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton jest rozszerzeniem Firefoxa, które umożliwia włączanie i "
+"wyłączanie anonimowego przeglądania stron www w szybki sposób."
+
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Usuń ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Instaluj ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Dodaj do Firefoxa"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Dodaje rozszerzenie ${TORBUTTON_DESC} do Firefoxa."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Firefox nie został znaleziony w Twoim systemie. Torbutton nie zostanie "
+"zainstalowany.Firefox nie został znaleziony w systemie. Instalacja "
+"Torbuttona zaniechana."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Dane aplikacji"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Usuń dane aplikacji oraz pliki konfiguracyjne."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "pl"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/pt/vidalia_pt.po
===================================================================
--- vidalia/trunk/pkg/win32/pt/vidalia_pt.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/pt/vidalia_pt.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Vidalia\n"
 "Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-17 02:32+0000\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
 "PO-Revision-Date: 2008-07-17 03:03+0000\n"
 "Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
@@ -12,36 +12,55 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "Adicionar ${VIDALIA_NAME} ao seu Menu Iniciar."
-
-msgctxt "BundleWelcomeTitle"
-msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
-msgstr "Bem vindo ao Assistente de Instalação do ${BUNDLE_NAME}"
-
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "Executar Na Inicialização"
-
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "pt-br"
-
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr "Instalação do ${BUNDLE_NAME}"
 
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+#, fuzzy
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
 msgstr ""
+"Este assistente irá guiá-lo através da instalação do Tor, Vidalia, Privoxy e "
+"Torbutton.\n"
+"\n"
+"Se você já instalou previamente o Tor, Vidalia, Privoxy ou Firefox, por "
+"favor certifique-se de que eles não estejam sendo executados antes "
+"prosseguir com esta instalação.\n"
+"\n"
+"$_CLICK"
 
-msgctxt "VidaliaGroupDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr ""
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "Bem vindo ao Assistente de Instalação do ${BUNDLE_NAME}"
 
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Documentação da instalação ${TOR_NAME}"
+
 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 ""
 "A instalação foi completada.\n"
 "Por favor visite https://www.torproject.org/docs/tor-doc-windows para "
@@ -49,139 +68,179 @@
 "\n"
 "Se você instalou o Torbutton, você terá que reiniciar o Firefox."
 
-#, fuzzy
-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"
-msgstr "Este assistente irá guiá-lo através da instalação do Tor, Vidalia, Privoxy e Torbutton.\n\nSe você já instalou previamente o Tor, Vidalia, Privoxy ou Firefox, por favor certifique-se de que eles não estejam sendo executados antes prosseguir com esta instalação.\n\n$_CLICK"
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Executar os componentes instalados agora"
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "Adicionar o ${PRIVOXY_NAME} ao seu Menu Iniciar."
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
 
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Remove ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Instalação do ${VIDALIA_NAME}"
+
 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"
-msgstr "Este assistente irá guiá-lo através da instalação do ${VIDALIA_DESC}.\n\n$_CLICK"
-
-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 ""
+"This wizard will guide you through the installation of Vidalia, a GUI that "
+"helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
 msgstr ""
+"Este assistente irá guiá-lo através da instalação do ${VIDALIA_DESC}.\n"
+"\n"
+"$_CLICK"
 
 msgctxt "VidaliaWelcomeTitle"
 msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 msgstr "Bem vindo ao Assistente de Instalação do ${VIDALIA_NAME}"
 
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "Adicionar a extensão ${TORBUTTON_DESC} no Firefox."
-
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr "Remove ${TOR_DESC}."
-
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "O Firefox não foi encontrado no seu sistema. O Torbutton não será instalado."
-
 msgctxt "VidaliaLinkText"
 msgid "${VIDALIA_NAME} homepage"
 msgstr "${VIDALIA_NAME} homepage"
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "Instalar ${PRIVOXY_DESC}."
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
 
-msgctxt "AppData"
-msgid "Application Data"
-msgstr "Application Data"
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Executar Na Inicialização"
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Executar o ${VIDALIA_NAME} automaticamente na inicialização."
+
+msgctxt "VidaliaShortcuts"
 msgid "Add to Start Menu"
 msgstr "Adicionar ao Menu Iniciar"
 
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "Documentação da instalação ${TOR_NAME}"
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Adicionar ${VIDALIA_NAME} ao seu Menu Iniciar."
 
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-msgstr "Adicionar ao Firefox"
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Executar o ${VIDALIA_NAME} agora"
 
+msgctxt "TorGroupDesc"
+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"
+msgid "Remove ${TOR_DESC}."
+msgstr "Remove ${TOR_DESC}."
+
 msgctxt "TorAppDesc"
 msgid "Install ${TOR_DESC}."
 msgstr "Instalar ${TOR_DESC}."
 
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "Executar os componentes instalados agora"
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Você já tem um arquivo de configuração do Tor.$\n"
+"$\n"
+"Você deseja substituí-lo com o arquivo de exemplo de configuração padrão?"
 
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "Instalação do ${VIDALIA_NAME}"
-
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "Executar o ${VIDALIA_NAME} automaticamente na inicialização."
-
 msgctxt "TorDocumentation"
 msgid "Documentation"
 msgstr "Documentação"
 
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr "Remove ${VIDALIA_DESC}."
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Instalar a documentação do ${TOR_NAME}."
 
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Adicionar ao Menu Iniciar"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Adicionar o ${TOR_NAME} ao seu Menu Iniciar."
+
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr "Instalar ${PRIVOXY_DESC}."
+
 msgctxt "PrivoxyUninstDesc"
 msgid "Remove ${PRIVOXY_DESC}."
 msgstr "Remove ${PRIVOXY_DESC}."
 
-msgctxt "TorShortcuts"
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "Instalar ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
 msgid "Add to Start Menu"
 msgstr "Adicionar ao Menu Iniciar"
 
-msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
-msgstr "Você já tem um arquivo de configuração do Tor.$\n$\nVocê deseja substituí-lo com o arquivo de exemplo de configuração padrão?"
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "Adicionar o ${PRIVOXY_NAME} ao seu Menu Iniciar."
 
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "Executar o ${VIDALIA_NAME} agora"
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "Executar Na Inicialização"
 
 msgctxt "PrivoxyStartupDesc"
 msgid "Automatically run ${PRIVOXY_NAME} at startup."
 msgstr "Executar o ${PRIVOXY_NAME} automaticamente na inicialização."
 
-msgctxt "VidaliaShortcuts"
-msgid "Add to Start Menu"
-msgstr "Adicionar ao Menu Iniciar"
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
 
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "Instalar a documentação do ${TOR_NAME}."
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Remove ${TORBUTTON_DESC}."
 
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Instalar ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Adicionar ao Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Adicionar a extensão ${TORBUTTON_DESC} no Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"O Firefox não foi encontrado no seu sistema. O Torbutton não será instalado."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application Data"
+
 msgctxt "AppDataUninstDesc"
 msgid "Remove saved application data and configuration files."
 msgstr "Remove saved application data and configuration files."
 
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "Adicionar o ${TOR_NAME} ao seu Menu Iniciar."
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "pt-br"
 
-msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
 msgstr ""
 
-msgctxt "TorbuttonAppDesc"
-msgid "Install ${TORBUTTON_DESC}."
-msgstr "Instalar ${TORBUTTON_DESC}."
-
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
-msgstr "Remove ${TORBUTTON_DESC}."
-
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
-msgstr "Instalar ${PRIVOXY_DESC}."
-
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "Executar Na Inicialização"
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/ro/vidalia_ro.po
===================================================================
--- vidalia/trunk/pkg/win32/ro/vidalia_ro.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/ro/vidalia_ro.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Vidalia\n"
 "Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-17 02:32+0000\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
 "PO-Revision-Date: 2008-07-17 03:06+0000\n"
 "Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
@@ -13,36 +13,64 @@
 "20)) ? 1 : 2);\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "Adauga ${VIDALIA_NAME} în meniul Start."
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "Instalare ${BUNDLE_NAME}"
 
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Acest vrajitor te va ghida prin instalarea Tor-ului, Vidaliei, Privoxy-ului, "
+"si Torbutton.\n"
+"\n"
+"Tor este un sistem pentru folosirea anonima a Internetului, ajutându-te la "
+"anonimizarea navigarii pe Internet, mesageriei instantanee, IRC, si multe "
+"altele. Vidalia este o interfata care te ajuta la controlarea, "
+"monitorizarea, si configurarea Tor-ului.\n"
+"\n"
+"Privoxy este un proxy web pentru filtrare care îti protejeaza intimitatea si "
+"ajuta la înlaturarea reclamelor, bannerelor, si popup-urilor.\n"
+"\n"
+"Torbutton este o extensie Firefox care îti permite rapid sa activezi sau "
+"dezactiva navigarea anonima.\n"
+"\n"
+"Daca ai instalat în trecut Tor, Vidalia, Privoxy sau Firefox, te rog fi "
+"sigur ca ele nu ruleaza, înainte de a continua cu aceasta instalare.\n"
+"\n"
+"$_CLICK"
+
 msgctxt "BundleWelcomeTitle"
 msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
 msgstr "Bine ai venit la Vrajitorul de Instalare ${BUNDLE_NAME}"
 
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "Ruleaza la pornire"
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Instalarea documentatiei ${TOR_NAME}"
 
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "ro"
-
-msgctxt "BundleSetupCaption"
-msgid "${BUNDLE_NAME} setup"
-msgstr "Instalare ${BUNDLE_NAME}"
-
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia este o interfata care te ajuta la controlarea, monitorizarea, si configurarea Tor-ului."
-
-msgctxt "VidaliaGroupDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia este o interfata care te ajuta la controlarea, monitorizarea, si configurarea Tor-ului."
-
 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 ""
 "Instalarea este completa.\n"
 "Vezi https://www.torproject.org/docs/tor-doc-windows pentru a învata cum sa "
@@ -50,138 +78,190 @@
 "\n"
 "Daca ai instalat Torbutton, trebuie sa repornesti Firefox."
 
-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"
-msgstr "Acest vrajitor te va ghida prin instalarea Tor-ului, Vidaliei, Privoxy-ului, si Torbutton.\n\nTor este un sistem pentru folosirea anonima a Internetului, ajutându-te la anonimizarea navigarii pe Internet, mesageriei instantanee, IRC, si multe altele. Vidalia este o interfata care te ajuta la controlarea, monitorizarea, si configurarea Tor-ului.\n\nPrivoxy este un proxy web pentru filtrare care îti protejeaza intimitatea si ajuta la înlaturarea reclamelor, bannerelor, si popup-urilor.\n\nTorbutton este o extensie Firefox care îti permite rapid sa activezi sau dezactiva navigarea anonima.\n\nDaca ai instalat în trecut Tor, Vidalia, Privoxy sau Firefox, te rog fi sigur ca ele nu ruleaza, înainte de a continua cu aceasta instalare.\n\n$_CLICK"
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Ruleaza acum componentele instalate"
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "Adauga ${PRIVOXY_NAME} în meniul Start."
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia este o interfata care te ajuta la controlarea, monitorizarea, si "
+"configurarea Tor-ului."
 
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Înlatura ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Instalare ${VIDALIA_NAME}"
+
 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"
-msgstr "Acest vrajitor te va ghida prin instalarea Vidaliei, o interfata care te ajuta la controlarea, monitorizarea, si configurarea Tor-ului.\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 ""
+"Acest vrajitor te va ghida prin instalarea Vidaliei, o interfata care te "
+"ajuta la controlarea, monitorizarea, si configurarea Tor-ului.\n"
+"\n"
+"$_CLICK"
 
-msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
-msgstr "Tor este un sistem pentru folosirea anonima a Internetului, ajutându-te la anonimizarea navigarii pe Internet, mesageriei instantanee, IRC, si multe altele."
-
 msgctxt "VidaliaWelcomeTitle"
 msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 msgstr "Bine ai venit la Vrajitorul de Instalare ${VIDALIA_NAME}"
 
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "Adauga extensia ${TORBUTTON_DESC} în Firefox."
-
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr "Înlatura ${TOR_DESC}."
-
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "Firefox nu a fost gasit pe sistemul tau. Nu instalez Torbutton."
-
 msgctxt "VidaliaLinkText"
 msgid "${VIDALIA_NAME} homepage"
 msgstr "Pagina ${VIDALIA_NAME}"
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "Instaleaza ${PRIVOXY_DESC}."
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia este o interfata care te ajuta la controlarea, monitorizarea, si "
+"configurarea Tor-ului."
 
-msgctxt "AppData"
-msgid "Application Data"
-msgstr "Application Data"
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Ruleaza la pornirea calculatorului"
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Ruleaza automat ${VIDALIA_NAME} la pornire."
+
+msgctxt "VidaliaShortcuts"
 msgid "Add to Start Menu"
 msgstr "Adauga în Start Menu"
 
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "Instalarea documentatiei ${TOR_NAME}"
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Adauga ${VIDALIA_NAME} în meniul Start."
 
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-msgstr "Adauga în Firefox"
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Ruleaza ${VIDALIA_NAME} acum"
 
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor este un sistem pentru folosirea anonima a Internetului, ajutându-te la "
+"anonimizarea navigarii pe Internet, mesageriei instantanee, IRC, si multe "
+"altele."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Înlatura ${TOR_DESC}."
+
 msgctxt "TorAppDesc"
 msgid "Install ${TOR_DESC}."
 msgstr "Instaleaza ${TOR_DESC}."
 
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "Ruleaza acum componentele instalate"
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"Ai deja un fisier de configurare pentru Tor.$\n"
+"$\n"
+"Vrei sa îl rescri cu un fisier implicit de configurare?"
 
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "Instalare ${VIDALIA_NAME}"
-
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "Ruleaza automat ${VIDALIA_NAME} la pornire."
-
 msgctxt "TorDocumentation"
 msgid "Documentation"
 msgstr "Documentatie"
 
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr "Înlatura ${VIDALIA_DESC}."
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Instaleza documentatia ${TOR_NAME}."
 
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Adauga în Start Menu"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Adauga ${TOR_NAME} în meniul Start."
+
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr ""
+"Privoxy este un proxy web pentru filtrare care îti protejeaza intimitatea si "
+"ajuta la înlaturarea reclamelor, bannerelor, si popup-urilor."
+
 msgctxt "PrivoxyUninstDesc"
 msgid "Remove ${PRIVOXY_DESC}."
 msgstr "Înlatura ${PRIVOXY_DESC}."
 
-msgctxt "TorShortcuts"
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "Instaleaza ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
 msgid "Add to Start Menu"
 msgstr "Adauga în Start Menu"
 
-msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
-msgstr "Ai deja un fisier de configurare pentru Tor.$\n$\nVrei sa îl rescri cu un fisier implicit de configurare?"
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "Adauga ${PRIVOXY_NAME} în meniul Start."
 
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "Ruleaza ${VIDALIA_NAME} acum"
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "Ruleaza la pornire"
 
 msgctxt "PrivoxyStartupDesc"
 msgid "Automatically run ${PRIVOXY_NAME} at startup."
 msgstr "Ruleaza automat ${PRIVOXY_NAME} la pornire."
 
-msgctxt "VidaliaShortcuts"
-msgid "Add to Start Menu"
-msgstr "Adauga în Start Menu"
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton este o extensie Firefox care îti permite rapid sa activezi sau "
+"dezactiva navigarea anonima."
 
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "Instaleza documentatia ${TOR_NAME}."
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Înlatura ${TORBUTTON_DESC}."
 
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Instaleaza ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Adauga în Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Adauga extensia ${TORBUTTON_DESC} în Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "Firefox nu a fost gasit pe sistemul tau. Nu instalez Torbutton."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application Data"
+
 msgctxt "AppDataUninstDesc"
 msgid "Remove saved application data and configuration files."
 msgstr "Remove saved application data and configuration files."
 
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "Adauga ${TOR_NAME} în meniul Start."
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "ro"
 
-msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
-msgstr "Torbutton este o extensie Firefox care îti permite rapid sa activezi sau dezactiva navigarea anonima."
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
 
-msgctxt "TorbuttonAppDesc"
-msgid "Install ${TORBUTTON_DESC}."
-msgstr "Instaleaza ${TORBUTTON_DESC}."
-
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
-msgstr "Înlatura ${TORBUTTON_DESC}."
-
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
-msgstr "Privoxy este un proxy web pentru filtrare care îti protejeaza intimitatea si ajuta la înlaturarea reclamelor, bannerelor, si popup-urilor."
-
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "Ruleaza la pornirea calculatorului"
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/ru/vidalia_ru.po
===================================================================
--- vidalia/trunk/pkg/win32/ru/vidalia_ru.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/ru/vidalia_ru.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -2,47 +2,75 @@
 msgstr ""
 "Project-Id-Version: Vidalia\n"
 "Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-17 02:32+0000\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
 "PO-Revision-Date: 2008-07-17 03:12+0000\n"
 "Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "Добавить ${VIDALIA_NAME} в Главное Меню."
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "Установка ${BUNDLE_NAME}"
 
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"Эта программа установит Tor, Vidalia, Privoxy, и Torbutton.\n"
+"\n"
+"Tor это система анонимного использования сети Internet, которая поможет "
+"анонимизировать Вашу веб-деятельность, системы мгновенного обмена "
+"сообщениями, IRC, и многое другое. Vidalia это программа с оконным "
+"интерфейсом для настройки, управления и контроля Tor.\n"
+"\n"
+"Privoxy это фильтрующий веб-прокси который помогает защитить вашу "
+"приватность, а также удаляет рекламу, баннеры, и всплывающие сообщения.\n"
+"\n"
+"Torbutton это расширение Firefox для быстрого включения/выключения режима "
+"анонимного использования браузера.\n"
+"\n"
+"Если вы ранее уже устанавливали Tor, Vidalia, Privoxy, или Firefox, "
+"пожалуйста убедитесь что эти программы остановлены и потом продолжите "
+"установку.\n"
+"\n"
+"$_CLICK"
+
 msgctxt "BundleWelcomeTitle"
 msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
 msgstr "Вас приветствует мастер установки ${BUNDLE_NAME}"
 
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "Автозапуск"
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "Инструкция по установке ${TOR_NAME}"
 
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "ru"
-
-msgctxt "BundleSetupCaption"
-msgid "${BUNDLE_NAME} setup"
-msgstr "Установка ${BUNDLE_NAME}"
-
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia это программа с оконным интерфейсом для настройки, управления и контроля Tor."
-
-msgctxt "VidaliaGroupDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "Vidalia это программа с оконным интерфейсом для настройки, управления и контроля Tor."
-
 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 ""
 "Установка завершена.\n"
 "Пожалуйста прочитайте https://www.torproject.org/docs/tor-doc-windows чтобы "
@@ -50,138 +78,191 @@
 "\n"
 "Если вы установили Torbutton, вам придётся перезапустить Firefox."
 
-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"
-msgstr "Эта программа установит Tor, Vidalia, Privoxy, и Torbutton.\n\nTor это система анонимного использования сети Internet, которая поможет анонимизировать Вашу веб-деятельность, системы мгновенного обмена сообщениями, IRC, и многое другое. Vidalia это программа с оконным интерфейсом для настройки, управления и контроля Tor.\n\nPrivoxy это фильтрующий веб-прокси который помогает защитить вашу приватность, а также удаляет рекламу, баннеры, и всплывающие сообщения.\n\nTorbutton это расширение Firefox для быстрого включения/выключения режима анонимного использования браузера.!
 \n\nЕсли вы ранее уже устанавливали Tor, Vidalia, Privoxy, или Firefox, пожалуйста убедитесь что эти программы остановлены и потом продолжите установку.\n\n$_CLICK"
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "Запустить установленные компоненты"
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "Добавить ${PRIVOXY_NAME} в Главное Меню."
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia это программа с оконным интерфейсом для настройки, управления и "
+"контроля Tor."
 
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Удалить ${VIDALIA_DESC}."
+
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "Установка ${VIDALIA_NAME}"
+
 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"
-msgstr "Этот мастер установит Vidalia, программу с оконным интерфейсом для настройки, управления и контроля 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 ""
+"Этот мастер установит Vidalia, программу с оконным интерфейсом для "
+"настройки, управления и контроля Tor.\n"
+"\n"
+"$_CLICK"
 
-msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
-msgstr "Tor это система анонимного использования сети Internet, которая поможет анонимизировать Вашу веб-деятельность, системы мгновенного обмена сообщениями, IRC, и многое другое."
-
 msgctxt "VidaliaWelcomeTitle"
 msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 msgstr "Вас приветствует мастер установки ${VIDALIA_NAME}"
 
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "Добавить расширение ${TORBUTTON_DESC} в Firefox."
-
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr "Удалить ${TOR_DESC}."
-
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "Не удалось найти Firefox на вашем компьютере. Torbutton не будет установлен."
-
 msgctxt "VidaliaLinkText"
 msgid "${VIDALIA_NAME} homepage"
 msgstr "Страница проекта ${VIDALIA_NAME}"
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "Установить ${PRIVOXY_DESC}."
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr ""
+"Vidalia это программа с оконным интерфейсом для настройки, управления и "
+"контроля Tor."
 
-msgctxt "AppData"
-msgid "Application Data"
-msgstr "Application Data"
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "Автозапуск"
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "Автоматически запускать ${VIDALIA_NAME} при загрузке системы."
+
+msgctxt "VidaliaShortcuts"
 msgid "Add to Start Menu"
 msgstr "Ярлыки в Главное Меню"
 
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "Инструкция по установке ${TOR_NAME}"
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "Добавить ${VIDALIA_NAME} в Главное Меню."
 
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-msgstr "Добавить в Firefox"
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "Запустить ${VIDALIA_NAME}"
 
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr ""
+"Tor это система анонимного использования сети Internet, которая поможет "
+"анонимизировать Вашу веб-деятельность, системы мгновенного обмена "
+"сообщениями, IRC, и многое другое."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Удалить ${TOR_DESC}."
+
 msgctxt "TorAppDesc"
 msgid "Install ${TOR_DESC}."
 msgstr "Установить ${TOR_DESC}."
 
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "Запустить установленные компоненты"
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"У вас уже есть файл настроек Tor.$\n"
+"$\n"
+"Хотите ли вы перезаписать его файлом из дистрибутива?"
 
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "Установка ${VIDALIA_NAME}"
-
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "Автоматически запускать ${VIDALIA_NAME} при загрузке системы."
-
 msgctxt "TorDocumentation"
 msgid "Documentation"
 msgstr "Документация"
 
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr "Удалить ${VIDALIA_DESC}."
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "Установить документацию ${TOR_NAME}."
 
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "Ярлыки в Главное Меню"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "Добавить ${TOR_NAME} в Главное Меню."
+
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr ""
+"Privoxy это фильтрующий веб-прокси который помогает защитить вашу "
+"приватность, а также удаляет рекламу, баннеры, и всплывающие сообщения."
+
 msgctxt "PrivoxyUninstDesc"
 msgid "Remove ${PRIVOXY_DESC}."
 msgstr "Удалить ${PRIVOXY_DESC}."
 
-msgctxt "TorShortcuts"
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "Установить ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
 msgid "Add to Start Menu"
 msgstr "Ярлыки в Главное Меню"
 
-msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
-msgstr "У вас уже есть файл настроек Tor.$\n$\nХотите ли вы перезаписать его файлом из дистрибутива?"
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "Добавить ${PRIVOXY_NAME} в Главное Меню."
 
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "Запустить ${VIDALIA_NAME}"
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "Автозапуск"
 
 msgctxt "PrivoxyStartupDesc"
 msgid "Automatically run ${PRIVOXY_NAME} at startup."
 msgstr "Автоматически запускать ${PRIVOXY_NAME} при загрузке системы."
 
-msgctxt "VidaliaShortcuts"
-msgid "Add to Start Menu"
-msgstr "Ярлыки в Главное Меню"
+msgctxt "TorbuttonGroupDesc"
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
+msgstr ""
+"Torbutton это расширение Firefox для быстрого включения/выключения режима "
+"анонимного использования браузера."
 
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "Установить документацию ${TOR_NAME}."
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Удалить ${TORBUTTON_DESC}."
 
+msgctxt "TorbuttonAppDesc"
+msgid "Install ${TORBUTTON_DESC}."
+msgstr "Установить ${TORBUTTON_DESC}."
+
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "Добавить в Firefox"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "Добавить расширение ${TORBUTTON_DESC} в Firefox."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr ""
+"Не удалось найти Firefox на вашем компьютере. Torbutton не будет установлен."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application Data"
+
 msgctxt "AppDataUninstDesc"
 msgid "Remove saved application data and configuration files."
 msgstr "Удалить данные приложений и файлы настроек."
 
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "Добавить ${TOR_NAME} в Главное Меню."
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "ru"
 
-msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
-msgstr "Torbutton это расширение Firefox для быстрого включения/выключения режима анонимного использования браузера."
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
 
-msgctxt "TorbuttonAppDesc"
-msgid "Install ${TORBUTTON_DESC}."
-msgstr "Установить ${TORBUTTON_DESC}."
-
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
-msgstr "Удалить ${TORBUTTON_DESC}."
-
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
-msgstr "Privoxy это фильтрующий веб-прокси который помогает защитить вашу приватность, а также удаляет рекламу, баннеры, и всплывающие сообщения."
-
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "Автозапуск"
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/sv/vidalia_sv.po
===================================================================
--- vidalia/trunk/pkg/win32/sv/vidalia_sv.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/sv/vidalia_sv.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -38,14 +38,14 @@
 msgstr ""
 "Denna guide tar dig igenom installationen av Tor, Vidalia, Privoxy och "
 "Torbutton.\n"
-"\\nTor är ett program för att vara anonym på Internet och gör det möjligt att "
-"anonymt surfa och publicera information, skicka snabbmeddelanden, använda "
-"IRC, och mycket annat. Vidalia är ett användargränssnitt till Tor som gör "
-"det enkelt att hantera, övervaka och konfigurera Tor.\n"
+"\\nTor är ett program för att vara anonym på Internet och gör det möjligt "
+"att anonymt surfa och publicera information, skicka snabbmeddelanden, "
+"använda IRC, och mycket annat. Vidalia är ett användargränssnitt till Tor "
+"som gör det enkelt att hantera, övervaka och konfigurera Tor.\n"
 "\n"
-"Privoxy är en filtrerande webbproxy som tar bort reklam, bannrar och pop-"
-"ups.\r\n"
+"Privoxy är en filtrerande webbproxy som tar bort reklam, bannrar och pop-ups."
 "\r\n"
+"\r\n"
 "Torbutton är ett tillägg till Firefox som gör det möjligt att snabbt "
 "aktivera eller inaktivera anonym surfning.\r\n"
 "\r\n"
@@ -71,8 +71,8 @@
 "If you installed Torbutton, you will need to restart Firefox."
 msgstr ""
 "Installationen är klar. \n"
-"Vänligen se https://www.torproject.org/docs/tor-doc-windows för information om "
-"hur du använder Tor med dina existerande program.\n"
+"Vänligen se https://www.torproject.org/docs/tor-doc-windows för information "
+"om hur du använder Tor med dina existerande program.\n"
 "\n"
 "Om du valde att installera Torbutton, måste du starta om Firefox."
 
@@ -159,10 +159,12 @@
 
 msgctxt "TorAskOverwriteTorrc"
 msgid ""
-"You already have a Tor configuration file.$\n$\n"
+"You already have a Tor configuration file.$\n"
+"$\n"
 "Do you want to overwrite it with the default sample configuration file?"
 msgstr ""
-"Du har redan en konfigurationsfil för Tor.$\n$\n"
+"Du har redan en konfigurationsfil för Tor.$\n"
+"$\n"
 "Vill du skriva över den med standardkonfigurationsfilen?"
 
 msgctxt "TorDocumentation"
@@ -186,8 +188,7 @@
 "Privoxy is a filtering web proxy that protects your privacy and helps remove "
 "ads, banners, and popups."
 msgstr ""
-"Privoxy är en filtrerande webbproxy som tar bort reklam, bannrar och pop-"
-"ups."
+"Privoxy är en filtrerande webbproxy som tar bort reklam, bannrar och pop-ups."
 
 msgctxt "PrivoxyUninstDesc"
 msgid "Remove ${PRIVOXY_DESC}."
@@ -239,7 +240,8 @@
 
 msgctxt "TorbuttonFirefoxNotFound"
 msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "Torbutton kan ej installeras: Mozilla Firefox hittades ej på din dator."
+msgstr ""
+"Torbutton kan ej installeras: Mozilla Firefox hittades ej på din dator."
 
 msgctxt "AppData"
 msgid "Application Data"
@@ -252,3 +254,12 @@
 msgctxt "LanguageCode"
 msgid "en"
 msgstr "sv"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/zh_CN/vidalia_zh_CN.po
===================================================================
--- vidalia/trunk/pkg/win32/zh_CN/vidalia_zh_CN.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/zh_CN/vidalia_zh_CN.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Vidalia\n"
 "Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-17 02:33+0000\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
 "PO-Revision-Date: 2008-07-22 17:25+0000\n"
 "Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
@@ -12,175 +12,236 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "添加 ${VIDALIA_NAME} 至开始菜单程序组."
+msgctxt "BundleSetupCaption"
+msgid "${BUNDLE_NAME} setup"
+msgstr "${BUNDLE_NAME} 安装向导"
 
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"该向导将会引导您安装 Tor,Vidalia,Privoxy 和 Torbutton.\n"
+"\n"
+"如果您曾经安装过 Tor,Vidalia,Privoxy 或 Firefox,请确保在运行此安装向导前这些"
+"程序未在运行.\n"
+"\n"
+"$_CLICK"
+
 msgctxt "BundleWelcomeTitle"
 msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
 msgstr "欢迎使用 ${BUNDLE_NAME} 安装向导"
 
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "在系统启动时运行"
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} 安装文档"
 
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "zh-cn"
+msgctxt "BundleFinishText"
+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 ""
+"安装完成.\n"
+"请访问 https://www.torproject.org/docs/tor-doc-windows 来获取关于 Tor 的配置"
+"信息.\n"
+"\n"
+"如果选择了安装 Torbutton,您需要重新启动火狐(Firefox)浏览器."
 
-msgctxt "BundleSetupCaption"
-msgid "${BUNDLE_NAME} setup"
-msgstr "${BUNDLE_NAME} 安装向导"
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "现在运行已安装组件"
 
 #, fuzzy
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "安装 ${VIDALIA_DESC}."
-
-#, fuzzy
 msgctxt "VidaliaGroupDesc"
 msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
 msgstr "安装 ${VIDALIA_DESC}."
 
-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."
-msgstr "安装完成.\n请访问 https://www.torproject.org/docs/tor-doc-windows 来获取关于 Tor 的配置信息.\n\n如果选择了安装 Torbutton,您需要重新启动火狐(Firefox)浏览器."
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Remove ${VIDALIA_DESC}."
 
-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"
-msgstr "该向导将会引导您安装 Tor,Vidalia,Privoxy 和 Torbutton.\n\n如果您曾经安装过 Tor,Vidalia,Privoxy 或 Firefox,请确保在运行此安装向导前这些程序未在运行.\n\n$_CLICK"
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} 安装向导"
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "添加 ${PRIVOXY_NAME} 至开始菜单程序组."
-
 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"
-msgstr "该向导将会引导您安装 ${VIDALIA_DESC}.\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 ""
+"该向导将会引导您安装 ${VIDALIA_DESC}.\n"
+"\n"
+"$_CLICK"
 
-#, fuzzy
-msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
-msgstr "安装 ${TOR_DESC}."
-
 msgctxt "VidaliaWelcomeTitle"
 msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 msgstr "欢迎使用 ${VIDALIA_NAME} 安装向导"
 
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "添加 ${TORBUTTON_DESC} 扩展至火狐(Firefox)浏览器."
-
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr "Remove ${TOR_DESC}."
-
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "安装程序未检测到火狐(Firefox)浏览器,因此将停止添加 Torbutton 扩展."
-
 msgctxt "VidaliaLinkText"
 msgid "${VIDALIA_NAME} homepage"
 msgstr "${VIDALIA_NAME} 主页快捷方式"
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "安装 ${PRIVOXY_DESC}."
+#, fuzzy
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "安装 ${VIDALIA_DESC}."
 
-msgctxt "AppData"
-msgid "Application Data"
-msgstr "Application Data"
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "在系统启动时运行"
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "自动在系统启动时运行 ${VIDALIA_NAME}."
+
+msgctxt "VidaliaShortcuts"
 msgid "Add to Start Menu"
 msgstr "添加至开始菜单程序组"
 
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "${TOR_NAME} 安装文档"
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "添加 ${VIDALIA_NAME} 至开始菜单程序组."
 
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-msgstr "添加至火狐(Firefox)浏览器"
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "现在运行 ${VIDALIA_NAME}"
 
+#, fuzzy
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr "安装 ${TOR_DESC}."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Remove ${TOR_DESC}."
+
 msgctxt "TorAppDesc"
 msgid "Install ${TOR_DESC}."
 msgstr "安装 ${TOR_DESC}."
 
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "现在运行已安装组件"
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"安装程序检测到已存在的 Tor 配置文件.$\n"
+"$\n"
+"是否要使用默认的配置文件覆盖它?"
 
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "${VIDALIA_NAME} 安装向导"
-
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "自动在系统启动时运行 ${VIDALIA_NAME}."
-
 msgctxt "TorDocumentation"
 msgid "Documentation"
 msgstr "文档"
 
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr "Remove ${VIDALIA_DESC}."
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "安装 ${TOR_NAME} 文档."
 
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "添加至开始菜单程序组"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "添加 ${TOR_NAME} 至开始菜单程序组."
+
+#, fuzzy
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr "安装 ${PRIVOXY_DESC}."
+
 msgctxt "PrivoxyUninstDesc"
 msgid "Remove ${PRIVOXY_DESC}."
 msgstr "Remove ${PRIVOXY_DESC}."
 
-msgctxt "TorShortcuts"
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "安装 ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
 msgid "Add to Start Menu"
 msgstr "添加至开始菜单程序组"
 
-msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
-msgstr "安装程序检测到已存在的 Tor 配置文件.$\n$\n是否要使用默认的配置文件覆盖它?"
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "添加 ${PRIVOXY_NAME} 至开始菜单程序组."
 
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "现在运行 ${VIDALIA_NAME}"
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "在系统启动时运行"
 
 msgctxt "PrivoxyStartupDesc"
 msgid "Automatically run ${PRIVOXY_NAME} at startup."
 msgstr "自动在系统启动时运行 ${PRIVOXY_NAME}."
 
-msgctxt "VidaliaShortcuts"
-msgid "Add to Start Menu"
-msgstr "添加至开始菜单程序组"
-
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "安装 ${TOR_NAME} 文档."
-
-msgctxt "AppDataUninstDesc"
-msgid "Remove saved application data and configuration files."
-msgstr "Remove saved application data and configuration files."
-
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "添加 ${TOR_NAME} 至开始菜单程序组."
-
 #, fuzzy
 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 "安装 ${TORBUTTON_DESC}."
 
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr "Remove ${TORBUTTON_DESC}."
+
 msgctxt "TorbuttonAppDesc"
 msgid "Install ${TORBUTTON_DESC}."
 msgstr "安装 ${TORBUTTON_DESC}."
 
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
-msgstr "Remove ${TORBUTTON_DESC}."
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "添加至火狐(Firefox)浏览器"
 
-#, fuzzy
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
-msgstr "安装 ${PRIVOXY_DESC}."
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "添加 ${TORBUTTON_DESC} 扩展至火狐(Firefox)浏览器."
 
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "在系统启动时运行"
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "安装程序未检测到火狐(Firefox)浏览器,因此将停止添加 Torbutton 扩展."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application Data"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
+msgstr "Remove saved application data and configuration files."
+
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "zh-cn"
+
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""

Modified: vidalia/trunk/pkg/win32/zh_TW/vidalia_zh_TW.po
===================================================================
--- vidalia/trunk/pkg/win32/zh_TW/vidalia_zh_TW.po	2008-09-13 00:21:25 UTC (rev 3064)
+++ vidalia/trunk/pkg/win32/zh_TW/vidalia_zh_TW.po	2008-09-13 00:29:30 UTC (rev 3065)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Vidalia\n"
 "Report-Msgid-Bugs-To: translations@xxxxxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-07-17 02:33+0000\n"
+"POT-Creation-Date: 2008-07-12 05:29+0000\n"
 "PO-Revision-Date: 2008-07-17 03:22+0000\n"
 "Last-Translator: Matt <edmanm@xxxxxxxxxxxxxxxxxxx>\n"
 "Language-Team: translations@xxxxxxxxxxxxxxxxxxx\n"
@@ -12,180 +12,237 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgctxt "VidaliaShortcutsDesc"
-msgid "Add ${VIDALIA_NAME} to your Start menu."
-msgstr "添加 ${VIDALIA_NAME} 至開始菜單程式集."
-
-msgctxt "BundleWelcomeTitle"
-msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
-msgstr "歡迎使用 ${BUNDLE_NAME} 安裝精靈"
-
-msgctxt "PrivoxyStartup"
-msgid "Run At Startup"
-msgstr "在系統啟動時執行"
-
-msgctxt "LanguageCode"
-msgid "en"
-msgstr "zh_TW"
-
 msgctxt "BundleSetupCaption"
 msgid "${BUNDLE_NAME} setup"
 msgstr "${BUNDLE_NAME} 安裝精靈"
 
 #, fuzzy
-msgctxt "VidaliaAppDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "安裝 ${VIDALIA_DESC}."
+msgctxt "BundleWelcomeText"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, "
+"Privoxy, 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"
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups.\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, Privoxy, or Firefox, please "
+"make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
+msgstr ""
+"安裝精靈將會引導您安裝 Tor,Vidalia,Privoxy 和 Torbutton.\n"
+"\n"
+"如果您曾經安裝過 Tor,Vidalia,Privoxy 或 Firefox,請確保在執行此安裝精靈前這些"
+"程式未在執行中.\n"
+"\n"
+"$_CLICK"
 
-#, fuzzy
-msgctxt "VidaliaGroupDesc"
-msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
-msgstr "安裝 ${VIDALIA_DESC}."
+msgctxt "BundleWelcomeTitle"
+msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard"
+msgstr "歡迎使用 ${BUNDLE_NAME} 安裝精靈"
 
+msgctxt "BundleLinkText"
+msgid "${TOR_NAME} installation documentation"
+msgstr "${TOR_NAME} 安裝文檔"
+
 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 ""
 "安裝完成.\n"
-"請訪問 https://www.torproject.org/docs/tor-doc-windows 來獲取關於 Tor 的配置訊息.\n"
+"請訪問 https://www.torproject.org/docs/tor-doc-windows 來獲取關於 Tor 的配置"
+"訊息.\n"
 "\n"
 "如果選擇了安裝 Torbutton,您需要重新啟動火狐(Firefox)瀏覽器."
 
+msgctxt "BundleRunNow"
+msgid "Run installed components now"
+msgstr "現在執行已安裝組件"
+
 #, fuzzy
-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"
-msgstr "安裝精靈將會引導您安裝 Tor,Vidalia,Privoxy 和 Torbutton.\n\n如果您曾經安裝過 Tor,Vidalia,Privoxy 或 Firefox,請確保在執行此安裝精靈前這些程式未在執行中.\n\n$_CLICK"
+msgctxt "VidaliaGroupDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "安裝 ${VIDALIA_DESC}."
 
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
-msgstr "添加 ${PRIVOXY_NAME} 至開始菜單程式集."
+msgctxt "VidaliaUninstDesc"
+msgid "Remove ${VIDALIA_DESC}."
+msgstr "Remove ${VIDALIA_DESC}."
 
+msgctxt "VidaliaSetupCaption"
+msgid "${VIDALIA_NAME} setup"
+msgstr "${VIDALIA_NAME} 安裝嚮導"
+
 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"
-msgstr "安裝精靈將會引導您安裝 ${VIDALIA_DESC}.\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 ""
+"安裝精靈將會引導您安裝 ${VIDALIA_DESC}.\n"
+"\n"
+"$_CLICK"
 
-#, fuzzy
-msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
-msgstr "安裝 ${TOR_DESC}."
-
 msgctxt "VidaliaWelcomeTitle"
 msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard"
 msgstr "歡迎使用 ${VIDALIA_NAME} 安裝精靈"
 
-msgctxt "TorbuttonAddToFirefoxDesc"
-msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
-msgstr "添加 ${TORBUTTON_DESC} 擴展至火狐(Firefox)瀏覽器."
-
-msgctxt "TorUninstDesc"
-msgid "Remove ${TOR_DESC}."
-msgstr "Remove ${TOR_DESC}."
-
-msgctxt "TorbuttonFirefoxNotFound"
-msgid "Firefox was not found on your system. Not installing Torbutton."
-msgstr "安裝程序未檢測到火狐(Firefox)瀏覽器,因此將停止添加 Torbutton 擴展."
-
 msgctxt "VidaliaLinkText"
 msgid "${VIDALIA_NAME} homepage"
 msgstr "${VIDALIA_NAME} 主頁捷徑"
 
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
-msgstr "安裝 ${PRIVOXY_DESC}."
+#, fuzzy
+msgctxt "VidaliaAppDesc"
+msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor."
+msgstr "安裝 ${VIDALIA_DESC}."
 
-msgctxt "AppData"
-msgid "Application Data"
-msgstr "Application Data"
+msgctxt "VidaliaStartup"
+msgid "Run At Startup"
+msgstr "在系統啟動時執行"
 
-msgctxt "PrivoxyShortcuts"
+msgctxt "VidaliaStartupDesc"
+msgid "Automatically run ${VIDALIA_NAME} at startup."
+msgstr "自動在系統啟動時執行 ${VIDALIA_NAME}."
+
+msgctxt "VidaliaShortcuts"
 msgid "Add to Start Menu"
 msgstr "添加至開始菜單程式集"
 
-msgctxt "BundleLinkText"
-msgid "${TOR_NAME} installation documentation"
-msgstr "${TOR_NAME} 安裝文檔"
+msgctxt "VidaliaShortcutsDesc"
+msgid "Add ${VIDALIA_NAME} to your Start menu."
+msgstr "添加 ${VIDALIA_NAME} 至開始菜單程式集."
 
-msgctxt "TorbuttonAddToFirefox"
-msgid "Add to Firefox"
-msgstr "添加至火狐(Firefox)瀏覽器"
+msgctxt "VidaliaRunNow"
+msgid "Run ${VIDALIA_NAME}"
+msgstr "現在執行 ${VIDALIA_NAME}"
 
+#, fuzzy
+msgctxt "TorGroupDesc"
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
+msgstr "安裝 ${TOR_DESC}."
+
+msgctxt "TorUninstDesc"
+msgid "Remove ${TOR_DESC}."
+msgstr "Remove ${TOR_DESC}."
+
 msgctxt "TorAppDesc"
 msgid "Install ${TOR_DESC}."
 msgstr "安裝 ${TOR_DESC}."
 
-msgctxt "BundleRunNow"
-msgid "Run installed components now"
-msgstr "現在執行已安裝組件"
+msgctxt "TorAskOverwriteTorrc"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
+msgstr ""
+"安裝程式檢測到已存在的 Tor 配置檔案.$\n"
+"$\n"
+"是否要使用默認的配置檔案覆蓋它?"
 
-msgctxt "VidaliaSetupCaption"
-msgid "${VIDALIA_NAME} setup"
-msgstr "${VIDALIA_NAME} 安裝嚮導"
-
-msgctxt "VidaliaStartupDesc"
-msgid "Automatically run ${VIDALIA_NAME} at startup."
-msgstr "自動在系統啟動時執行 ${VIDALIA_NAME}."
-
 msgctxt "TorDocumentation"
 msgid "Documentation"
 msgstr "文檔"
 
-msgctxt "VidaliaUninstDesc"
-msgid "Remove ${VIDALIA_DESC}."
-msgstr "Remove ${VIDALIA_DESC}."
+msgctxt "TorDocumentationDesc"
+msgid "Install ${TOR_NAME} documentation."
+msgstr "安裝 ${TOR_NAME} 文檔."
 
+msgctxt "TorShortcuts"
+msgid "Add to Start Menu"
+msgstr "添加至開始菜單程式集"
+
+msgctxt "TorShortcutsDesc"
+msgid "Add ${TOR_NAME} to your Start menu."
+msgstr "添加 ${TOR_NAME} 至開始菜單程式集."
+
+#, fuzzy
+msgctxt "PrivoxyGroupDesc"
+msgid ""
+"Privoxy is a filtering web proxy that protects your privacy and helps remove "
+"ads, banners, and popups."
+msgstr "安裝 ${PRIVOXY_DESC}."
+
 msgctxt "PrivoxyUninstDesc"
 msgid "Remove ${PRIVOXY_DESC}."
 msgstr "Remove ${PRIVOXY_DESC}."
 
-msgctxt "TorShortcuts"
+msgctxt "PrivoxyAppDesc"
+msgid "Install ${PRIVOXY_DESC}."
+msgstr "安裝 ${PRIVOXY_DESC}."
+
+msgctxt "PrivoxyShortcuts"
 msgid "Add to Start Menu"
 msgstr "添加至開始菜單程式集"
 
-msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
-msgstr "安裝程式檢測到已存在的 Tor 配置檔案.$\n$\n是否要使用默認的配置檔案覆蓋它?"
+msgctxt "PrivoxyShortcutsDesc"
+msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgstr "添加 ${PRIVOXY_NAME} 至開始菜單程式集."
 
-msgctxt "VidaliaRunNow"
-msgid "Run ${VIDALIA_NAME}"
-msgstr "現在執行 ${VIDALIA_NAME}"
+msgctxt "PrivoxyStartup"
+msgid "Run At Startup"
+msgstr "在系統啟動時執行"
 
 msgctxt "PrivoxyStartupDesc"
 msgid "Automatically run ${PRIVOXY_NAME} at startup."
 msgstr "自動在系統啟動時執行 ${PRIVOXY_NAME}."
 
-msgctxt "VidaliaShortcuts"
-msgid "Add to Start Menu"
-msgstr "添加至開始菜單程式集"
-
-msgctxt "TorDocumentationDesc"
-msgid "Install ${TOR_NAME} documentation."
-msgstr "安裝 ${TOR_NAME} 文檔."
-
-msgctxt "AppDataUninstDesc"
-msgid "Remove saved application data and configuration files."
-msgstr ""
-
-msgctxt "TorShortcutsDesc"
-msgid "Add ${TOR_NAME} to your Start menu."
-msgstr "添加 ${TOR_NAME} 至開始菜單程式集."
-
 #, fuzzy
 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 "安裝 ${TORBUTTON_DESC}."
 
+msgctxt "TorbuttonUninstDesc"
+msgid "Remove ${TORBUTTON_DESC}."
+msgstr ""
+
 msgctxt "TorbuttonAppDesc"
 msgid "Install ${TORBUTTON_DESC}."
 msgstr "安裝 ${TORBUTTON_DESC}."
 
-msgctxt "TorbuttonUninstDesc"
-msgid "Remove ${TORBUTTON_DESC}."
+msgctxt "TorbuttonAddToFirefox"
+msgid "Add to Firefox"
+msgstr "添加至火狐(Firefox)瀏覽器"
+
+msgctxt "TorbuttonAddToFirefoxDesc"
+msgid "Add the ${TORBUTTON_DESC} extension to Firefox."
+msgstr "添加 ${TORBUTTON_DESC} 擴展至火狐(Firefox)瀏覽器."
+
+msgctxt "TorbuttonFirefoxNotFound"
+msgid "Firefox was not found on your system. Not installing Torbutton."
+msgstr "安裝程序未檢測到火狐(Firefox)瀏覽器,因此將停止添加 Torbutton 擴展."
+
+msgctxt "AppData"
+msgid "Application Data"
+msgstr "Application Data"
+
+msgctxt "AppDataUninstDesc"
+msgid "Remove saved application data and configuration files."
 msgstr ""
 
-#, fuzzy
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
-msgstr "安裝 ${PRIVOXY_DESC}."
+msgctxt "LanguageCode"
+msgid "en"
+msgstr "zh_TW"
 
-msgctxt "VidaliaStartup"
-msgid "Run At Startup"
-msgstr "在系統啟動時執行"
+msgctxt "FirefoxWarningPageTitle"
+msgid "Firefox is not installed"
+msgstr ""
+
+msgctxt "FirefoxWarningPageSubtitle"
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
+msgstr ""
Prev by Author: [vidalia-svn] r3064: Add the title and subtitle of the Firefox warning page to th (vidalia/trunk/pkg/win32/templates)
Next by Author: [vidalia-svn] r3066: Get rid of some '\r's that msgmerge didn't like. (in vidalia/trunk/pkg/win32: es fi sv)
Previous by thread: [vidalia-svn] r3064: Add the title and subtitle of the Firefox warning page to th (vidalia/trunk/pkg/win32/templates)
Next by thread: [vidalia-svn] r3066: Get rid of some '\r's that msgmerge didn't like. (in vidalia/trunk/pkg/win32: es fi sv)
Index(es):
- Author
- Thread