tor-commits November 2018

tor-commits@lists.torproject.org

19 participants
2292 discussions

[tor/release-0.3.5] Bump to 0.3.4.9-dev
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 5acf6f8717d3dcaf170e4e1b07f688f0bfbc2ac7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:01:32 2018 -0400 Bump to 0.3.4.9-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ac0dd9667..0a89fa56f 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.4.9]) +AC_INIT([tor],[0.3.4.9-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 1a72ee30e..92de55778 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.3.4.9" +!define VERSION "0.3.4.9-dev" !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 dd53f6d03..1f1e56e76 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.3.4.9" +#define VERSION "0.3.4.9-dev"

1 0

[tor/maint-0.3.4] Bump to 0.3.4.9-dev
by nickm＠torproject.org 02 Nov '18

02 Nov '18

1 0

[tor/maint-0.3.5] Bump to 0.3.4.9-dev
by nickm＠torproject.org 02 Nov '18

02 Nov '18

1 0

[tor/master] Bump to 0.3.4.9-dev
by nickm＠torproject.org 02 Nov '18

02 Nov '18

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 0ea508ec6f540f0c768d993df257a9733fac4074 Merge: 3c691613c 5acf6f871 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:01:53 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid version bump.

1 0

[tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 02 Nov '18

02 Nov '18

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 3d8fcbcbad6c1c41be2745ecfe9f08aad07cdf5f Merge: 339ff694a 0ea508ec6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 13:02:02 2018 -0400 Merge branch 'maint-0.3.5'

1 0

[tor/release-0.3.4] Bump to 0.3.4.9-dev
by nickm＠torproject.org 02 Nov '18

02 Nov '18

1 0

[webwml/master] Mark 0.3.4.9 source as released
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit d5ab67cf4780f0b1fd64d8b7e6bd7600e6022074 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 12:52:21 2018 -0400 Mark 0.3.4.9 source as released --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8346bf23..7bb787d6 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ # branch to your personal webwml repository, open a trac ticket in the # website component, and set it to needs_review. -export STABLETAG=tor-0.3.4.8 +export STABLETAG=tor-0.3.4.9 export DEVTAG=tor-0.3.5.3-alpha WMLBASE=. diff --git a/include/versions.wmi b/include/versions.wmi index d54479c7..154041f6 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,4 +1,4 @@ -<define-tag version-stable whitespace=delete>0.3.4.8</define-tag> +<define-tag version-stable whitespace=delete>0.3.4.9</define-tag> <define-tag version-alpha whitespace=delete>0.3.5.3-alpha</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 02 Nov '18

02 Nov '18

commit 42767d1907ee91dbc8e29d6fdec514442da1c8fb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 2 16:16:47 2018 +0000 Update translations for tails-greeter-2_completed --- ko/ko.po | 334 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 334 insertions(+) diff --git a/ko/ko.po b/ko/ko.po new file mode 100644 index 000000000..cd390fdaa --- /dev/null +++ b/ko/ko.po @@ -0,0 +1,334 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +# Translators: +# Chris Park <utopinator(a)gmail.com>, 2016 +# 이피시소리 <pcsori(a)gmail.com>, 2016 +# cwt96 <cwt967(a)naver.com>, 2016 +# 류종헌, 2016 +# Dr.what <javrick6(a)naver.com>, 2016 +# Revi_, 2017 +# Minori Hiraoka <minori(a)minori.moe>, 2018 +# Oliver Lee <imsesaok(a)tuta.io>, 2018 +# Philipp Sauter <qt123(a)pm.me>, 2018 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-09-04 09:46+0200\n" +"PO-Revision-Date: 2016-11-18 21:29+0000\n" +"Last-Translator: Philipp Sauter <qt123(a)pm.me>, 2018\n" +"Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ko\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../data/greeter.ui.h:1 +msgid "Administration Password" +msgstr "관리 비밀번호" + +#: ../data/greeter.ui.h:2 +msgid "" +"Set up an administration password if you need to perform administrative " +"tasks. Otherwise, the administration password is disabled for better " +"security." +msgstr "" +"관리자 작업을 수행해야 하는 경우 관리자 암호를 설정하십시오. 보안 향상을 위해 관리자 암호는 설정하지 않는 한 비활성화됩니다." + +#: ../data/greeter.ui.h:3 +msgid "Enter an administration password" +msgstr "관리자 암호 입력" + +#: ../data/greeter.ui.h:4 +msgid "Confirm" +msgstr "확인" + +#: ../data/greeter.ui.h:5 +msgid "Confirm your administration password" +msgstr "관리자 암호 확인" + +#: ../data/greeter.ui.h:6 +msgid "Disable" +msgstr "비활성화" + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:8 +msgid "Windows Camouflage" +msgstr "윈도우로 위장" + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:10 +msgid "" +"This option makes Tails look like Microsoft Windows 10. This can be useful " +"to avoid attracting suspicion in public places." +msgstr "이 옵션은 Tails를 마이크로소프트 윈도우 10처럼 보이게 합니다. 공공장소에서 의심을 줄이는 데 유용할 수 있습니다." + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:12 +msgid "Microsoft Windows 10 camouflage" +msgstr "마이크로소프트 윈도우 10 위장" + +#: ../data/greeter.ui.h:13 +msgid "MAC Address Spoofing" +msgstr "MAC 주소 스푸핑" + +#: ../data/greeter.ui.h:14 +msgid "" +"MAC address spoofing hides the serial number of your network interface (Wi-" +"Fi or wired) to the local network. Spoofing MAC addresses is generally safer" +" as it helps you hide your geographical location. But it might also create " +"connectivity problems or look suspicious." +msgstr "" +"MAC 주소를 속이면 로컬 네트워크에서 귀하의 네트워크 인터페이스(와이파이 혹은 유선)의 시리얼 번호를 숨길 수 있습니다. MAC 주소를" +" 속이는 것이 지리적 위치를 숨기는 데 도움이 되므로 보통 더 안전합니다. 하지만 연결 문제가 생기거나 의심을 살 수도 있습니다." + +#: ../data/greeter.ui.h:15 +msgid "Spoof all MAC addresses (default)" +msgstr "MAC 주소 속이기 (기본값)" + +#: ../data/greeter.ui.h:16 +msgid "Don't spoof MAC addresses" +msgstr "MAC 주소 속이지 않기" + +#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532 +msgid "Cannot unlock encrypted storage with this passphrase." +msgstr "이 비밀번호로 암호화 저장소를 열 수 없습니다." + +#: ../data/greeter.ui.h:18 +msgid "" +"You will configure the Tor bridge and local proxy later on after connecting " +"to a network." +msgstr "네트워크에 연결한 뒤 나중에 Tor 브릿지와 로컬 프록시 설정을 하게 됩니다." + +#: ../data/greeter.ui.h:19 +msgid "Welcome to Tails!" +msgstr "Tails에 오신 걸 환영합니다!" + +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:21 +msgctxt "" +msgid "" +"To get guided through Tails' settings, click on <b>Take a Tour</b> above" +msgstr "Tails의 설정에서 이끌리려면 상방의<b>둘러보기</b>에 클릭하십시오." + +#: ../data/greeter.ui.h:22 +msgid "Language & Region" +msgstr "언어 및 지역" + +#: ../data/greeter.ui.h:23 +msgid "Default Settings" +msgstr "기본 설정" + +#: ../data/greeter.ui.h:24 +msgid "Save Language & Region Settings" +msgstr "언어 및 지역 설정 저장" + +#: ../data/greeter.ui.h:25 +msgid "_Language" +msgstr "_언어" + +#: ../data/greeter.ui.h:26 +msgid "_Keyboard Layout" +msgstr "_키보드 배열" + +#: ../data/greeter.ui.h:27 +msgid "_Formats" +msgstr "_포맷" + +#: ../data/greeter.ui.h:28 +msgid "_Time Zone" +msgstr "_시간대" + +#: ../data/greeter.ui.h:29 +msgid "Encrypted _Persistent Storage" +msgstr "암호화된 _영구 저장소" + +#: ../data/greeter.ui.h:30 +msgid "Show Passphrase" +msgstr "비밀번호 보기" + +#: ../data/greeter.ui.h:31 +msgid "Configure Persistent Storage" +msgstr "퍼시스턴트 저장소 설정" + +#: ../data/greeter.ui.h:32 +msgid "Enter your passphrase to unlock the persistent storage" +msgstr "비밀번호를 입력하여 퍼시스턴트 저장소를 여세요" + +#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 +#: ../tailsgreeter/gui.py:528 +msgid "Unlock" +msgstr "잠금 해제" + +#: ../data/greeter.ui.h:34 +msgid "Relock Persistent Storage" +msgstr "퍼시스턴트 저장소 다시 잠금" + +#: ../data/greeter.ui.h:35 +msgid "Your persistent storage is unlocked. Restart Tails to lock it again." +msgstr "퍼시스턴트 저장소가 열렸습니다. 다시 잠그려면 Tails를 재시작하세요." + +#: ../data/greeter.ui.h:36 +msgid "_Additional Settings" +msgstr "_추가 설정" + +#: ../data/greeter.ui.h:37 +msgid "Save Additional Settings" +msgstr "추가 설정 저장" + +#: ../data/greeter.ui.h:38 +msgid "Add an additional setting" +msgstr "추가 설정 추가" + +#: ../data/greeter.ui.h:39 +msgid "Network Configuration" +msgstr "네트워크 설정" + +#: ../data/greeter.ui.h:40 +msgid "" +"If your Internet connection is censored, filtered, or proxied you can " +"configure a Tor bridge or a local proxy. To work completely offline, you can" +" disable all networking." +msgstr "" +"인터넷 연결이 검열, 필터, 혹은 프록시를 사용한다면 Tor 브릿지나 로컬 프록시를 설정할 수 있습니다. 완전히 오프라인으로 작업하고 " +"싶다면, 네트워크 연결을 비활성화 할 수 있습니다." + +#: ../data/greeter.ui.h:41 +msgid "Connect directly to the Tor network (default)" +msgstr "Tor 네트워크에 직접 연결 (기본값)" + +#: ../data/greeter.ui.h:42 +msgid "Configure a Tor bridge or local proxy" +msgstr "Tor 브릿지나 로컬 프록시 설정" + +#: ../data/greeter.ui.h:43 +msgid "Disable all networking" +msgstr " 네트워크 연결을 비활성화" + +#: ../data/greeter.ui.h:44 +msgid "" +"The default settings are safe in most situations. To add a custom setting, " +"press the \"+\" button below." +msgstr "기본 설정은 대부분의 상황에서 안전합니다. 사용자 설정을 추가하려면 아래 \"+\" 버튼을 누르세요." + +#: ../data/greeter.ui.h:45 +msgid "_Administration Password" +msgstr "_관리자 비밀번호" + +#: ../data/greeter.ui.h:46 +msgid "Off (default)" +msgstr "꺼짐 (기본값)" + +#: ../data/greeter.ui.h:47 +msgid "_MAC Address Spoofing" +msgstr "_MAC 주소 속이기" + +#: ../data/greeter.ui.h:48 +msgid "On (default)" +msgstr "켜짐 (기본값)" + +#: ../data/greeter.ui.h:49 +msgid "_Network Connection" +msgstr "_네트워크 연결" + +#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385 +msgid "Direct (default)" +msgstr "직접 연결 (기본값)" + +#: ../data/greeter.ui.h:51 +msgid "_Windows Camouflage" +msgstr "_윈도우로 위장" + +#: ../tailsgreeter/gui.py:391 +msgid "Bridge & Proxy" +msgstr "브릿지 및 프록시" + +#: ../tailsgreeter/gui.py:397 +msgid "Offline" +msgstr "오프라인" + +#: ../tailsgreeter/gui.py:481 +msgid "Failed to relock persistent storage." +msgstr "퍼시스턴트 저장소 재잠금 실패" + +#: ../tailsgreeter/gui.py:499 +msgid "Unlocking…" +msgstr "잠금 해제중..." + +#: ../tailsgreeter/gui.py:594 +msgid "Additional Settings" +msgstr "추가 설정" + +#: ../tailsgreeter/gui.py:602 +msgid "Cancel" +msgstr "취소" + +#: ../tailsgreeter/gui.py:608 +msgid "Add" +msgstr "추가" + +#: ../tailsgreeter/gui.py:616 +msgid "Back" +msgstr "뒤로" + +#: ../tailsgreeter/gui.py:730 +msgid "Shutdown" +msgstr "종료" + +#: ../tailsgreeter/gui.py:735 +msgid "_Start Tails" +msgstr "_Tails 시작" + +#. Translators: please do not translate this string (it is read from +#. Gtk translation) +#: ../tailsgreeter/language.py:136 +msgid "default:LTR" +msgstr "default:LTR" + +#: ../tailsgreeter/persistence.py:91 +#, python-brace-format +msgid "" +"live-persist failed with return code {returncode}:\n" +"{stderr}" +msgstr "" +"live-persist failed with return code {returncode}:\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:124 ../tailsgreeter/persistence.py:141 +#, python-brace-format +msgid "" +"cryptsetup failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"cryptsetup failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:158 +#, python-brace-format +msgid "" +"live-persist failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"live-persist failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:172 +#, python-brace-format +msgid "" +"umount failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"umount failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2018