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

[vidalia-svn] r4367: Don't let the diff fool you; I really only added three sente (vidalia/trunk/src/vidalia/help/content/i18n/templates)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r4367: Don't let the diff fool you; I really only added three sente (vidalia/trunk/src/vidalia/help/content/i18n/templates)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Tue, 3 Aug 2010 15:49:10 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Tue, 03 Aug 2010 15:49:19 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx

Author: edmanm
Date: 2010-08-03 15:49:10 -0400 (Tue, 03 Aug 2010)
New Revision: 4367

Modified:
   vidalia/trunk/src/vidalia/help/content/i18n/templates/troubleshooting.pot
Log:

Don't let the diff fool you; I really only added three sentences to the
HTML.


Modified: vidalia/trunk/src/vidalia/help/content/i18n/templates/troubleshooting.pot
===================================================================
--- vidalia/trunk/src/vidalia/help/content/i18n/templates/troubleshooting.pot	2010-08-03 18:21:39 UTC (rev 4366)
+++ vidalia/trunk/src/vidalia/help/content/i18n/templates/troubleshooting.pot	2010-08-03 19:49:10 UTC (rev 4367)
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-26 17:01+0200\n"
+"POT-Creation-Date: 2010-08-03 15:49-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -22,12 +22,12 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit"
 
-#. type: Content of: <html><body><h1>
+# type: Content of: <html><body><h1>
 #: en/troubleshooting.html:16
 msgid "Troubleshooting"
 msgstr ""
 
-#. type: Content of: <html><body>
+# type: Content of: <html><body>
 #: en/troubleshooting.html:19
 msgid ""
 "Listed below are some of the common problems or questions people have while "
@@ -36,12 +36,12 @@
 "support and information.  <a name=\"start\"/>"
 msgstr ""
 
-#. type: Content of: <html><body><h3>
+# type: Content of: <html><body><h3>
 #: en/troubleshooting.html:25
 msgid "I Can't Start Tor"
 msgstr ""
 
-#. type: Content of: <html><body><p>
+# type: Content of: <html><body><p>
 #: en/troubleshooting.html:27
 msgid ""
 "The most likely reason that Vidalia could not start Tor is because Vidalia "
@@ -50,7 +50,7 @@
 "the <a href=\"config.html#general\">general configuration settings</a>."
 msgstr ""
 
-#. type: Content of: <html><body><p>
+# type: Content of: <html><body><p>
 #: en/troubleshooting.html:33
 msgid ""
 "Another possible reason that Tor cannot start is because there is already "
@@ -58,7 +58,7 @@
 "previous Tor process, if you find one. Then, try running Tor again."
 msgstr ""
 
-#. type: Content of: <html><body><p>
+# type: Content of: <html><body><p>
 #: en/troubleshooting.html:38
 msgid ""
 "If that did not help, check your <a href=\"log.html\">message log</a> to see "
@@ -66,22 +66,22 @@
 "start."
 msgstr ""
 
-#. type: Content of: <html><body>
+# type: Content of: <html><body>
 #: en/troubleshooting.html:43
 msgid "<a name=\"connect\"/>"
 msgstr ""
 
-#. type: Content of: <html><body><h3>
+# type: Content of: <html><body><h3>
 #: en/troubleshooting.html:44
 msgid "Vidalia Can't Connect to Tor"
 msgstr ""
 
-#. type: Content of: <html><body><p>
+# type: Content of: <html><body><p>
 #: en/troubleshooting.html:46
 msgid "Vidalia manages Tor by communicating with it via Tor's <i>control port</i>."
 msgstr ""
 
-#. type: Content of: <html><body><p>
+# type: Content of: <html><body><p>
 #: en/troubleshooting.html:49
 msgid ""
 "The most common reason that Vidalia cannot connect to Tor is because Tor "
@@ -90,7 +90,7 @@
 "while it started."
 msgstr ""
 
-#. type: Content of: <html><body><p>
+# type: Content of: <html><body><p>
 #: en/troubleshooting.html:55
 msgid ""
 "If Tor is listening on a different port than Vidalia expects, Vidalia will "
@@ -101,17 +101,17 @@
 "settings</a>."
 msgstr ""
 
-#. type: Content of: <html><body>
+# type: Content of: <html><body>
 #: en/troubleshooting.html:63
 msgid "<a name=\"password\"/>"
 msgstr ""
 
-#. type: Content of: <html><body><h3>
+# type: Content of: <html><body><h3>
 #: en/troubleshooting.html:64
 msgid "Why is Vidalia asking me for a \"control password\"?"
 msgstr ""
 
-#. type: Content of: <html><body><p>
+# type: Content of: <html><body><p>
 #: en/troubleshooting.html:66
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
@@ -122,32 +122,41 @@
 "compromising your anonymity."
 msgstr ""
 
-#. type: Content of: <html><body><p>
+# type: Content of: <html><body><p>
 #: en/troubleshooting.html:75
 msgid ""
 "Usually this process of generating and setting a random control password "
-"happens in the background. There are two common situations, though, where "
+"happens in the background. There are three common situations, though, where "
 "Vidalia may prompt you for a password:"
 msgstr ""
 
-#. type: Content of: <html><body><ul><li><p>
+# type: Content of: <html><body><ul><li>
 #: en/troubleshooting.html:82
 msgid ""
+"You're already running Vidalia and Tor. For example, this situation can "
+"happen if you installed the Vidalia bundle and now you're trying to run the "
+"Tor Browser Bundle. In that case, you'll need to close the old Vidalia and "
+"Tor before you can run this one."
+msgstr ""
+
+# type: Content of: <html><body><ul><li><p>
+#: en/troubleshooting.html:89
+msgid ""
 "Vidalia crashed, but left Tor running with the last known random "
 "password. After you restart Vidalia, it generates a new random password, but "
 "Vidalia can't talk to Tor, because the random passwords are different."
 msgstr ""
 
-#. type: Content of: <html><body><ul><li><p>
-#: en/troubleshooting.html:87
+# type: Content of: <html><body><ul><li><p>
+#: en/troubleshooting.html:94
 msgid ""
 "If the dialog that prompts you for a control password has a <i>Reset</i> "
 "button, you can click the button and Vidalia will restart Tor with a new "
 "random control password."
 msgstr ""
 
-#. type: Content of: <html><body><ul><li><p>
-#: en/troubleshooting.html:92
+# type: Content of: <html><body><ul><li><p>
+#: en/troubleshooting.html:99
 msgid ""
 "If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart "
 "Tor for you, you can still fix the problem manually. Simply go into your "
@@ -155,8 +164,8 @@
 "restart Tor and all will work again."
 msgstr ""
 
-#. type: Content of: <html><body><ul><li><p>
-#: en/troubleshooting.html:99
+# type: Content of: <html><body><ul><li><p>
+#: en/troubleshooting.html:106
 msgid ""
 "You had previously set Tor to run as a service. When Tor is set to run as a "
 "service, it starts up when the system boots. If you configured Tor to start "
@@ -167,8 +176,8 @@
 "the saved password in the Tor service."
 msgstr ""
 
-#. type: Content of: <html><body><ul><li><p>
-#: en/troubleshooting.html:107
+# type: Content of: <html><body><ul><li><p>
+#: en/troubleshooting.html:114
 msgid ""
 "You need to reconfigure Tor to not be a service. See the Tor wiki page on "
 "running <a "
@@ -176,18 +185,18 @@
 "Tor as a service</a> for more information on how to remove the Tor service."
 msgstr ""
 
-#. type: Content of: <html><body>
-#: en/troubleshooting.html:115
+# type: Content of: <html><body>
+#: en/troubleshooting.html:122
 msgid "<a name=\"torexited\"/>"
 msgstr ""
 
-#. type: Content of: <html><body><h3>
-#: en/troubleshooting.html:116
+# type: Content of: <html><body><h3>
+#: en/troubleshooting.html:123
 msgid "Tor Exited Unexpectedly"
 msgstr ""
 
-#. type: Content of: <html><body><p>
-#: en/troubleshooting.html:118
+# type: Content of: <html><body><p>
+#: en/troubleshooting.html:125
 msgid ""
 "If Tor exits immediately after trying to start, you most likely have another "
 "Tor process already running. Check the <a href=\"log.html\">message log</a> "
@@ -195,8 +204,8 @@
 "and contain a message similar to the following:"
 msgstr ""
 
-#. type: Content of: <html><body><pre>
-#: en/troubleshooting.html:124
+# type: Content of: <html><body><pre>
+#: en/troubleshooting.html:131
 #, no-wrap
 msgid ""
 "connection_create_listener(): Could not bind to 127.0.0.1:9050: Address "
@@ -204,8 +213,8 @@
 "Is Tor already running?\n"
 msgstr ""
 
-#. type: Content of: <html><body><p>
-#: en/troubleshooting.html:128
+# type: Content of: <html><body><p>
+#: en/troubleshooting.html:135
 msgid ""
 "If you find an error message like the one above, you will need to stop the "
 "other Tor process before starting a new one with Vidalia. On Windows, you "
@@ -214,8 +223,8 @@
 "process."
 msgstr ""
 
-#. type: Content of: <html><body><p>
-#: en/troubleshooting.html:134
+# type: Content of: <html><body><p>
+#: en/troubleshooting.html:141
 msgid ""
 "If Tor had been running successfully for awhile (that is, longer than a few "
 "seconds), then you should check the <a href=\"log.html\">message log</a> for "
@@ -223,18 +232,18 @@
 "will be highlighted in either red or yellow."
 msgstr ""
 
-#. type: Content of: <html><body>
-#: en/troubleshooting.html:140
+# type: Content of: <html><body>
+#: en/troubleshooting.html:147
 msgid "<a name=\"stop\"/>"
 msgstr ""
 
-#. type: Content of: <html><body><h3>
-#: en/troubleshooting.html:141
+# type: Content of: <html><body><h3>
+#: en/troubleshooting.html:148
 msgid "Vidalia Can't Stop Tor"
 msgstr ""
 
-#. type: Content of: <html><body><p>
-#: en/troubleshooting.html:143
+# type: Content of: <html><body><p>
+#: en/troubleshooting.html:150
 msgid ""
 "If Vidalia cannot stop Tor, you should check your <a "
 "href=\"log.html\">message log</a> to see if Tor reported any errors while "

Prev by Author: [vidalia-svn] r4366: Steal arma's additional text from http://archives.seul.org/o (vidalia/trunk/src/vidalia/help/content/en)
Next by Author: [vidalia-svn] r4372: Add some CMake magic for searching for local MaxMind GeoIP l (in vidalia/trunk: . cmake)
Previous by thread: [vidalia-svn] r4366: Steal arma's additional text from http://archives.seul.org/o (vidalia/trunk/src/vidalia/help/content/en)
Next by thread: [vidalia-svn] r4370: renamed one file (vidalia/trunk/pkg/win32/et)
Index(es):
- Author
- Thread