commit 1d5a8c15ad52f9c17171f0a14d63707824ad537e
Author: Translation commit bot <translation(a)torproject.org>
Date: Mon Sep 16 21:52:57 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
contents+ja.po | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/contents+ja.po b/contents+ja.po
index bb6f333dc..392c52f26 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -795,17 +795,18 @@ msgstr ""
msgid ""
"If you are in a country where Tor is blocked, you can configure Tor to "
"connect to a bridge during the setup process."
-msgstr ""
+msgstr "Tor がブロックされる国にいる場合、セットアップ過程の中でブリッジに接続するように設定できます。"
#: templates/download.html:10
msgid "Select \"Tor is censored in my country.\""
-msgstr ""
+msgstr "「Tor は私の国では検閲されています」を選択してください。"
#: templates/download.html:13
msgid ""
"If Tor is not censored, one of the most common reasons Tor won't connect is "
"an incorrect system clock. Please make sure it's set correctly."
msgstr ""
+"Tor が検閲されていない場合、Tor が接続できない最もよくある原因は、間違ったシステム時計です。時刻が正しく設定されていることを確認してください。"
#: templates/download.html:14
msgid "Support Portal"
commit a28a682a1fc89eb6f96b5397518c78b85dbf160d
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Mon Sep 16 16:24:24 2019 -0400
bump version to 0.4.2.1-alpha
---
configure.ac | 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index f90a0c09b..26f722199 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.0-alpha-dev])
+AC_INIT([tor],[0.4.2.1-alpha])
AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
AC_CONFIG_MACRO_DIR([m4])
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
# version number changes. Tor uses it to make sure that it
# only shuts down for missing "required protocols" when those protocols
# are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-06-10"], # for 0.4.2.0-alpha-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-09-16"], # for 0.4.2.1-alpha
[Approximate date when this software was released. (Updated when the version changes.)])
# "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index 1c96b1868..e0f8dd772 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
-!define VERSION "0.4.2.0-alpha-dev"
+!define VERSION "0.4.2.1-alpha"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 25bfb9ada..dc0bc21ff 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.4.2.0-alpha-dev"
+#define VERSION "0.4.2.1-alpha"