commit bd4e94b1c5df2fcb863ef50ec7db651a41c860a3
Author: Christian Fromme <kaner(a)strace.org>
Date: Sat Jan 19 13:41:31 2013 +0100
Update .pot file to reflect newest changes in documentation
---
i18n/templates/gettor.pot | 169 +++++++++++++++++++++++++++++----------------
1 files changed, 109 insertions(+), 60 deletions(-)
diff --git a/i18n/templates/gettor.pot b/i18n/templates/gettor.pot
index 79bff5a..bbad440 100644
--- a/i18n/templates/gettor.pot
+++ b/i18n/templates/gettor.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-13 22:01+0100\n"
+"POT-Creation-Date: 2013-01-19 13:40+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -46,7 +46,7 @@ msgid ""
"and then we'll ignore this email address for the next day or so.)"
msgstr ""
-#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135
msgid ""
"If you have any questions or it doesn't work, you can contact a\n"
"human at this support email address: help(a)rt.torproject.org"
@@ -62,22 +62,27 @@ msgid ""
" macos-ppc\n"
" linux-i386\n"
" linux-x86_64\n"
+" obfs-windows\n"
+" obfs-macos-i386\n"
+" obfs-macos-x86_64\n"
+" obfs-linux-i386\n"
+" obfs-linux-x86_64\n"
" source"
msgstr ""
-#: lib/gettor/i18n.py:56
+#: lib/gettor/i18n.py:61
msgid ""
"Please reply to this mail, and tell me a single package name anywhere \n"
"in the body of your email."
msgstr ""
-#: lib/gettor/i18n.py:59
+#: lib/gettor/i18n.py:64
msgid ""
"OBTAINING LOCALIZED VERSIONS OF TOR\n"
"==================================="
msgstr ""
-#: lib/gettor/i18n.py:62
+#: lib/gettor/i18n.py:67
msgid ""
"To get a version of Tor translated into your language, specify the\n"
"language you want in the address you send the mail to:\n"
@@ -85,22 +90,22 @@ msgid ""
" gettor+fa(a)torproject.org"
msgstr ""
-#: lib/gettor/i18n.py:67
+#: lib/gettor/i18n.py:72
msgid ""
"This example will give you the requested package in a localized\n"
"version for Farsi (Persian). Check below for a list of supported language\n"
"codes. "
msgstr ""
-#: lib/gettor/i18n.py:71
+#: lib/gettor/i18n.py:76
msgid " List of supported locales:"
msgstr ""
-#: lib/gettor/i18n.py:73
+#: lib/gettor/i18n.py:78
msgid "Here is a list of all available languages:"
msgstr ""
-#: lib/gettor/i18n.py:75
+#: lib/gettor/i18n.py:80
msgid ""
" gettor+ar(a)torproject.org: Arabic\n"
" gettor+de(a)torproject.org: German\n"
@@ -115,24 +120,24 @@ msgid ""
" gettor+zh(a)torproject.org: Chinese"
msgstr ""
-#: lib/gettor/i18n.py:87
+#: lib/gettor/i18n.py:92
msgid "If you select no language, you will receive the English version."
msgstr ""
-#: lib/gettor/i18n.py:89
+#: lib/gettor/i18n.py:94
msgid ""
"SMALLER SIZED PACKAGES\n"
"======================"
msgstr ""
-#: lib/gettor/i18n.py:92
+#: lib/gettor/i18n.py:97
msgid ""
"If your bandwith is low or your provider doesn't allow you to\n"
"receive large attachments in your email, GetTor can send you several\n"
"small packages instead of one big one."
msgstr ""
-#: lib/gettor/i18n.py:96
+#: lib/gettor/i18n.py:101
msgid ""
"Simply include the keyword 'split' in a new line on its own (this part\n"
"is important!) like so: \n"
@@ -141,66 +146,66 @@ msgid ""
" split"
msgstr ""
-#: lib/gettor/i18n.py:102
+#: lib/gettor/i18n.py:107
msgid ""
"Sending this text in an email to GetTor will cause it to send you \n"
"the Tor Browser Bundle in a number of 1,4MB attachments."
msgstr ""
-#: lib/gettor/i18n.py:105
+#: lib/gettor/i18n.py:110
msgid ""
"After having received all parts, you need to re-assemble them to \n"
"one package again. This is done as follows:"
msgstr ""
-#: lib/gettor/i18n.py:108
+#: lib/gettor/i18n.py:113
msgid "1.) Save all received attachments into one folder on your disk."
msgstr ""
-#: lib/gettor/i18n.py:110
+#: lib/gettor/i18n.py:115
msgid ""
"2.) Unzip all files ending in \".z\". If you saved all attachments to\n"
"a fresh folder before, simply unzip all files in that folder. If you don't\n"
"know how to unzip the .z files, please see the UNPACKING THE FILES section."
msgstr ""
-#: lib/gettor/i18n.py:114
+#: lib/gettor/i18n.py:119
msgid ""
"3.) Verify all files as described in the mail you received with \n"
"each package. (gpg --verify)"
msgstr ""
-#: lib/gettor/i18n.py:117
+#: lib/gettor/i18n.py:122
msgid ""
"4.) Now unpack the multi-volume archive into one file by double-\n"
"clicking the file ending in \"..split.part01.exe\". This should start the \n"
"process automatically."
msgstr ""
-#: lib/gettor/i18n.py:121
+#: lib/gettor/i18n.py:126
msgid ""
"5.) After unpacking is finished, you should find a newly created \n"
"\".exe\" file in your destination folder. Simply doubleclick\n"
"that and Tor Browser Bundle should start within a few seconds."
msgstr ""
-#: lib/gettor/i18n.py:125
+#: lib/gettor/i18n.py:130
msgid "6.) That's it. You're done. Thanks for using Tor and have fun!"
msgstr ""
-#: lib/gettor/i18n.py:127
+#: lib/gettor/i18n.py:132
msgid ""
"SUPPORT\n"
"======="
msgstr ""
-#: lib/gettor/i18n.py:133
+#: lib/gettor/i18n.py:138
msgid ""
"Here's your requested software as a zip file. Please unzip the\n"
"package and verify the signature."
msgstr ""
-#: lib/gettor/i18n.py:136
+#: lib/gettor/i18n.py:141
msgid ""
"VERIFY SIGNATURE\n"
"================\n"
@@ -211,14 +216,14 @@ msgid ""
"exe"
msgstr ""
-#: lib/gettor/i18n.py:143
+#: lib/gettor/i18n.py:148
msgid ""
"The output should look somewhat like this:\n"
"\n"
" gpg: Good signature from 'Erinn Clark <...>'"
msgstr ""
-#: lib/gettor/i18n.py:147
+#: lib/gettor/i18n.py:152
msgid ""
"If you're not familiar with commandline tools, try looking for\n"
"a graphical user interface for GnuPG on this website:\n"
@@ -226,13 +231,13 @@ msgid ""
" http://www.gnupg.org/related_software/frontends.html"
msgstr ""
-#: lib/gettor/i18n.py:152
+#: lib/gettor/i18n.py:157
msgid ""
"BLOCKED ACCESS / CENSORSHIP\n"
"==========================="
msgstr ""
-#: lib/gettor/i18n.py:155
+#: lib/gettor/i18n.py:160
msgid ""
"If your Internet connection blocks access to the Tor network, you\n"
"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n"
@@ -242,7 +247,7 @@ msgid ""
"to block all the bridges."
msgstr ""
-#: lib/gettor/i18n.py:162
+#: lib/gettor/i18n.py:167
msgid ""
"You can acquire a bridge by sending an email that contains \"get bridges\"\n"
"in the body of the email to the following email address:\n"
@@ -250,13 +255,20 @@ msgid ""
" bridges(a)torproject.org"
msgstr ""
-#: lib/gettor/i18n.py:167
+#: lib/gettor/i18n.py:172
msgid ""
"It is also possible to fetch bridges with a web browser at the following\n"
"url: https://bridges.torproject.org/"
msgstr ""
-#: lib/gettor/i18n.py:170
+#: lib/gettor/i18n.py:175
+msgid ""
+"Another censorship circumvention tool you can request from GetTor is\n"
+"the Tor Obfsproxy Browser Bundle. Please read the package descriptions for\n"
+"which package you should request to receive this."
+msgstr ""
+
+#: lib/gettor/i18n.py:179
msgid ""
"IMPORTANT NOTE:\n"
"Since this is part of a split-file request, you need to wait for\n"
@@ -265,32 +277,32 @@ msgid ""
"first file."
msgstr ""
-#: lib/gettor/i18n.py:176
+#: lib/gettor/i18n.py:185
msgid ""
"Packages might arrive out of order! Please make sure you received\n"
"all packages before you attempt to unpack them!"
msgstr ""
-#: lib/gettor/i18n.py:179
+#: lib/gettor/i18n.py:188
#, python-format
msgid ""
"It was successfully understood. Your request is currently being processed.\n"
"Your package (%s) should arrive within the next ten minutes."
msgstr ""
-#: lib/gettor/i18n.py:182
+#: lib/gettor/i18n.py:191
msgid ""
"If it doesn't arrive, the package might be too big for your mail provider.\n"
"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."
msgstr ""
-#: lib/gettor/i18n.py:185
+#: lib/gettor/i18n.py:194
msgid ""
"Unfortunately we are currently experiencing problems and we can't fulfill\n"
"your request right now. Please be patient as we try to resolve this issue."
msgstr ""
-#: lib/gettor/i18n.py:188
+#: lib/gettor/i18n.py:197
msgid ""
"Unfortunately there is no split package available for the package you\n"
"requested. Please send us another package name or request the same package \n"
@@ -299,13 +311,13 @@ msgid ""
"package. Make sure this is what you want."
msgstr ""
-#: lib/gettor/i18n.py:193
+#: lib/gettor/i18n.py:202
msgid ""
"UNPACKING THE FILES\n"
"==================="
msgstr ""
-#: lib/gettor/i18n.py:196
+#: lib/gettor/i18n.py:205
msgid ""
"The easiest way to unpack the files you received is to install 7-Zip,\n"
"a free file compression/uncompression tool. If it isn't installed on\n"
@@ -314,13 +326,13 @@ msgid ""
" http://www.7-zip.org/"
msgstr ""
-#: lib/gettor/i18n.py:202
+#: lib/gettor/i18n.py:211
msgid ""
"When 7-Zip is installed, you can open the .z archive you received from\n"
"us by double-clicking on it."
msgstr ""
-#: lib/gettor/i18n.py:205
+#: lib/gettor/i18n.py:214
msgid ""
"An alternative way to get the .z files extraced is to rename them to\n"
".zip. For example, if you recevied a file called \"windows.z\", rename it "
@@ -330,13 +342,13 @@ msgid ""
"file archiver programs that probably are already installed on your computer."
msgstr ""
-#: lib/gettor/i18n.py:210
+#: lib/gettor/i18n.py:219
msgid ""
"Please reply to this mail, and tell me a single package name anywhere\n"
"in your reply. Here's a short explanation of what these packages are:"
msgstr ""
-#: lib/gettor/i18n.py:213
+#: lib/gettor/i18n.py:222
msgid ""
"windows:\n"
"The Tor Browser Bundle package for Windows operating systems. If you're \n"
@@ -344,59 +356,96 @@ msgid ""
"Windows 7, this is the package you should get."
msgstr ""
-#: lib/gettor/i18n.py:218
+#: lib/gettor/i18n.py:227
msgid ""
"macos-i386:\n"
"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n"
"general, newer Mac hardware will require you to use this package."
msgstr ""
-#: lib/gettor/i18n.py:222
+#: lib/gettor/i18n.py:231
msgid ""
"macos-ppc:\n"
"This is an older installer (the \"Vidalia bundle\") for older Macs running\n"
"OS X on PowerPC CPUs. Note that this package will be deprecated soon."
msgstr ""
-#: lib/gettor/i18n.py:226
+#: lib/gettor/i18n.py:235
msgid ""
"linux-i386:\n"
"The Tor Browser Bundle package for Linux, 32bit versions."
msgstr ""
-#: lib/gettor/i18n.py:229
+#: lib/gettor/i18n.py:238
msgid ""
"Note that this package is rather large and needs your email provider to \n"
"allow for attachments of about 30MB in size."
msgstr ""
-#: lib/gettor/i18n.py:232
+#: lib/gettor/i18n.py:241
msgid ""
"linux-x86_64:\n"
"The Tor Browser Bundle package for Linux, 64bit versions."
msgstr ""
-#: lib/gettor/i18n.py:235
+#: lib/gettor/i18n.py:244
+msgid ""
+"obfs-windows:\n"
+"The Tor Obfsproxy Browser Bundle for Windows operating systems. If you need\n"
+"strong censorship circumvention and you are running some version of the \n"
+"Windows, like Windows XP, Windows Vista or Windows 7, this is the package\n"
+"you should get."
+msgstr ""
+
+#: lib/gettor/i18n.py:250
+msgid ""
+"obfs-macos-i386:\n"
+"The Tor Obfsproxy Browser Bundle package for OS X, 32bit Intel CPU \n"
+"architecture."
+msgstr ""
+
+#: lib/gettor/i18n.py:254
+msgid ""
+"obfs-macos-x86_64:\n"
+"The Tor Obfsproxy Browser Bundle package for OS X, 64bit Intel CPU \n"
+"architecture."
+msgstr ""
+
+#: lib/gettor/i18n.py:258
+msgid ""
+"obfs-linux-i386:\n"
+"The Tor Obfsproxy Browser Bundle package for Linux, 32bit Intel CPU \n"
+"architecture."
+msgstr ""
+
+#: lib/gettor/i18n.py:262
+msgid ""
+"obfs-linux-x86_64:\n"
+"The Tor Obfsproxy Browser Bundle package for Linux, 64bit Intel CPU \n"
+"architecture."
+msgstr ""
+
+#: lib/gettor/i18n.py:266
msgid ""
"source:\n"
"The Tor source code, for experts. Most users do not want this package."
msgstr ""
-#: lib/gettor/i18n.py:238
+#: lib/gettor/i18n.py:269
msgid ""
"FREQUENTLY ASKED QUESTIONS\n"
"=========================="
msgstr ""
-#: lib/gettor/i18n.py:241
+#: lib/gettor/i18n.py:272
msgid "What is Tor?"
msgstr ""
-#: lib/gettor/i18n.py:243
+#: lib/gettor/i18n.py:274
msgid "The name \"Tor\" can refer to several different components."
msgstr ""
-#: lib/gettor/i18n.py:245
+#: lib/gettor/i18n.py:276
msgid ""
"The Tor software is a program you can run on your computer that helps \n"
"keep you safe on the Internet. Tor protects you by bouncing your \n"
@@ -412,22 +461,22 @@ msgid ""
" https://www.torproject.org/about/overview.html.en"
msgstr ""
-#: lib/gettor/i18n.py:255
+#: lib/gettor/i18n.py:286
msgid "What is the Tor Browser Bundle?"
msgstr ""
-#: lib/gettor/i18n.py:257
+#: lib/gettor/i18n.py:288
msgid ""
"The Browser Bundle (TBB) is the package we recommend to most users. \n"
"The bundle comes with everything you need to safely browse the Internet.\n"
"Just extract it and run."
msgstr ""
-#: lib/gettor/i18n.py:261
+#: lib/gettor/i18n.py:292
msgid "What package should I request?"
msgstr ""
-#: lib/gettor/i18n.py:263
+#: lib/gettor/i18n.py:294
msgid ""
"This depends on the operating system you use. For instance, if your\n"
"operating system is Microsoft Windows, you should request \"windows\". Here\n"
@@ -435,19 +484,19 @@ msgid ""
"systems there are suitable for:"
msgstr ""
-#: lib/gettor/i18n.py:268
+#: lib/gettor/i18n.py:299
msgid "How do I extract the file(s) you sent me?"
msgstr ""
-#: lib/gettor/i18n.py:270
+#: lib/gettor/i18n.py:301
msgid "QUESTION:"
msgstr ""
-#: lib/gettor/i18n.py:272
+#: lib/gettor/i18n.py:303
msgid "ANSWER:"
msgstr ""
-#: lib/gettor/i18n.py:274
+#: lib/gettor/i18n.py:305
#, python-format
msgid ""
"Sorry, but the package you requested (%s) is too large for your \n"
commit 600aab60edc605e94ec9f9312c096548aea80619
Author: Christian Fromme <kaner(a)strace.org>
Date: Sat Jan 19 13:24:19 2013 +0100
Incorporate patch for obfsproxy by George Kadianakis (thanks!)
- Also added a bit of documentation for users that a obfsproxy bundle
is available for different platforms
---
gettor.conf | 60 +++++++++++++++++++++++++++++++
lib/gettor/i18n.py | 89 +++++++++++++++++++++++++++++++---------------
lib/gettor/responses.py | 74 +++++++++++++++++++++++----------------
3 files changed, 164 insertions(+), 59 deletions(-)
diff --git a/gettor.conf b/gettor.conf
index 233b4b9..8749927 100644
--- a/gettor.conf
+++ b/gettor.conf
@@ -211,4 +211,64 @@ PACKAGES = {
"linux-x86_64_zh_CN":
("torbrowser/linux/tor-browser-gnu-linux-x86_64-*-zh-CN.tar.gz",
"unavailable"),
+ "obfs-windows":
+ ("torbrowser/tor-obfsproxy-browser-*_en-US.exe",
+ "unavailable"),
+ "obfs-windows_ar":
+ ("torbrowser/tor-obfsproxy-browser-*_ar.exe",
+ "unavailable"),
+ "obfs-windows_fa":
+ ("torbrowser/tor-obfsproxy-browser-*_fa.exe",
+ "unavailable"),
+ "obfs-windows_zh-CN":
+ ("torbrowser/tor-obfsproxy-browser-*_zh-CN.exe",
+ "unavailable"),
+ "obfs-macos-i386":
+ ("torbrowser/osx/TorBrowser-Obfsproxy-*-i386-en-US.zip",
+ "unavailable"),
+ "obfs-macos-x86_64":
+ ("torbrowser/osx/TorBrowser-Obfsproxy-*-x86_64-en-US.zip",
+ "unavailable"),
+ "obfs-macos-i386_ar":
+ ("torbrowser/osx/TorBrowser-Obfsproxy-*-i386-ar.zip",
+ "unavailable"),
+ "obfs-macos-x86_64_ar":
+ ("torbrowser/osx/TorBrowser-Obfsproxy-*-x86_64-ar.zip",
+ "unavailable"),
+ "obfs-macos-i386_fa":
+ ("torbrowser/osx/TorBrowser-Obfsproxy-*-i386-fa.zip",
+ "unavailable"),
+ "obfs-macos-x86_64_fa":
+ ("torbrowser/osx/TorBrowser-Obfsproxy-*-x86_64-fa.zip",
+ "unavailable"),
+ "obfs-macos-i386_zh-CN":
+ ("torbrowser/osx/TorBrowser-Obfsproxy-*-i386-zh-CN.zip",
+ "unavailable"),
+ "obfs-macos-x86_64_zh-CN":
+ ("torbrowser/osx/TorBrowser-Obfsproxy-*-x86_64-zh-CN.zip",
+ "unavailable"),
+ "obfs-linux-i386":
+ ("torbrowser/linux/tor-obfsproxy-browser-gnu-linux-i686-*-en-US.tar.gz",
+ "unavailable"),
+ "obfs-linux-x86_64":
+ ("torbrowser/linux/tor-obfsproxy-browser-gnu-linux-x86_64-*-en-US.tar.gz",
+ "unavailable"),
+ "obfs-linux-i386_ar":
+ ("torbrowser/linux/tor-obfsproxy-browser-gnu-linux-i686-*-ar.tar.gz",
+ "unavailable"),
+ "obfs-linux-x86_64_ar":
+ ("torbrowser/linux/tor-obfsproxy-browser-gnu-linux-x86_64-*-ar.tar.gz",
+ "unavailable"),
+ "obfs-linux-i386_fa":
+ ("torbrowser/linux/tor-obfsproxy-browser-gnu-linux-i686-*-fa.tar.gz",
+ "unavailable"),
+ "obfs-linux-x86_64_fa":
+ ("torbrowser/linux/tor-obfsproxy-browser-gnu-linux-x86_64-*-fa.tar.gz",
+ "unavailable"),
+ "obfs-linux-i386_zh-CN":
+ ("torbrowser/linux/tor-obfsproxy-browser-gnu-linux-i686-*-zh-CN.tar.gz",
+ "unavailable"),
+ "obfs-linux-x86_64_zh-CN":
+ ("torbrowser/linux/tor-obfsproxy-browser-gnu-linux-x86_64-*-zh-CN.tar.gz",
+ "unavailable"),
}
diff --git a/lib/gettor/i18n.py b/lib/gettor/i18n.py
index b88d932..d861cfe 100644
--- a/lib/gettor/i18n.py
+++ b/lib/gettor/i18n.py
@@ -51,6 +51,11 @@ Please select one of the following package names:
macos-ppc
linux-i386
linux-x86_64
+ obfs-windows
+ obfs-macos-i386
+ obfs-macos-x86_64
+ obfs-linux-i386
+ obfs-linux-x86_64
source"""),
# GETTOR_TEXT[7]
_("""Please reply to this mail, and tell me a single package name anywhere
@@ -167,81 +172,107 @@ in the body of the email to the following email address:
_("""It is also possible to fetch bridges with a web browser at the following
url: https://bridges.torproject.org/"""),
# GETTOR_TEXT[36]
+_("""Another censorship circumvention tool you can request from GetTor is
+the Tor Obfsproxy Browser Bundle. Please read the package descriptions for
+which package you should request to receive this."""),
+ # GETTOR_TEXT[37]
_("""IMPORTANT NOTE:
Since this is part of a split-file request, you need to wait for
all split files to be received by you before you can save them all
into the same directory and unpack them by double-clicking the
first file."""),
- # GETTOR_TEXT[37]
+ # GETTOR_TEXT[38]
_("""Packages might arrive out of order! Please make sure you received
all packages before you attempt to unpack them!"""),
- # GETTOR_TEXT[38]
+ # GETTOR_TEXT[39]
_("""It was successfully understood. Your request is currently being processed.
Your package (%s) should arrive within the next ten minutes."""),
- # GETTOR_TEXT[39]
+ # GETTOR_TEXT[40]
_("""If it doesn't arrive, the package might be too big for your mail provider.
Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account."""),
- # GETTOR_TEXT[40]
+ # GETTOR_TEXT[41]
_("""Unfortunately we are currently experiencing problems and we can't fulfill
your request right now. Please be patient as we try to resolve this issue."""),
- # GETTOR_TEXT[41]
+ # GETTOR_TEXT[42]
_("""Unfortunately there is no split package available for the package you
requested. Please send us another package name or request the same package
again, but remove the 'split' keyword. In that case we'll send you the whole
package. Make sure this is what you want."""),
- # GETTOR_TEXT[42]
+ # GETTOR_TEXT[43]
_("""UNPACKING THE FILES
==================="""),
- # GETTOR_TEXT[43]
+ # GETTOR_TEXT[44]
_("""The easiest way to unpack the files you received is to install 7-Zip,
a free file compression/uncompression tool. If it isn't installed on
your computer yet, you can download it here:
http://www.7-zip.org/"""),
- # GETTOR_TEXT[44]
+ # GETTOR_TEXT[45]
_("""When 7-Zip is installed, you can open the .z archive you received from
us by double-clicking on it."""),
- # GETTOR_TEXT[45]
+ # GETTOR_TEXT[46]
_("""An alternative way to get the .z files extraced is to rename them to
.zip. For example, if you recevied a file called "windows.z", rename it to
"windows.zip". You should then be able to extract the archive with common
file archiver programs that probably are already installed on your computer."""),
- # GETTOR_TEXT[46]
+ # GETTOR_TEXT[47]
_("""Please reply to this mail, and tell me a single package name anywhere
in your reply. Here's a short explanation of what these packages are:"""),
- # GETTOR_TEXT[47]
+ # GETTOR_TEXT[48]
_("""windows:
The Tor Browser Bundle package for Windows operating systems. If you're
running some version of Windows, like Windows XP, Windows Vista or
Windows 7, this is the package you should get."""),
- # GETTOR_TEXT[48]
+ # GETTOR_TEXT[49]
_("""macos-i386:
The Tor Browser Bundle package for OS X, Intel CPU architecture. In
general, newer Mac hardware will require you to use this package."""),
- # GETTOR_TEXT[49]
+ # GETTOR_TEXT[50]
_("""macos-ppc:
This is an older installer (the "Vidalia bundle") for older Macs running
OS X on PowerPC CPUs. Note that this package will be deprecated soon."""),
- # GETTOR_TEXT[50]
+ # GETTOR_TEXT[51]
_("""linux-i386:
The Tor Browser Bundle package for Linux, 32bit versions."""),
- # GETTOR_TEXT[51]
+ # GETTOR_TEXT[52]
_("""Note that this package is rather large and needs your email provider to
allow for attachments of about 30MB in size."""),
- # GETTOR_TEXT[52]
+ # GETTOR_TEXT[53]
_("""linux-x86_64:
The Tor Browser Bundle package for Linux, 64bit versions."""),
- # GETTOR_TEXT[53]
+ # GETTOR_TEXT[54]
+_("""obfs-windows:
+The Tor Obfsproxy Browser Bundle for Windows operating systems. If you need
+strong censorship circumvention and you are running some version of the
+Windows, like Windows XP, Windows Vista or Windows 7, this is the package
+you should get."""),
+ # GETTOR_TEXT[55]
+_("""obfs-macos-i386:
+The Tor Obfsproxy Browser Bundle package for OS X, 32bit Intel CPU
+architecture."""),
+ # GETTOR_TEXT[56]
+_("""obfs-macos-x86_64:
+The Tor Obfsproxy Browser Bundle package for OS X, 64bit Intel CPU
+architecture."""),
+ # GETTOR_TEXT[57]
+_("""obfs-linux-i386:
+The Tor Obfsproxy Browser Bundle package for Linux, 32bit Intel CPU
+architecture."""),
+ # GETTOR_TEXT[58]
+_("""obfs-linux-x86_64:
+The Tor Obfsproxy Browser Bundle package for Linux, 64bit Intel CPU
+architecture."""),
+ # GETTOR_TEXT[59]
_("""source:
The Tor source code, for experts. Most users do not want this package."""),
- # GETTOR_TEXT[54]
+ # GETTOR_TEXT[60]
_("""FREQUENTLY ASKED QUESTIONS
=========================="""),
- # GETTOR_TEXT[55]
+ # GETTOR_TEXT[61]
_("""What is Tor?"""),
- # GETTOR_TEXT[56]
+ # GETTOR_TEXT[62]
_("""The name "Tor" can refer to several different components."""),
- # GETTOR_TEXT[57]
+ # GETTOR_TEXT[63]
_("""The Tor software is a program you can run on your computer that helps
keep you safe on the Internet. Tor protects you by bouncing your
communications around a distributed network of relays run by volunteers
@@ -251,26 +282,26 @@ learning your physical location. This set of volunteer relays is called the
Tor network. You can read more about how Tor works here:
https://www.torproject.org/about/overview.html.en"""),
- # GETTOR_TEXT[58]
+ # GETTOR_TEXT[64]
_("""What is the Tor Browser Bundle?"""),
- # GETTOR_TEXT[59]
+ # GETTOR_TEXT[65]
_("""The Browser Bundle (TBB) is the package we recommend to most users.
The bundle comes with everything you need to safely browse the Internet.
Just extract it and run."""),
- # GETTOR_TEXT[60]
+ # GETTOR_TEXT[66]
_("""What package should I request?"""),
- # GETTOR_TEXT[61]
+ # GETTOR_TEXT[67]
_("""This depends on the operating system you use. For instance, if your
operating system is Microsoft Windows, you should request "windows". Here
is a short explanation of all packages to request and what operating
systems there are suitable for:"""),
- # GETTOR_TEXT[62]
+ # GETTOR_TEXT[68]
_("""How do I extract the file(s) you sent me?"""),
- # GETTOR_TEXT[63]
+ # GETTOR_TEXT[69]
_("""QUESTION:"""),
- # GETTOR_TEXT[64]
+ # GETTOR_TEXT[70]
_("""ANSWER:"""),
- # GETTOR_TEXT[65]
+ # GETTOR_TEXT[71]
_("""Sorry, but the package you requested (%s) is too large for your
provider to accept as an attachment. Try using another provider that allows
for larger email attachments. Or try one of the following mirrors:
diff --git a/lib/gettor/responses.py b/lib/gettor/responses.py
index 7ab6704..6ce33d1 100644
--- a/lib/gettor/responses.py
+++ b/lib/gettor/responses.py
@@ -25,16 +25,21 @@ def getGreetingText(t):
def getPackageHelpText(t):
return t.gettext(i18n.GETTOR_TEXT[6]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[46]) + "\n\n" \
+ t.gettext(i18n.GETTOR_TEXT[47]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[48]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[51]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[49]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[50]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[51]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[52]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[51]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[53]) + "\n\n"
+ + t.gettext(i18n.GETTOR_TEXT[48]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[49]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[52]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[50]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[51]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[52]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[53]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[52]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[54]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[55]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[56]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[57]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[58]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[59]) + "\n\n"
def getLocalizedVersionHelpText(t):
return t.gettext(i18n.GETTOR_TEXT[8]) + "\n" \
@@ -48,7 +53,8 @@ def getBridgesHelpText(t):
return t.gettext(i18n.GETTOR_TEXT[32]) + "\n" \
+ t.gettext(i18n.GETTOR_TEXT[33]) + "\n\n" \
+ t.gettext(i18n.GETTOR_TEXT[34]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[35]) + "\n\n"
+ + t.gettext(i18n.GETTOR_TEXT[35]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[36]) + "\n\n"
def getGeneralHelpText(t):
return getGreetingText(t) \
@@ -58,30 +64,38 @@ def getGeneralHelpText(t):
+ getSupportText(t)
def getFAQText(t):
- return t.gettext(i18n.GETTOR_TEXT[54]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[63]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[55]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[64]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[56]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[57]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[63]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[58]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[64]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[59]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[63]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[60]) + "\n" \
+ return t.gettext(i18n.GETTOR_TEXT[60]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[69]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[61]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[70]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[62]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[63]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[69]) + "\n" \
+ t.gettext(i18n.GETTOR_TEXT[64]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[61]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[70]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[65]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[69]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[66]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[70]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[67]) + "\n\n" \
+ t.gettext(i18n.GETTOR_TEXT[47]) + "\n\n" \
+ t.gettext(i18n.GETTOR_TEXT[48]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[49]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[49]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[52]) + "\n\n" \
+ t.gettext(i18n.GETTOR_TEXT[50]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[51]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[51]) + "\n" \
+ t.gettext(i18n.GETTOR_TEXT[52]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[53]) + "\n\n" \
- + t.gettext(i18n.GETTOR_TEXT[63]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[62]) + "\n" \
- + t.gettext(i18n.GETTOR_TEXT[64]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[53]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[52]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[54]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[55]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[56]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[57]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[58]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[59]) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[69]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[68]) + "\n" \
+ + t.gettext(i18n.GETTOR_TEXT[70]) + "\n" \
+ t.gettext(i18n.GETTOR_TEXT[43]) + "\n\n" \
+ t.gettext(i18n.GETTOR_TEXT[44]) + "\n\n" \
+ t.gettext(i18n.GETTOR_TEXT[45]) + "\n\n"
@@ -163,7 +177,7 @@ def getDelayAlertMsg(t, packageInfo):
def getSorrySizeMsg(t, packageInfo):
return getGreetingText(t) \
- + t.gettext(i18n.GETTOR_TEXT[65] % packageInfo) + "\n\n" \
+ + t.gettext(i18n.GETTOR_TEXT[71] % packageInfo) + "\n\n" \
+ getSupportText(t)
def getNoSplitAvailable(t):
commit eb9363184ba284ab565070552e8514eda360e0f3
Author: Translation commit bot <translation(a)torproject.org>
Date: Sat Jan 19 12:15:39 2013 +0000
Update translations for vidalia_help_completed
---
ja/running.po | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 150 insertions(+), 0 deletions(-)
diff --git a/ja/running.po b/ja/running.po
new file mode 100644
index 0000000..d887319
--- /dev/null
+++ b/ja/running.po
@@ -0,0 +1,150 @@
+#
+# Translators:
+# <87(a)itokei.info>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2010-06-26 17:00+0200\n"
+"PO-Revision-Date: 2013-01-19 12:10+0000\n"
+"Last-Translator: brt <87(a)itokei.info>\n"
+"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. type: Content of: <html><body><h1>
+#: en/running.html:16
+msgid "Running Tor"
+msgstr "Torの運用"
+
+#. type: Content of: <html><body><p>
+#: en/running.html:20
+msgid ""
+"Vidalia can help you control your Tor process by letting you start and stop "
+"Tor, as well as monitoring Tor's status and letting you know if it exits "
+"unexpectedly."
+msgstr "VidaliaはTorの状態を監視してTorが予期せず終了したかどうかを知らせるだけでなく、開始や停止等Torをコントロールする手助けをします。"
+
+#. type: Content of: <html><body>
+#: en/running.html:25
+msgid "<a name=\"starting\"/>"
+msgstr "<a name=\"starting\"/>"
+
+#. type: Content of: <html><body><h3>
+#: en/running.html:26
+msgid "Starting and Stopping Tor"
+msgstr "Torの開始と停止"
+
+#. type: Content of: <html><body><p>
+#: en/running.html:28
+msgid "To <i>start</i> Tor,"
+msgstr "Torを開始する、"
+
+#. type: Content of: <html><body><p><ol><li>
+#: en/running.html:30
+msgid "Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i>"
+msgstr "Vidaliaのトレイメニューから\"Torを開始\"を選択するか、<i>Ctrl+S</i>を入力します。"
+
+#. type: Content of: <html><body><p><ol>
+#: en/running.html:30 en/running.html:45
+msgid "."
+msgstr "."
+
+#. type: Content of: <html><body><p><ol><li>
+#: en/running.html:32
+msgid ""
+"Vidalia's tray icon will change from an onion with a red X to a green onion "
+"when Tor has started."
+msgstr "Torが開始されると、Vidaliaのトレイアイコンが赤いXから緑の玉ねぎに変わります"
+
+#. type: Content of: <html><body><p>
+#: en/running.html:36
+msgid ""
+"If Vidalia is unable to start Tor, Vidalia will display an error message "
+"telling you what went wrong. You can also look at your <a "
+"href=\"log.html\">message log</a> to see if Tor printed any more information"
+" about what went wrong."
+msgstr "VidaliaがTorを開始できない場合、Vidaliaはエラーメッセージを表示して何がいけなかったかを伝えます。また <a href=\"log.html\">メッセージログ</a>を見ることで、Torが何かしらの情報を残しているかどうかを確認できます。"
+
+#. type: Content of: <html><body><p>
+#: en/running.html:43
+msgid "To <i>stop</i> Tor,"
+msgstr "Torを停止する、"
+
+#. type: Content of: <html><body><p><ol><li>
+#: en/running.html:45
+msgid "Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i>"
+msgstr "Vidaliaのトレイメニューから\"Torを停止\"を選択するか、<i>Ctrl+T</i>を入力します。"
+
+#. type: Content of: <html><body><p><ol><li>
+#: en/running.html:47
+msgid ""
+"Vidalia's tray icon will change from a green onion to a gray onion with a "
+"red X when Tor has stopped."
+msgstr "Torが停止されると、Vidaliaのトレイアイコンが\"緑の玉ねぎ\"から\"灰色玉ねぎに赤いX\"に変わります"
+
+#. type: Content of: <html><body><p>
+#: en/running.html:51
+msgid ""
+"If Vidalia was unable to stop Tor, Vidalia will display an error message "
+"telling you what went wrong. You can also look at your <a "
+"href=\"log.html\">message log</a> to see if Tor printed any more information"
+" about what went wrong."
+msgstr "VidaliaがTorを停止できない場合、Vidaliaはエラーメッセージを表示して何がいけなかったかを伝えます。また <a href=\"log.html\">メッセージログ</a>を見ることで、Torが何かしらの情報を残しているかどうかを確認できます。"
+
+#. type: Content of: <html><body>
+#: en/running.html:57
+msgid "<a name=\"monitoring\"/>"
+msgstr "<a name=\"monitoring\"/>"
+
+#. type: Content of: <html><body><h3>
+#: en/running.html:58
+msgid "Monitoring Tor's Status"
+msgstr "Torの状態の監視"
+
+#. type: Content of: <html><body><p>
+#: en/running.html:60
+msgid ""
+"Vidalia tells you about the status of Tor by displaying an icon in your "
+"system tray or dock area. The following table shows the different states "
+"indicated by an icon in your system's notification area:"
+msgstr "Vidaliaは、あなたのシステムトレイやドッグエリアにアイコンを表示することで、Torの状態を伝えます。以下に続く表はあなたのシステムの通知エリアのアイコンが示す個々の状態を表しています。:"
+
+#. type: Content of: <html><body><p><table><tr><td>
+#: en/running.html:69
+msgid ""
+"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
+msgstr "Tor は停止しています。Torを開始するにはVidaliaのメニューから\"Torを開始\"を選択してください。"
+
+#. type: Content of: <html><body><p><table><tr><td>
+#: en/running.html:76
+msgid ""
+"Tor is starting up. You can check the <a href=\"log.html\">message log</a> "
+"for status information about Tor while it is starting."
+msgstr "Torを開始しています。<a href=\"log.html\">メッセージログ</a>からTorの開始中の状態情報を確認できます。"
+
+#. type: Content of: <html><body><p><table><tr><td>
+#: en/running.html:84
+msgid ""
+"Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia"
+" menu. Tor will print informational messages to the <a "
+"href=\"log.html\">message log</a> while it is running, if you want to see "
+"what Tor is doing."
+msgstr "Torは動作中です。Torを停止するにはVidaliaのメニューから\"Torを停止\"を選択してください。 Torが何をしているか知りたいですか?Torは動作中に<a href=\"log.html\">メッセージログ</a>に情報を残しています。 "
+
+#. type: Content of: <html><body><p><table><tr><td>
+#: en/running.html:92
+msgid "Tor is in the process of shutting down."
+msgstr "Torは終了プロセス中です"
+
+#. type: Content of: <html><body><p>
+#: en/running.html:98
+msgid ""
+"If Tor exits unexpectedly, Vidalia will change its icon to the dark onion "
+"with a red X and display an error message letting you know what went wrong. "
+"You can also check the <a href=\"log.html\">message log</a> for details "
+"about any problems Tor encountered before it exited."
+msgstr "もしTorが予期せず終了したら、Vidaliaは\"暗い玉ねぎに赤いX\"のアイコンを表示し、何が起こったのかをエラーメッセージを表示してあなたに伝えます。また、<a href=\"log.html\">メッセージログ</a> でTorに起こった問題の詳細を確認できます。"
commit 9443d298f7b213a9e614143171e27839de1b30db
Author: Translation commit bot <translation(a)torproject.org>
Date: Sat Jan 19 12:15:30 2013 +0000
Update translations for vidalia_help
---
ja/bridges.po | 19 +++++++++----------
ja/running.po | 16 ++++++++--------
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/ja/bridges.po b/ja/bridges.po
index c93d522..ba245f7 100644
--- a/ja/bridges.po
+++ b/ja/bridges.po
@@ -1,33 +1,34 @@
#
# Translators:
+# <87(a)itokei.info>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2010-11-30 05:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-01-19 12:15+0000\n"
+"Last-Translator: brt <87(a)itokei.info>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ja\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#. type: Content of: <html><body><h1>
#: en/bridges.html:16
msgid "Bridge Relays"
-msgstr ""
+msgstr "ブリッジ リレー"
#. type: Content of: <html><body>
#: en/bridges.html:19
msgid "<a name=\"about\"/>"
-msgstr ""
+msgstr "<a name=\"about\"/>"
#. type: Content of: <html><body><h3>
#: en/bridges.html:20
msgid "What are bridge relays?"
-msgstr ""
+msgstr "ブリッジリレーとは?"
#. type: Content of: <html><body><p>
#: en/bridges.html:22
@@ -45,12 +46,12 @@ msgstr ""
#. type: Content of: <html><body>
#: en/bridges.html:31
msgid "<a name=\"finding\"/>"
-msgstr ""
+msgstr "<a name=\"finding\"/>"
#. type: Content of: <html><body><h3>
#: en/bridges.html:32
msgid "How do I find a bridge relay?"
-msgstr ""
+msgstr "ブリッジリレーの見つけ方"
#. type: Content of: <html><body><p>
#: en/bridges.html:34
@@ -98,5 +99,3 @@ msgid ""
"Configuring more than one bridge address will make your Tor connection more "
"stable, in case some of the bridges become unreachable."
msgstr ""
-
-
diff --git a/ja/running.po b/ja/running.po
index aaa65a4..d887319 100644
--- a/ja/running.po
+++ b/ja/running.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2013-01-19 11:41+0000\n"
+"PO-Revision-Date: 2013-01-19 12:10+0000\n"
"Last-Translator: brt <87(a)itokei.info>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid ""
"Vidalia can help you control your Tor process by letting you start and stop "
"Tor, as well as monitoring Tor's status and letting you know if it exits "
"unexpectedly."
-msgstr ""
+msgstr "VidaliaはTorの状態を監視してTorが予期せず終了したかどうかを知らせるだけでなく、開始や停止等Torをコントロールする手助けをします。"
#. type: Content of: <html><body>
#: en/running.html:25
@@ -111,20 +111,20 @@ msgid ""
"Vidalia tells you about the status of Tor by displaying an icon in your "
"system tray or dock area. The following table shows the different states "
"indicated by an icon in your system's notification area:"
-msgstr ""
+msgstr "Vidaliaは、あなたのシステムトレイやドッグエリアにアイコンを表示することで、Torの状態を伝えます。以下に続く表はあなたのシステムの通知エリアのアイコンが示す個々の状態を表しています。:"
#. type: Content of: <html><body><p><table><tr><td>
#: en/running.html:69
msgid ""
"Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor."
-msgstr ""
+msgstr "Tor は停止しています。Torを開始するにはVidaliaのメニューから\"Torを開始\"を選択してください。"
#. type: Content of: <html><body><p><table><tr><td>
#: en/running.html:76
msgid ""
"Tor is starting up. You can check the <a href=\"log.html\">message log</a> "
"for status information about Tor while it is starting."
-msgstr ""
+msgstr "Torを開始しています。<a href=\"log.html\">メッセージログ</a>からTorの開始中の状態情報を確認できます。"
#. type: Content of: <html><body><p><table><tr><td>
#: en/running.html:84
@@ -133,12 +133,12 @@ msgid ""
" menu. Tor will print informational messages to the <a "
"href=\"log.html\">message log</a> while it is running, if you want to see "
"what Tor is doing."
-msgstr ""
+msgstr "Torは動作中です。Torを停止するにはVidaliaのメニューから\"Torを停止\"を選択してください。 Torが何をしているか知りたいですか?Torは動作中に<a href=\"log.html\">メッセージログ</a>に情報を残しています。 "
#. type: Content of: <html><body><p><table><tr><td>
#: en/running.html:92
msgid "Tor is in the process of shutting down."
-msgstr ""
+msgstr "Torは終了プロセス中です"
#. type: Content of: <html><body><p>
#: en/running.html:98
@@ -147,4 +147,4 @@ msgid ""
"with a red X and display an error message letting you know what went wrong. "
"You can also check the <a href=\"log.html\">message log</a> for details "
"about any problems Tor encountered before it exited."
-msgstr ""
+msgstr "もしTorが予期せず終了したら、Vidaliaは\"暗い玉ねぎに赤いX\"のアイコンを表示し、何が起こったのかをエラーメッセージを表示してあなたに伝えます。また、<a href=\"log.html\">メッセージログ</a> でTorに起こった問題の詳細を確認できます。"
commit 43cf4ad5577a982c12f42ea538dc969fcf1ada32
Author: Translation commit bot <translation(a)torproject.org>
Date: Sat Jan 19 11:45:34 2013 +0000
Update translations for vidalia_help
---
ja/config.po | 10 +++++-----
ja/running.po | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ja/config.po b/ja/config.po
index df4791d..7ddfeb1 100644
--- a/ja/config.po
+++ b/ja/config.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2013-01-19 11:07+0000\n"
+"PO-Revision-Date: 2013-01-19 11:36+0000\n"
"Last-Translator: brt <87(a)itokei.info>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -245,7 +245,7 @@ msgid ""
"connects to Tor's control port. If Vidalia starts Tor for you, you can have "
"Vidalia randomly generate a new password each time it starts Tor by checking"
" the <i>Randomly Generate</i> checkbox."
-msgstr ""
+msgstr "<b>パスワード</b> <i>(デフォルト)</i> -- この方法が選択されると、ユーザーやアプリケーションがTorのコントロールポートに接続するたびに必要とするパスワードを指定することができます。VidaliaがTorを開始するとき、Vidaliaを\"ランダムに生成する\"のチェックボックスを参照してTorを起動するたびに新しいランダムなパスワードを生成させるようにすることができます。"
#. type: Content of: <html><body><ul><li><ul><li>
#: en/config.html:162
@@ -254,7 +254,7 @@ msgid ""
" (or, <i>cookie</i>) containing random bytes to its data directory when it "
"starts. Any user or application that tries to connect to Tor's control port "
"must be able to provide the contents of this cookie."
-msgstr ""
+msgstr "<b>クッキー</b> -- クッキー認証が選択されると、Torは開始時にランダムなバイトを含むファイル(もしくは、クッキー)を書き出します。Torのコントロールポートに接続を試みるどんなユーザーやアプリケーションも、このクッキーの内容を提出できなければなりません。"
#. type: Content of: <html><body><ul><li>
#: en/config.html:170
@@ -263,7 +263,7 @@ msgid ""
"have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration "
"file. If you leave this field blank, Tor will uses its own default torrc "
"location."
-msgstr ""
+msgstr "<b>Torの設定ファイル</b> <i>(自由選択)</i>: このオプションを使って、VidaliaによるTorの開始に特定のtorrc,Torの設定ファイルを使用させることができます。この欄を空白にするとTorは自身のデフォルトの場所にあるtorrcを使用します。"
#. type: Content of: <html><body><ul><li>
#: en/config.html:175
@@ -272,7 +272,7 @@ msgid ""
"in which Tor will store its saved data, such as cached Tor relay "
"information, Tor relay keys, and configuration files. If you leave this "
"field blank, Tor will use its own default data directory location."
-msgstr ""
+msgstr "<b>Tor データディレクトリ</b> <i>(自由選択)</i>: Torが、Torリレーのキャッシュされた情報、Torリレーキー、設定ファイル等の保存されたデータを格納するディレクトリを指定することができます。この欄を空白にするとTorは自身のデフォルトのデータディレクトリを使用します。"
#. type: Content of: <html><body><ul><li>
#: en/config.html:181
diff --git a/ja/running.po b/ja/running.po
index 2739aef..aaa65a4 100644
--- a/ja/running.po
+++ b/ja/running.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2013-01-18 21:05+0000\n"
+"PO-Revision-Date: 2013-01-19 11:41+0000\n"
"Last-Translator: brt <87(a)itokei.info>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Content of: <html><body><h1>
#: en/running.html:16
msgid "Running Tor"
-msgstr ""
+msgstr "Torの運用"
#. type: Content of: <html><body><p>
#: en/running.html:20
commit 8e7ec99e6fc9e780f5b412b2f33a48605a346d68
Author: Translation commit bot <translation(a)torproject.org>
Date: Sat Jan 19 10:15:29 2013 +0000
Update translations for vidalia_help
---
ja/config.po | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ja/config.po b/ja/config.po
index eb147f4..74bbbd7 100644
--- a/ja/config.po
+++ b/ja/config.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2013-01-19 09:45+0000\n"
+"PO-Revision-Date: 2013-01-19 09:50+0000\n"
"Last-Translator: brt <87(a)itokei.info>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -219,7 +219,7 @@ msgid ""
" Vidalia uses to talk to Tor. This doesn't need to be changed unless you "
"have a conflict with another service on your machine, or if you are using "
"Vidalia to control and monitor a Tor process running on another machine."
-msgstr ""
+msgstr "<b>コントロールアドレス</b>と<b>ポート</b>: コントロールポートはVidaliaがTorとの交信に使用するポートです。これはあなたのマシン上のサービスと競合していなければ、もしくはVidaliaを別のマシン上のTorプロセスの操作と監視に使用しているのであれば、変更する必要はありません。"
#. type: Content of: <html><body><ul><li>
#: en/config.html:144
commit 7f7dce9d294e82b76fc0c0a72272bd58b9636998
Author: Translation commit bot <translation(a)torproject.org>
Date: Sat Jan 19 09:45:42 2013 +0000
Update translations for vidalia_help_completed
---
ja/troubleshooting.po | 245 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 245 insertions(+), 0 deletions(-)
diff --git a/ja/troubleshooting.po b/ja/troubleshooting.po
new file mode 100644
index 0000000..6040199
--- /dev/null
+++ b/ja/troubleshooting.po
@@ -0,0 +1,245 @@
+#
+# Translators:
+# <87(a)itokei.info>, 2013.
+# <twitter816(a)hotmail.co.jp>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2010-08-03 15:49-0300\n"
+"PO-Revision-Date: 2013-01-19 09:41+0000\n"
+"Last-Translator: brt <87(a)itokei.info>\n"
+"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# type: Content of: <html><body><h1>
+#: en/troubleshooting.html:16
+msgid "Troubleshooting"
+msgstr "問題の解決"
+
+# type: Content of: <html><body>
+#: en/troubleshooting.html:19
+msgid ""
+"Listed below are some of the common problems or questions people have while "
+"running Tor. If you can't find anything about the particular problem you're "
+"having, check out our website at <i>www.vidalia-project.net</i> for more "
+"support and information. <a name=\"start\"/>"
+msgstr "以下はTor使用時に起こる、いくつかのよくある問題や人々が抱く疑問です。あなたが抱えている個別の問題について何も見つけられなければ、私たちのウェブサイト <i>www.vidalia-project.net</i> をチェックして追加のサポートと情報を取得して下さい。 <a name=\"start\"/>"
+
+# type: Content of: <html><body><h3>
+#: en/troubleshooting.html:25
+msgid "I Can't Start Tor"
+msgstr "Torが開始できない"
+
+# type: Content of: <html><body><p>
+#: en/troubleshooting.html:27
+msgid ""
+"The most likely reason that Vidalia could not start Tor is because Vidalia "
+"is looking for your Tor installation in the wrong directory. You can tell "
+"Vidalia where Tor is located by updating the <i>Tor Executable</i> option in"
+" the <a href=\"config.html#general\">general configuration settings</a>."
+msgstr "Vidaliaがtorを開始できない最もありそうな理由は、Vidaliaが間違ったディレクトリでTorを探していることです。<a href=\"config.html#general\">general configuration settings</a> の <i>Tor Executable</i> オプションを更新することでVidaliaにTorの場所を伝えることができます。"
+
+# type: Content of: <html><body><p>
+#: en/troubleshooting.html:33
+msgid ""
+"Another possible reason that Tor cannot start is because there is already "
+"another Tor process running. Check your list of running process and stop the"
+" previous Tor process, if you find one. Then, try running Tor again."
+msgstr "Torを開始できない、他に考えられる理由は、別のTorプロセスが既に動作中であることです。起動中のプロセスを確認し、前のTorプロセスを終了させてからTorを起動してみて下さい。"
+
+# 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"
+" if Tor printed any information about errors it encountered while trying to "
+"start."
+msgstr "それでも解決しないようであれば、<a href=\"log.html\">メッセージログ</a>を確認し、Torが起動時のエラーについて何か情報を残していないか確認して下さい。"
+
+# type: Content of: <html><body>
+#: en/troubleshooting.html:43
+msgid "<a name=\"connect\"/>"
+msgstr "<a name=\"connect\"/>"
+
+# type: Content of: <html><body><h3>
+#: en/troubleshooting.html:44
+msgid "Vidalia Can't Connect to Tor"
+msgstr "VidaliaがTorに接続できない"
+
+# 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 "VidaliaはTorのコントロールポートを通してTorと交信することでTorを管理します。"
+
+# type: Content of: <html><body><p>
+#: en/troubleshooting.html:49
+msgid ""
+"The most common reason that Vidalia cannot connect to Tor is because Tor "
+"started, but encountered an error and exited immediately. You should check "
+"your <a href=\"log.html\">message log</a> to see if Tor reported any errors "
+"while it started."
+msgstr "VidaliaがTorに接続できないもっとも一般的な理由は、Tor起動後にエラーが発生し、すぐに終了したことによるものです。<a href=\"log.html\">メッセージログ</a>を見て、Torが起動時に何らかのエラーを報告していないかを確認すべきです。"
+
+# type: Content of: <html><body><p>
+#: en/troubleshooting.html:55
+msgid ""
+"If Tor is listening on a different port than Vidalia expects, Vidalia will "
+"be unable to connect to Tor. You rarely need to change this setting, but if "
+"there is another service running on your machine that conflicts with Tor's "
+"control port, you will need to specify a different port. You can change this"
+" setting in Vidalia's <a href=\"config.html#advanced\">advanced "
+"configuration settings</a>."
+msgstr "Torが、Vidaliaが期待しているものと違うポートで待機している場合、VidaliaはTorに接続出来ません。この設定を変更する必要が生じるのは稀ですが、あなたのマシン上でTorのコントロールポートと競合するサービスが動作中の場合、あなたは別のポートを指定する必要があるでしょう。\n Vidaliaの <a href=\"config.html#advanced\">詳細設定</a> で設定を変更することができます。"
+
+# type: Content of: <html><body>
+#: en/troubleshooting.html:63
+msgid "<a name=\"password\"/>"
+msgstr "<a name=\"password\"/>"
+
+# type: Content of: <html><body><h3>
+#: en/troubleshooting.html:64
+msgid "Why is Vidalia asking me for a \"control password\"?"
+msgstr "Vidaliaはなぜ私に\"コントロールパスワード\"を要求しているのですか?"
+
+# type: Content of: <html><body><p>
+#: en/troubleshooting.html:66
+msgid ""
+"Vidalia interacts with the Tor software via Tor's \"control port\". The "
+"control port lets Vidalia receive status updates from Tor, request a new "
+"identity, configure Tor's settings, etc. Each time Vidalia starts Tor, "
+"Vidalia sets a random password for Tor's control port to prevent other "
+"applications from also connecting to the control port and potentially "
+"compromising your anonymity."
+msgstr "VidaliaとTorはTorのコントロールポートを通して互いに影響し合います。コントロールポートでVidaliaは、Torから状態の更新を受信、新たなアイデンティティを要求、Torの設定を構成、他、等を行います。VidaliaがTorを起動するたびに、VidaliaはTorのコントロールポートにランダムなパスワードを設定し、他のアプリケーションからのコントロールポートへの接続と、匿名性の低下の可能性を防止します。"
+
+# 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 three common situations, though, where "
+"Vidalia may prompt you for a password:"
+msgstr "通常、このコントロールパスワードを生成し設定する工程はバックグランドで行われます。しかし、Vidaliaがあなたにパスワードを要求する場合が3つあります。"
+
+# 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 "VidaliaとTorが既に起動している。この状況は、例えばあなたがVidalia budleをインストールして、Tor Browser Bundleを起動しようとするときに起こり得ます。このケースでは、起動する前に古いVidaliaとTorを閉じる必要があります。"
+
+# 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 "VidaliaはクラッシュしたがTorは前のランダムパスワードで動作中の場合。あなたがVidaliaを再起動後、Vidaliaは新しいランダムパスワードを生成したが、そのパスワードは違っているためにTorと交信できない。"
+
+# 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 "コントロールポートを要求するダイアログに リセット ボタンがある場合、それをクリックすることでVidaliaがTorを新しいランダムパスワードで再起動します。"
+
+# 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 "
+"process or task manager, and terminate the Tor process. Then use Vidalia to "
+"restart Tor and all will work again."
+msgstr "リセットボタンが無い、もしくはVidaliaがTorを再起動できない場合でも、あなたは手動で問題を解決出来ます。単純に、タスクマネージャーを起動してTorのプロセスを停止してください。そしてVidaliaでTorを開始することで全てうまく行きます。"
+
+# 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 "
+"as a service through Vidalia, a random password was set and saved in Tor. "
+"When you reboot, Tor starts up and uses the random password it saved. You "
+"login and start up Vidalia. Vidalia attempts to talk to the already running "
+"Tor. Vidalia generates a random password, but it is different than the saved"
+" password in the Tor service."
+msgstr "以前、サービスとしてTorを起動する設定を行った。Torはサービスとして起動するよに設定されていると、システム起動時にそれを開始します。VidaliaでTorをサービスとして起動するように設定すると、ランダムパスワードがセットされ、Torに保存されます。リブートするとTorが起動し、保存されたパスワードを使います。ログインし、Vidaliaを起動します。Vidaliaは既に起動済みのTorとの交信を試みます。Vidaliaはランダムパスワードを生成しますが、それはTorサービスに保存されたパスワードとは違っています。"
+
+# 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 "
+"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">"
+" Tor as a service</a> for more information on how to remove the Tor service."
+msgstr "Torをサービスとして起動しないように再設定する必要があります。 Tor wiki の <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\"> Tor as a service </a> にTorサービスを無効にする方法のより詳しい情報があります。"
+
+# type: Content of: <html><body>
+#: en/troubleshooting.html:122
+msgid "<a name=\"torexited\"/>"
+msgstr "<a name=\"torexited\"/>"
+
+# type: Content of: <html><body><h3>
+#: en/troubleshooting.html:123
+msgid "Tor Exited Unexpectedly"
+msgstr "Torが予期せず終了する"
+
+# 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>"
+" to see if any of the last few messages in the list are highlighted in "
+"yellow and contain a message similar to the following:"
+msgstr "Torを開始してすぐに終了してしまう時、別のTorプロセスが動作中であることがもっとも考えられます。<a href=\"log.html\">メッセージログ</a>を見て直近のメッセージが黄色にハイライトされ、下記に似たメッセージを含んでいないかを確認してください:"
+
+# 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 already in use. \n"
+"Is Tor already running?\n"
+msgstr "connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \nIs Tor already running?\n"
+
+# 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 "
+"would need to look for <i>tor.exe</i> in your Task Manager. On most other "
+"operating systems, the <i>ps</i> command can help you find the other Tor "
+"process."
+msgstr "上記のようなエラーメッセージが見つかった場合、VidaliaでTorを起動する前に他のTorプロセスを停止する必要があります。Windowsの場合、タスクマネージャーで <i>tor.exe</i> を見つける必要があるでしょう。他のほとんどの OS では <i>ps</i> コマンドがTorプロセスを見つけるのに役立ちます。"
+
+# 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"
+" information about any errors Tor experienced before it exited. Such errors "
+"will be highlighted in either red or yellow."
+msgstr "Torが暫くの間(数分以上)正常に動作したら、Torが終了する前に<a href=\"log.html\">メッセージログ</a>を確認し、Torが経験したエラー情報を確認した方がいいでしょう。そのようなエラーは赤や黄色でハイライトされます。"
+
+# type: Content of: <html><body>
+#: en/troubleshooting.html:147
+msgid "<a name=\"stop\"/>"
+msgstr "<a name=\"stop\"/>"
+
+# type: Content of: <html><body><h3>
+#: en/troubleshooting.html:148
+msgid "Vidalia Can't Stop Tor"
+msgstr "VidaliaでTorを停止できない"
+
+# 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 "
+"trying to exit."
+msgstr "VidaliaがTorを停止できない場合、<a href=\"log.html\">メッセージログ</a>を確認し、Torが終了中に何かエラーを報告していないかを確認した方がいいでしょう。"
commit dc91f2e798ff36480625ba784385c6103f40a975
Author: Translation commit bot <translation(a)torproject.org>
Date: Sat Jan 19 09:45:34 2013 +0000
Update translations for vidalia_help
---
ja/config.po | 4 ++--
ja/troubleshooting.po | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ja/config.po b/ja/config.po
index 589a8ad..eb147f4 100644
--- a/ja/config.po
+++ b/ja/config.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2013-01-19 06:46+0000\n"
+"PO-Revision-Date: 2013-01-19 09:45+0000\n"
"Last-Translator: brt <87(a)itokei.info>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -210,7 +210,7 @@ msgstr "詳細設定"
msgid ""
"The settings on the <i>Advanced</i> page should generally only be modified "
"by more experienced users."
-msgstr ""
+msgstr "\"詳細\"の設定は、一般的には熟練したユーザーによってのみ変更されるべきです。"
#. type: Content of: <html><body><ul><li>
#: en/config.html:138
diff --git a/ja/troubleshooting.po b/ja/troubleshooting.po
index 3a6e8d5..6040199 100644
--- a/ja/troubleshooting.po
+++ b/ja/troubleshooting.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2010-08-03 15:49-0300\n"
-"PO-Revision-Date: 2013-01-19 09:13+0000\n"
+"PO-Revision-Date: 2013-01-19 09:41+0000\n"
"Last-Translator: brt <87(a)itokei.info>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -205,7 +205,7 @@ msgstr "Torを開始してすぐに終了してしまう時、別のTorプロセ
msgid ""
"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n"
"Is Tor already running?\n"
-msgstr ""
+msgstr "connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \nIs Tor already running?\n"
# type: Content of: <html><body><p>
#: en/troubleshooting.html:135
@@ -215,7 +215,7 @@ msgid ""
"would need to look for <i>tor.exe</i> in your Task Manager. On most other "
"operating systems, the <i>ps</i> command can help you find the other Tor "
"process."
-msgstr ""
+msgstr "上記のようなエラーメッセージが見つかった場合、VidaliaでTorを起動する前に他のTorプロセスを停止する必要があります。Windowsの場合、タスクマネージャーで <i>tor.exe</i> を見つける必要があるでしょう。他のほとんどの OS では <i>ps</i> コマンドがTorプロセスを見つけるのに役立ちます。"
# type: Content of: <html><body><p>
#: en/troubleshooting.html:141
@@ -224,7 +224,7 @@ msgid ""
"seconds), then you should check the <a href=\"log.html\">message log</a> for"
" information about any errors Tor experienced before it exited. Such errors "
"will be highlighted in either red or yellow."
-msgstr ""
+msgstr "Torが暫くの間(数分以上)正常に動作したら、Torが終了する前に<a href=\"log.html\">メッセージログ</a>を確認し、Torが経験したエラー情報を確認した方がいいでしょう。そのようなエラーは赤や黄色でハイライトされます。"
# type: Content of: <html><body>
#: en/troubleshooting.html:147
@@ -242,4 +242,4 @@ 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 "
"trying to exit."
-msgstr ""
+msgstr "VidaliaがTorを停止できない場合、<a href=\"log.html\">メッセージログ</a>を確認し、Torが終了中に何かエラーを報告していないかを確認した方がいいでしょう。"