commit 298acf26d0fdb323caf44355b332e1c2144f60ac
Author: Lunar <lu...@torproject.org>
Date: Wed May 28 14:44:00 2014 +0200
Restore compatibility with yelp-tools 3.4
Unfortunately, this requires us to add a en-US lingua (because
we can't create a C directory without breaking out-of-tree builds).
---
Makefile.am | 14 +-
en-US/en-US.po | 451 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 460 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9f11906..a45aac7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,16 +9,20 @@ HELP_ID = tor-browser-user-manual
HELP_FILES = $(shell cd $(srcdir)/C && git ls-files '*.page')
HELP_MEDIA = $(shell cd $(srcdir)/C && git ls-files 'media')
HELP_PLATFORMS = windows macosx linux
-HELP_LINGUAS = @TOR_BROWSER_BUNDLE_LOCALES@
+HELP_LINGUAS = en-US @TOR_BROWSER_BUNDLE_LOCALES@
.PHONY: html
html: all media-symlinks.stamp
set -e && \
- for lc in C $(HELP_LINGUAS); do \
+ for lc in $(HELP_LINGUAS); do \
+ includes="$$(find include -maxdepth 1 -type f)" ; \
+ for file in $$includes; do \
+ mkdir -p $$(dirname $$file); \
+ ln -nsf ../$$file $$lc/$$(basename $$file); \
+ done; \
for platform in $(HELP_PLATFORMS); do \
mkdir -p html/$$platform/$$lc; \
- yelp-build html -p include \
- -x
$(srcdir)/platform-$$platform.xslt \
+ yelp-build html -x
$(srcdir)/platform-$$platform.xslt \
-o html/$$platform/$$lc $$lc; \
for ttf in $$lc/media/*.ttf; do \
cp --preserve=timestamps $$ttf
html/$$platform/$$lc/media; \
@@ -29,7 +33,7 @@ html: all media-symlinks.stamp
.PHONY: pdf
pdf: all media-symlinks.stamp
set -e && \
- for lc in C $(HELP_LINGUAS); do \
+ for lc in $(HELP_LINGUAS); do \
for platform in $(HELP_PLATFORMS); do \
PDF_DIR=pdf/$$platform/$$lc; \
LATEX_FILE=$(HELP_ID)-$$lc.latex; \
diff --git a/en-US/en-US.po b/en-US/en-US.po
new file mode 100644
index 0000000..12ef3eb
--- /dev/null
+++ b/en-US/en-US.po
@@ -0,0 +1,451 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-05-27 18:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <l...@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/bridges.page:143(media)
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png'
md5='93365c2aa3fb4d627497e83f28a39b7e'"
+msgstr ""
+
+#: C/bridges.page:7(info/desc)
+msgid "What bridges are and how to use them."
+msgstr ""
+
+#: C/bridges.page:11(page/title)
+msgid "Bridges"
+msgstr ""
+
+#: C/bridges.page:13(page/p)
+msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they
are run by volunteers. Unlike relays, they are not listed publicly. Using
bridges disguise the fact that one is using Tor."
+msgstr ""
+
+#: C/bridges.page:19(page/p)
+msgid "Currently there are five bridge types, or transports, available. More
are being developed."
+msgstr ""
+
+#: C/bridges.page:26(td/p)
+msgid "ORPort"
+msgstr ""
+
+#: C/bridges.page:31(td/p)
+msgid "Requesting 'bridges' without specifying the bridge type, will return
ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable
for circumventing censorship or national firewalls. ORPort bridges can be
useful as trusted entry points into the Tor network."
+msgstr ""
+
+#: C/bridges.page:41(td/p)
+msgid "obfs2"
+msgstr ""
+
+#: C/bridges.page:46(td/p)
+msgid "Censors have learned how to identify obfs2 bridges. This transport is
being deprecated."
+msgstr ""
+
+#: C/bridges.page:54(td/p)
+msgid "obfs3"
+msgstr ""
+
+#: C/bridges.page:59(td/p)
+msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work
almost everywhere. A few obfs3 bridges have been blocked."
+msgstr ""
+
+#: C/bridges.page:67(td/p)
+msgid "Scramblesuit"
+msgstr ""
+
+#: C/bridges.page:72(td/p)
+msgid "Scramblesuit is an additional tool for the obfsproxy transport.
Scramblesuit bridges are designed to be hard to identify and hard to block."
+msgstr ""
+
+#: C/bridges.page:81(td/p)
+msgid "FTE"
+msgstr ""
+
+#: C/bridges.page:86(td/p)
+msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP)
traffic or other types of internet traffic. FTE bridges are effective, but in
limited supply."
+msgstr ""
+
+#: C/bridges.page:95(page/p)
+msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on
bridges.)"
+msgstr ""
+
+#: C/bridges.page:99(page/p)
+msgid "There are four ways to get a bridge."
+msgstr ""
+
+#: C/bridges.page:105(item/p)
+msgid "Visit <link
href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link>
and follow the instructions."
+msgstr ""
+
+#: C/bridges.page:110(item/p)
+msgid "Email brid...@bridges.torproject.org from a gmail or yahoo email
address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or
<cmd>transport=obfs3</cmd> for obfs3 bridges."
+msgstr ""
+
+#: C/bridges.page:117(item/p)
+msgid "Politely ask a human at h...@rt.torproject.org if you cannot access
either of the first two methods."
+msgstr ""
+
+#: C/bridges.page:123(item/p)
+msgid "Install and configure a Tor instance to be bridge for yourself. The
computer acting as a bridge must have uncensored internet access to the Tor
network. A full installation guide can be found at <link
href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+msgstr ""
+
+#: C/bridges.page:132(page/p)
+msgid "Enter the bridge information you get from any of the above steps in
Tor-launcher."
+msgstr ""
+
+#: C/bridges.page:137(page/p)
+msgid "Choose yes when asked if your Internet Service Provider blocks
connections to the Tor network. Select 'Use custom bridges' and enter each
bridge identifier on its own line."
+msgstr ""
+
+#: C/bridges.page:145(page/p)
+msgid "Click Connect. Using bridges slow down the connection. If the
connection fails, the bridges you received may be down. Get more and try again."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/circumvention.page:20(media)
+msgctxt "_"
+msgid "external ref='media/tor-launcher-configure_en-US.png'
md5='966f4bafcb829e59b2b84d08144d885e'"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/circumvention.page:27(media)
+msgctxt "_"
+msgid "external ref='media/tor-launcher-wizard_en-US.png'
md5='21f80fc3f4e34359bfdc44684d7da09d'"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/circumvention.page:35(media)
+msgctxt "_"
+msgid "external ref='media/tor-launcher-provided-bridges_en-US.png'
md5='70524dccb698a21bb1d20223461e3272'"
+msgstr ""
+
+#: C/circumvention.page:7(info/desc)
+msgid "What to do if the Tor network is blocked."
+msgstr ""
+
+#: C/circumvention.page:11(page/title)
+msgid "Circumvention"
+msgstr ""
+
+#: C/circumvention.page:13(page/p)
+msgid "Some firewalls can detect and block connections to Tor. The Tor Browser
includes some circumvention tools for getting around blocking firewalls. These
circumvention tools are called Pluggable Transports. To turn them on, click
\"Configure\" in the Tor launcher window."
+msgstr ""
+
+#: C/circumvention.page:22(page/p)
+msgid "Select yes when asked if your internet service provider blocks
connections to Tor.\""
+msgstr ""
+
+#: C/circumvention.page:29(page/p)
+msgid "Select \"Connect with provided bridges\". Tor Browser has three
Pluggable Transports to choose from. If one fails to get you online, try
selecting a different transport."
+msgstr ""
+
+#: C/circumvention.page:37(page/p)
+msgid "If you try all three transports, and none of them get you online,
select \"Enter custom bridges\", and enter bridges manually. Read the <link
xref=\"bridges\">Getting Bridges</link> section for instructions on getting
custom bridges."
+msgstr ""
+
+#: C/index.page:6(page/title)
+msgid "Tor Browser User Manual"
+msgstr ""
+
+#. <span/> will be replaced by current Tor Browser version
+#: C/index.page:7(page/p)
+msgid "Version: <_:span-1/>"
+msgstr ""
+
+#: C/known-issues.page:7(info/desc)
+msgid "A list of known issues."
+msgstr ""
+
+#: C/known-issues.page:11(page/title)
+msgid "Known Issues"
+msgstr ""
+
+#: C/known-issues.page:15(item/p)
+msgid "Tor needs your system clock (and your time zone) set to the correct
time."
+msgstr ""
+
+#: C/known-issues.page:20(item/p)
+msgid "The following firewall software have been known to interfere with Tor
and may need to be temporarily disabled:"
+msgstr ""
+
+#: C/known-issues.page:24(item/p)
+msgid "Webroot SecureAnywhere"
+msgstr ""
+
+#: C/known-issues.page:27(item/p)
+msgid "Kaspersky Internet Security 2012"
+msgstr ""
+
+#: C/known-issues.page:30(item/p)
+msgid "Sophos Antivirus for Mac"
+msgstr ""
+
+#: C/known-issues.page:33(item/p)
+msgid "Microsoft Security Essentials"
+msgstr ""
+
+#: C/known-issues.page:38(item/p)
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for
security reasons. Most YouTube videos can be played with HTML5 by visiting the
video's \"Embed\" â \"Share\" link."
+msgstr ""
+
+#: C/known-issues.page:45(item/p)
+msgid "Tor can not use a bridge if a proxy is set."
+msgstr ""
+
+#: C/known-issues.page:50(item/p)
+msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is
to ensure that each software build is exactly reproducible."
+msgstr ""
+
+#: C/known-issues.page:56(item/p)
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script.
Open \"Files\" (Unity's explorer), open Preferences â Behavior Tab â Set
\"Run executable text files when they are opened\" to \"Ask every time\", then
OK. Tor Browser can also be started from the command line by running"
+msgstr ""
+
+#: C/known-issues.page:62(item/code)
+#, no-wrap
+msgid ""
+"\n"
+" ./start-tor-browser\n"
+" "
+msgstr ""
+
+#: C/known-issues.page:65(item/p)
+msgid "from inside the Tor Browser directory."
+msgstr ""
+
+#: C/known-issues.page:70(page/p)
+msgid "If you have an issue with Tor Browser that isn't on this list, feel
free to email h...@rt.torproject.org."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/tor.page:120(media)
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png'
md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgstr ""
+
+#: C/tor.page:9(info/desc)
+msgid "Learn what Tor can do to protect your privacy and anonymity."
+msgstr ""
+
+#: C/tor.page:12(page/title)
+msgid "Tor"
+msgstr ""
+
+#: C/tor.page:15(section/title)
+msgid "What Tor will do"
+msgstr ""
+
+#: C/tor.page:17(section/p)
+msgid "The <_:app-1/> uses the <_:app-2/> network to protect your privacy and
anonymity. Using the <_:app-3/> network has two main properties:"
+msgstr ""
+
+#: C/tor.page:26(item/p)
+msgid "The Internet access provider will not be able to learn the sites being
visited and will not be able to monitor the content of the communication."
+msgstr ""
+
+#: C/tor.page:33(item/p)
+msgid "The sites will see a connection coming from the <_:app-1/> network and
will not learn the actual Internet connection used to visit them."
+msgstr ""
+
+#: C/tor.page:41(section/p)
+msgid "On top of that, the <_:app-1/> is designed to minimize the ability of
websites to fingerprint the browser."
+msgstr ""
+
+#: C/tor.page:45(section/p)
+msgid "The Tor Browser does not keep any browsing history. <em>Cookies</em>
are only valid for a single session: until the <_:app-1/> is exited or a
<gui>New Identity</gui> is requested."
+msgstr ""
+
+#: C/tor.page:57(section/title)
+msgid "What Tor will <em>not</em> do"
+msgstr ""
+
+#: C/tor.page:59(section/p)
+msgid "<_:app-1/> and the <_:app-2/> will protect your privacy and anonymity
only if used appropriately."
+msgstr ""
+
+#: C/tor.page:67(item/p)
+msgid "<_:app-1/> will not encrypt the whole communication. What is sent to
the <_:app-2/> network is what leaves the <_:app-3/> network. For web browsing,
this means that any confidential information should be sent using the HTTPS
protocol."
+msgstr ""
+
+#: C/tor.page:79(item/p)
+msgid "If you give a website identifying information (e.g. a name, a
<em>login</em>), you will no longer be an anonymous visitor of this website."
+msgstr ""
+
+#: C/tor.page:86(item/p)
+msgid "If you transfer files, they can contain identifying information in
their metadata, like the camera serial number."
+msgstr ""
+
+#: C/tor.page:92(item/p)
+msgid "Only connections made through the <_:app-1/> will go through the
<_:app-2/> network. Unless specific steps are taken, other applications on your
computer will continue to do direct Internet connections and can reveal your
location."
+msgstr ""
+
+#: C/tor.page:104(section/p)
+msgid "If loosing control over some information might have problematic
consequences, it is sometimes better to leave it off computers entirely."
+msgstr ""
+
+#: C/tor.page:111(section/title)
+msgid "How Tor works"
+msgstr ""
+
+#: C/tor.page:113(section/p)
+msgid "Tor is a network of virtual tunnels that allows you to improve your
privacy and security on the Internet. Tor works by sending your traffic through
three random servers (also known as <em>relays</em>) in the Tor network, before
the traffic is sent out onto the public Internet"
+msgstr ""
+
+#: C/tor.page:121(section/p)
+msgid "The image above illustrates a user browsing to different websites over
Tor. The green monitors represent relays in the Tor network, while the three
keys represent the layers of encryption between the user and each relay."
+msgstr ""
+
+#: C/tor.page:130(section/title)
+msgid "Tor and HTTPS"
+msgstr ""
+
+#: C/tor.page:132(section/p)
+msgid "The following visualization helps understanding what data are visible
to eavesdroppers with or without the <_:app-1/> and when encrypted connections
(HTTPS) or not:"
+msgstr ""
+
+#: C/tor.page:142(item/p)
+msgid "Click the <gui>Tor</gui> button to see what data is visible to
eavesdroppers when you're using Tor. The button will turn green to indicate
that Tor is on."
+msgstr ""
+
+#: C/tor.page:149(item/p)
+msgid "Click the <gui>HTTPS</gui> button to see what data is visible to
eavesdroppers when you're using HTTPS. The button will turn green to indicate
that HTTPS is on."
+msgstr ""
+
+#: C/tor.page:156(item/p)
+msgid "When both buttons are green, you see the data that is visible to
eavesdroppers when you are using both tools."
+msgstr ""
+
+#: C/tor.page:162(item/p)
+msgid "When both buttons are grey, you see the data that is visible to
eavesdroppers when you don't use either tool."
+msgstr ""
+
+#: C/tor.page:169(terms/title)
+msgid "Potentially visible data"
+msgstr ""
+
+#: C/tor.page:177(item/p)
+msgid "The site being visited."
+msgstr ""
+
+#: C/tor.page:188(item/p)
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: C/tor.page:199(item/p)
+msgid "Data being transmited."
+msgstr ""
+
+#: C/tor.page:210(item/p)
+msgid "Network location of the computer used to visit the website (the public
IP address)."
+msgstr ""
+
+#: C/tor.page:222(item/p)
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/troubleshooting.page:18(media)
+msgctxt "_"
+msgid "external ref='media/tor-launcher-connect_en-US.png'
md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgstr ""
+
+#: C/troubleshooting.page:7(info/desc)
+msgid "What to do if Tor Browser doesn't work."
+msgstr ""
+
+#: C/troubleshooting.page:11(page/title)
+msgid "Troubleshooting"
+msgstr ""
+
+#: C/troubleshooting.page:13(page/p)
+msgid "The Tor Browser should get you online automatically after clicking the
\"Connect\" button on the start up screen."
+msgstr ""
+
+#: C/troubleshooting.page:20(page/p)
+msgid "If it doesn't connect, there may be a simple fix. Try each of the
following:"
+msgstr ""
+
+#: C/troubleshooting.page:26(item/p)
+msgid "Make sure another Tor Browser is not already running. If you're not
sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: C/troubleshooting.page:30(item/p)
+msgid "'Allow' Tor in your antivirus program."
+msgstr ""
+
+#: C/troubleshooting.page:33(item/p)
+msgid "Temporarily disable your firewall."
+msgstr ""
+
+#: C/troubleshooting.page:36(item/p)
+msgid "Delete Tor Browser and install it again. If updating, do not overwrite
your previous Tor Browser files."
+msgstr ""
+
+#: C/troubleshooting.page:41(page/p)
+msgid "If you still can't connect, your internet service provider might be
censoring connections to Tor. Follow the instructions in the <link
xref=\"circumvention\">Circumvention</link> section."
+msgstr ""
+
+#: C/troubleshooting.page:47(page/p)
+msgid "If the above steps do not address your problem, email
h...@rt.torproject.org with your operating system, the details of your problem,
and what you've already tried."
+msgstr ""
+
+#: C/uninstalling.page:7(info/desc)
+msgid "How to remove Tor Browser from your system."
+msgstr ""
+
+#: C/uninstalling.page:11(page/title)
+msgid "Uninstalling"
+msgstr ""
+
+#: C/uninstalling.page:13(page/p)
+msgid "The Tor Browser does not affect any of the existing software or
settings on your computer. Uninstalling Tor Browser will not affect your
system's software or settings either."
+msgstr ""
+
+#: C/uninstalling.page:19(page/p)
+msgid "Removing the Tor Browser from your system is simple:"
+msgstr ""
+
+#: C/uninstalling.page:25(item/p)
+msgid "Locate your Tor Browser folder. The default location is your Desktop."
+msgstr ""
+
+#: C/uninstalling.page:28(item/p)
+msgid "Delete the Tor Browser folder."
+msgstr ""
+
+#: C/uninstalling.page:31(item/p)
+msgid "Empty your Trash"
+msgstr ""
+
+#: C/uninstalling.page:35(page/p)
+msgid "Note that your operating system's standard \"Uninstall\" utility is not
used."
+msgstr ""
+
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
