January 2016 - tor-commits - lists.torproject.org

[tor/maint-0.2.7] Try to fix formatting in manpage
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit 601c82325549c00fb6d3c507c87b3224de44fa3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:52:48 2016 -0500 Try to fix formatting in manpage --- doc/tor.1.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0f605ff..c011bff 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -95,8 +95,7 @@ COMMAND-LINE OPTIONS which tells Tor to only send warnings and errors to the console, or with the **--quiet** option, which tells Tor not to log to the console at all. -[[opt-keygen]] **--keygen** [**--newpass**] - +[[opt-keygen]] **--keygen** [**--newpass**]:: Running "tor --keygen" creates a new ed25519 master identity key for a relay, or only a fresh temporary signing key and certificate, if you already have a master key. Optionally you can encrypt the master identity

1 0

[tor/master] Add descriptions for --keygen to the manpage
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit fb64c55cf87615745e7c59c5bdc660119986bab1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 10:19:29 2016 -0500 Add descriptions for --keygen to the manpage Based on text from s7r --- changes/bug17583 | 4 ++++ doc/tor.1.txt | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/changes/bug17583 b/changes/bug17583 new file mode 100644 index 0000000..d77d467 --- /dev/null +++ b/changes/bug17583 @@ -0,0 +1,4 @@ + o Documentation: + - Add a description of the correct use of the '--keygen' command-line + option. Closes ticket 17583; based on text by 's7r'. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5ea5623..0f605ff 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -95,6 +95,30 @@ COMMAND-LINE OPTIONS which tells Tor to only send warnings and errors to the console, or with the **--quiet** option, which tells Tor not to log to the console at all. +[[opt-keygen]] **--keygen** [**--newpass**] + + Running "tor --keygen" creates a new ed25519 master identity key for a + relay, or only a fresh temporary signing key and certificate, if you + already have a master key. Optionally you can encrypt the master identity + key with a passphrase: Tor will ask you for one. If you don't want to + encrypt the master key, just don't enter any passphrase when asked. + + + + The **--newpass** option should be used with --keygen only when you need + to add, change, or remove a passphrase on an existing ed25519 master + identity key. You will be prompted for the old passphase (if any), + and the new passphrase (if any). + + + + When generating a master key, you will probably want to use + **--DataDirectory** to control where the keys + and certificates will be stored, and **--SigningKeyLifetime** to + control their lifetimes. Their behavior is as documented in the + server options section below. (You must have write access to the specified + DataDirectory.) + + + + To use the generated files, you must copy them to the DataDirectory/keys + directory of your Tor daemon, and make sure that they are owned by the + user actually running the Tor daemon on your system. + Other options can be specified on the command-line in the format "--option value", in the format "option value", or in a configuration file. For instance, you can tell Tor to start listening for SOCKS connections on port @@ -1908,8 +1932,9 @@ is non-zero): [[OfflineMasterKey]] **OfflineMasterKey** **0**|**1**:: If non-zero, the Tor relay will never generate or load its master secret - key. Instead, you'll have to use "tor --keygen" to manage the master - secret key. (Default: 0) + key. Instead, you'll have to use "tor --keygen" to manage the permanent + ed25519 master identity key, as well as the corresponding temporary + signing keys and certificates. (Default: 0) DIRECTORY SERVER OPTIONS ------------------------

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit 6b2087dbe42e2e4a81b5cac9278f81a97f80a1cb Merge: 4770db8 fb64c55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 10:22:06 2016 -0500 Merge branch 'maint-0.2.7' changes/bug17583 | 4 ++++ doc/tor.1.txt | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.7] Add descriptions for --keygen to the manpage
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit fb64c55cf87615745e7c59c5bdc660119986bab1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 10:19:29 2016 -0500 Add descriptions for --keygen to the manpage Based on text from s7r --- changes/bug17583 | 4 ++++ doc/tor.1.txt | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/changes/bug17583 b/changes/bug17583 new file mode 100644 index 0000000..d77d467 --- /dev/null +++ b/changes/bug17583 @@ -0,0 +1,4 @@ + o Documentation: + - Add a description of the correct use of the '--keygen' command-line + option. Closes ticket 17583; based on text by 's7r'. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5ea5623..0f605ff 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -95,6 +95,30 @@ COMMAND-LINE OPTIONS which tells Tor to only send warnings and errors to the console, or with the **--quiet** option, which tells Tor not to log to the console at all. +[[opt-keygen]] **--keygen** [**--newpass**] + + Running "tor --keygen" creates a new ed25519 master identity key for a + relay, or only a fresh temporary signing key and certificate, if you + already have a master key. Optionally you can encrypt the master identity + key with a passphrase: Tor will ask you for one. If you don't want to + encrypt the master key, just don't enter any passphrase when asked. + + + + The **--newpass** option should be used with --keygen only when you need + to add, change, or remove a passphrase on an existing ed25519 master + identity key. You will be prompted for the old passphase (if any), + and the new passphrase (if any). + + + + When generating a master key, you will probably want to use + **--DataDirectory** to control where the keys + and certificates will be stored, and **--SigningKeyLifetime** to + control their lifetimes. Their behavior is as documented in the + server options section below. (You must have write access to the specified + DataDirectory.) + + + + To use the generated files, you must copy them to the DataDirectory/keys + directory of your Tor daemon, and make sure that they are owned by the + user actually running the Tor daemon on your system. + Other options can be specified on the command-line in the format "--option value", in the format "option value", or in a configuration file. For instance, you can tell Tor to start listening for SOCKS connections on port @@ -1908,8 +1932,9 @@ is non-zero): [[OfflineMasterKey]] **OfflineMasterKey** **0**|**1**:: If non-zero, the Tor relay will never generate or load its master secret - key. Instead, you'll have to use "tor --keygen" to manage the master - secret key. (Default: 0) + key. Instead, you'll have to use "tor --keygen" to manage the permanent + ed25519 master identity key, as well as the corresponding temporary + signing keys and certificates. (Default: 0) DIRECTORY SERVER OPTIONS ------------------------

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 28 Jan '16

28 Jan '16

commit 97063a3aa30f77fe4395f70771a980b39dfa16c4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 28 15:15:52 2016 +0000 Update translations for tor-launcher-network-settings_completed --- bg/network-settings.dtd | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bg/network-settings.dtd b/bg/network-settings.dtd index 46165b8..3c4bc72 100644 --- a/bg/network-settings.dtd +++ b/bg/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Кое от следните описва най-добре вашата ситуация?"> <!ENTITY torSettings.configurePrompt1 "Интернет връзката на този компютър е цензурирана или минава през proxy сървър."> -<!ENTITY torSettings.configurePrompt2 "Трябва да конфигурирам bridge или proxy настройки."> +<!ENTITY torSettings.configurePrompt2 "Трябва да конфигурират bridge или proxy настройки преди свързване към Tor мрежата."> <!ENTITY torSettings.configure "Конфигурирай"> <!ENTITY torSettings.connectPrompt2 "Бих искал да се свържа директно към Tor мрежата."> <!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> @@ -22,17 +22,23 @@ <!ENTITY torSettings.proxyPageTitle "Локални прокси настройки"> <!ENTITY torSettings.proxyQuestion "Този компютър използва ли локално прокси за достъп до Интернет?">  -<!ENTITY torSettings.proxyHelp "Ако не сте сигурни как да отговорите на този въпрос проверете интернет настройките на друг браузър,за да видите дали е настроен да използва прокси."> +<!ENTITY torSettings.proxyExplanation1 "В повечето случаи не е необходима локално прокси, но то може да се изисква, когато се свързвате от корпоративна, училищна или университетска мрежа."> +<!ENTITY torSettings.proxyExplanation2 "Ако не сте сигурни как да отговорите на този въпрос, погледнете настройките на Интернет в друг браузър или проверете мрежовите настройки на вашата система, за да видите дали е необходимо локално прокси."> <!ENTITY torSettings.enterProxy "Въведете настройките за прокси."> <!ENTITY torSettings.bridgePageTitle "Настройки на Тор бриджове"> <!ENTITY torSettings.bridgeQuestion "Блокирани или цензурирани ли са връзките към Tor Мрежата от вашият Интернет Доставчик(ISP)?"> -<!ENTITY torSettings.bridgeHelp "Ако не сте сигурни как да отговорите на този въпрос, изберете No.  Ако изберете Yes, вие ще бъдете помолен да конфигурирате Tor Bridges, непубликувани relays които правят блокирането на връзката към Tor Network по трудна."> +<!ENTITY torSettings.bridgeExplanation1 "Ако не сте сигурни как да отговори на този въпрос, изберете Не (ако не сте в състояние да се свържете с Tor мрежата без bridge, може да го добавите по-късно)."> +<!ENTITY torSettings.bridgeExplanation2 "Ако изберете Да, ще бъдете помолени да изберете Tor Bridges, които са неофициални relays, което прави по-трудно да се блокира връзката към Tor мрежата."> <!ENTITY torSettings.bridgeSettingsPrompt "Вие може да използвате предложените комплекти от bridges или може да изисквате персонализиран комплект от тях.">  <!ENTITY torsettings.startingTor "Изчакване на Tor да стартира..."> <!ENTITY torsettings.restartTor "Рестартирайте Тор"> +<!ENTITY torsettings.reconfigTor "Преконфигуриране"> + +<!ENTITY torsettings.discardSettings.prompt "Вие сте конфигурирали Tor bridges или сте въвели местните настройките на прокси сървъра.  За да направите директно свързване към Tor мрежата, тези настройки трябва да бъдат отстранени."> +<!ENTITY torsettings.discardSettings.proceed "Премахване на Настройките и Свързване"> <!ENTITY torsettings.optional "Допълнителен"> @@ -50,6 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Позволени портове:"> <!ENTITY torsettings.useBridges.checkbox "Моят Интернет Доставчик (ISP) блокира връзките към Tor мрежата"> <!ENTITY torsettings.useBridges.default "Свържи се с предоставените bridges"> +<!ENTITY torsettings.useBridges.note "Всеки вид bridge използва различен метод, за да се избегне цензурата.  Ако един bridge не работи, опитайте отново като използвате друг."> <!ENTITY torsettings.useBridges.type "Тип транспортиране:"> <!ENTITY torsettings.useBridges.custom "Въведи персонални bridges"> <!ENTITY torsettings.useBridges.label "Въведи един или повече bridge relays (по един на линия).">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 28 Jan '16

28 Jan '16

commit 83e0877f038283d00975dc42957ff040fd686ce3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 28 15:15:47 2016 +0000 Update translations for tor-launcher-network-settings --- bg/network-settings.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bg/network-settings.dtd b/bg/network-settings.dtd index 94bd5f1..3c4bc72 100644 --- a/bg/network-settings.dtd +++ b/bg/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Кое от следните описва най-добре вашата ситуация?"> <!ENTITY torSettings.configurePrompt1 "Интернет връзката на този компютър е цензурирана или минава през proxy сървър."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Трябва да конфигурират bridge или proxy настройки преди свързване към Tor мрежата."> <!ENTITY torSettings.configure "Конфигурирай"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Бих искал да се свържа директно към Tor мрежата."> <!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> <!ENTITY torSettings.connect "Свържи се"> <!ENTITY torSettings.proxyPageTitle "Локални прокси настройки"> <!ENTITY torSettings.proxyQuestion "Този компютър използва ли локално прокси за достъп до Интернет?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "В повечето случаи не е необходима локално прокси, но то може да се изисква, когато се свързвате от корпоративна, училищна или университетска мрежа."> +<!ENTITY torSettings.proxyExplanation2 "Ако не сте сигурни как да отговорите на този въпрос, погледнете настройките на Интернет в друг браузър или проверете мрежовите настройки на вашата система, за да видите дали е необходимо локално прокси."> <!ENTITY torSettings.enterProxy "Въведете настройките за прокси."> <!ENTITY torSettings.bridgePageTitle "Настройки на Тор бриджове"> <!ENTITY torSettings.bridgeQuestion "Блокирани или цензурирани ли са връзките към Tor Мрежата от вашият Интернет Доставчик(ISP)?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Ако не сте сигурни как да отговори на този въпрос, изберете Не (ако не сте в състояние да се свържете с Tor мрежата без bridge, може да го добавите по-късно)."> +<!ENTITY torSettings.bridgeExplanation2 "Ако изберете Да, ще бъдете помолени да изберете Tor Bridges, които са неофициални relays, което прави по-трудно да се блокира връзката към Tor мрежата."> <!ENTITY torSettings.bridgeSettingsPrompt "Вие може да използвате предложените комплекти от bridges или може да изисквате персонализиран комплект от тях.">  <!ENTITY torsettings.startingTor "Изчакване на Tor да стартира..."> <!ENTITY torsettings.restartTor "Рестартирайте Тор"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Преконфигуриране"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Вие сте конфигурирали Tor bridges или сте въвели местните настройките на прокси сървъра.  За да направите директно свързване към Tor мрежата, тези настройки трябва да бъдат отстранени."> +<!ENTITY torsettings.discardSettings.proceed "Премахване на Настройките и Свързване"> <!ENTITY torsettings.optional "Допълнителен"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Позволени портове:"> <!ENTITY torsettings.useBridges.checkbox "Моят Интернет Доставчик (ISP) блокира връзките към Tor мрежата"> <!ENTITY torsettings.useBridges.default "Свържи се с предоставените bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Всеки вид bridge използва различен метод, за да се избегне цензурата.  Ако един bridge не работи, опитайте отново като използвате друг."> <!ENTITY torsettings.useBridges.type "Тип транспортиране:"> <!ENTITY torsettings.useBridges.custom "Въведи персонални bridges"> <!ENTITY torsettings.useBridges.label "Въведи един или повече bridge relays (по един на линия).">

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 28 Jan '16

28 Jan '16

commit 697a4a2917903b394492aebf13f82b7258e3dccd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 28 15:15:43 2016 +0000 Update translations for tor-launcher-progress_completed --- bg/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg/progress.dtd b/bg/progress.dtd index 45a5ee3..134ee70 100644 --- a/bg/progress.dtd +++ b/bg/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Състояние на Тор"> <!ENTITY torprogress.openSettings "Отвори настройки"> <!ENTITY torprogress.heading "Свързване с Тор мрежата"> -<!ENTITY torprogress.pleaseWait "Моля изчакайте,докато установим връзка с Тор мрежата."> +<!ENTITY torprogress.pleaseWait "Моля изчакайте,докато установим връзка с Тор мрежата..  Toва може да отнеме няколко минути.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 28 Jan '16

28 Jan '16

commit 25f3b82f07b5e4b32980e50c00523d1ec29554f1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 28 15:15:38 2016 +0000 Update translations for tor-launcher-progress --- bg/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg/progress.dtd b/bg/progress.dtd index 1c89f2e..134ee70 100644 --- a/bg/progress.dtd +++ b/bg/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Състояние на Тор"> <!ENTITY torprogress.openSettings "Отвори настройки"> <!ENTITY torprogress.heading "Свързване с Тор мрежата"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Моля изчакайте,докато установим връзка с Тор мрежата..  Toва може да отнеме няколко минути.">

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 28 Jan '16

28 Jan '16

commit bb9d80af6671e2f197b2aea33f2e2b4e9f8bd4ce Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 28 14:45:54 2016 +0000 Update translations for tor-launcher-network-settings_completed --- ru/network-settings.dtd | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd index 41072da..51ecf24 100644 --- a/ru/network-settings.dtd +++ b/ru/network-settings.dtd @@ -13,26 +13,32 @@ <!ENTITY torSettings.firstQuestion "Что лучше описывает вашу ситуацию?"> <!ENTITY torSettings.configurePrompt1 "Интернет-соединение этого компьютера цензурируется или находится за прокси."> -<!ENTITY torSettings.configurePrompt2 "Мне необходимо сконфигурировать настройки моста или локального прокси"> +<!ENTITY torSettings.configurePrompt2 "Необходимо настроить параметры моста или локальный прокси, прежде чем подключаться к сети Tor. "> <!ENTITY torSettings.configure "Настроить"> -<!ENTITY torSettings.connectPrompt2 "Я бы хотел соединиться с сетью Tor напрямую."> +<!ENTITY torSettings.connectPrompt2 "Я хочу напрямую подключиться к сети Tor."> <!ENTITY torSettings.connectPrompt3 "Это должно работать в большинстве ситуаций."> <!ENTITY torSettings.connect "Соединиться"> <!ENTITY torSettings.proxyPageTitle "Настройки локального прокси"> <!ENTITY torSettings.proxyQuestion "Требуется ли этому компьютеру локальный прокси для доступа к Интернету?">  -<!ENTITY torSettings.proxyHelp "Если Вы не уверены в ответе на этот вопрос, посмотрите настройки Интернета в другом браузере, чтобы проверить, настроен ли он для использования локального прокси."> +<!ENTITY torSettings.proxyExplanation1 "В большинстве случаев локальный прокси не нужен, но он может потребоваться при подключении через сеть компании, школы или университета."> +<!ENTITY torSettings.proxyExplanation2 "Если вы не знаете, как ответить на этот вопрос, проверьте настройки интернета другого браузера или проверьте системные настройки своей сети, чтобы посмотреть, нужен ли локальный прокси."> <!ENTITY torSettings.enterProxy "Введите настройки прокси."> <!ENTITY torSettings.bridgePageTitle "Настройки шлюзов Tor"> <!ENTITY torSettings.bridgeQuestion "Ваш провайдер (ISP) блокирует или как-либо цензурирует подключения к сети Tor?"> -<!ENTITY torSettings.bridgeHelp "Если вы не знаете, как ответить на этот вопрос, выбирайте Нет.  Если вы выберете Да, вас попросят настроить мосты Tor, которые являются неопубликованными маршрутизаторами, что затрудняет их блокировку."> +<!ENTITY torSettings.bridgeExplanation1 "Если вы не знаете, как ответить на данный вопрос, выберите "Нет" (если вы не можете подключиться к сети Tor, вы можете ответить позже)."> +<!ENTITY torSettings.bridgeExplanation2 "Если вы выберете "Да", Вам будет предложено настроить Tor мосты, что усложняет блокировку подключения к сети Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Вы можете использовать предопределенный набор мостов или получить и ввести список мостов вручную.">  <!ENTITY torsettings.startingTor "Ожидание запуска Tor..."> <!ENTITY torsettings.restartTor "Перезапустить Tor"> +<!ENTITY torsettings.reconfigTor "Изменить конфигурацию"> + +<!ENTITY torsettings.discardSettings.prompt "Вы настроили Tor мосты или ввели локальные настройки прокси-сервера.  Для прямого подключения к сети Tor эти параметры должны быть удалены."> +<!ENTITY torsettings.discardSettings.proceed "Удалить настройки и подключиться"> <!ENTITY torsettings.optional "Необязательно"> @@ -50,6 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:"> <!ENTITY torsettings.useBridges.checkbox "Мой провайдер блокирует доступ к сети Tor"> <!ENTITY torsettings.useBridges.default "Подключиться к предопределенным мостам"> +<!ENTITY torsettings.useBridges.note "Каждый тип моста использует различные способы избежания цензуры.  Если мост не работает, попробуйте еще раз, используя другой."> <!ENTITY torsettings.useBridges.type "Тип транспорта:"> <!ENTITY torsettings.useBridges.custom "Ввести мосты вручную"> <!ENTITY torsettings.useBridges.label "Введите один или несколько ретрансляторов типа мост (один на строку)">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 28 Jan '16

28 Jan '16

commit 5ec9f308189a6a8ac9e78c06e5f0fe6f61da327d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 28 14:45:50 2016 +0000 Update translations for tor-launcher-network-settings --- ru/network-settings.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd index 229af8e..51ecf24 100644 --- a/ru/network-settings.dtd +++ b/ru/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Что лучше описывает вашу ситуацию?"> <!ENTITY torSettings.configurePrompt1 "Интернет-соединение этого компьютера цензурируется или находится за прокси."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Необходимо настроить параметры моста или локальный прокси, прежде чем подключаться к сети Tor. "> <!ENTITY torSettings.configure "Настроить"> <!ENTITY torSettings.connectPrompt2 "Я хочу напрямую подключиться к сети Tor."> <!ENTITY torSettings.connectPrompt3 "Это должно работать в большинстве ситуаций."> @@ -27,8 +27,8 @@ <!ENTITY torSettings.enterProxy "Введите настройки прокси."> <!ENTITY torSettings.bridgePageTitle "Настройки шлюзов Tor"> <!ENTITY torSettings.bridgeQuestion "Ваш провайдер (ISP) блокирует или как-либо цензурирует подключения к сети Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Если вы не знаете, как ответить на данный вопрос, выберите "Нет" (если вы не можете подключиться к сети Tor, вы можете ответить позже)."> +<!ENTITY torSettings.bridgeExplanation2 "Если вы выберете "Да", Вам будет предложено настроить Tor мосты, что усложняет блокировку подключения к сети Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Вы можете использовать предопределенный набор мостов или получить и ввести список мостов вручную.">  @@ -37,7 +37,7 @@ <!ENTITY torsettings.restartTor "Перезапустить Tor"> <!ENTITY torsettings.reconfigTor "Изменить конфигурацию"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.prompt "Вы настроили Tor мосты или ввели локальные настройки прокси-сервера.  Для прямого подключения к сети Tor эти параметры должны быть удалены."> <!ENTITY torsettings.discardSettings.proceed "Удалить настройки и подключиться"> <!ENTITY torsettings.optional "Необязательно"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:"> <!ENTITY torsettings.useBridges.checkbox "Мой провайдер блокирует доступ к сети Tor"> <!ENTITY torsettings.useBridges.default "Подключиться к предопределенным мостам"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Каждый тип моста использует различные способы избежания цензуры.  Если мост не работает, попробуйте еще раз, используя другой."> <!ENTITY torsettings.useBridges.type "Тип транспорта:"> <!ENTITY torsettings.useBridges.custom "Ввести мосты вручную"> <!ENTITY torsettings.useBridges.label "Введите один или несколько ретрансляторов типа мост (один на строку)">

1 0