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

[tor/master] Use new mock functions in buffer/time_tracking test
by nickm＠torproject.org 21 Jul '16

21 Jul '16

commit 50463524a931ea2a3cc5f2b850bf0d43bd4595c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 11:23:35 2016 +0200 Use new mock functions in buffer/time_tracking test --- src/test/test_buffers.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 95584d5..20a1e34 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -511,26 +511,26 @@ static void test_buffer_time_tracking(void *arg) { buf_t *buf=NULL, *buf2=NULL; - struct timeval tv0; const time_t START = 1389288246; - const uint32_t START_MSEC = (uint32_t) ((uint64_t)START * 1000); + const uint64_t START_NSEC = ((uint64_t)START) * 1000000000; int i; char tmp[4096]; (void)arg; crypto_rand(tmp, sizeof(tmp)); - tv0.tv_sec = START; - tv0.tv_usec = 0; + monotime_enable_test_mocking(); buf = buf_new_with_capacity(3000); /* rounds up to next power of 2. */ tt_assert(buf); + monotime_coarse_set_mock_time_nsec(START_NSEC); + const uint32_t START_MSEC = (uint32_t)monotime_coarse_absolute_msec(); + /* Empty buffer means the timestamp is 0. */ tt_int_op(0, OP_EQ, buf_get_oldest_chunk_timestamp(buf, START_MSEC)); tt_int_op(0, OP_EQ, buf_get_oldest_chunk_timestamp(buf, START_MSEC+1000)); - tor_gettimeofday_cache_set(&tv0); write_to_buf("ABCDEFG", 7, buf); tt_int_op(1000, OP_EQ, buf_get_oldest_chunk_timestamp(buf, START_MSEC+1000)); @@ -540,8 +540,7 @@ test_buffer_time_tracking(void *arg) buf_get_oldest_chunk_timestamp(buf2, START_MSEC+1234)); /* Now add more bytes; enough to overflow the first chunk. */ - tv0.tv_usec += 123 * 1000; - tor_gettimeofday_cache_set(&tv0); + monotime_coarse_set_mock_time_nsec(START_NSEC + 123 * (uint64_t)1000000); for (i = 0; i < 600; ++i) write_to_buf("ABCDEFG", 7, buf); tt_int_op(4207, OP_EQ, buf_datalen(buf)); @@ -562,9 +561,7 @@ test_buffer_time_tracking(void *arg) /* This time we'll be grabbing a chunk from the freelist, and making sure its time gets updated */ - tv0.tv_sec += 5; - tv0.tv_usec = 617*1000; - tor_gettimeofday_cache_set(&tv0); + monotime_coarse_set_mock_time_nsec(START_NSEC + 5617 * (uint64_t)1000000); for (i = 0; i < 600; ++i) write_to_buf("ABCDEFG", 7, buf); tt_int_op(4307, OP_EQ, buf_datalen(buf)); @@ -578,6 +575,7 @@ test_buffer_time_tracking(void *arg) done: buf_free(buf); buf_free(buf2); + monotime_disable_test_mocking(); } static void

1 0

[tor/master] Actually make monotonic time functions mockable.
by nickm＠torproject.org 21 Jul '16

21 Jul '16

commit 2d26b1a54901bff8f508bfebeea3fb471cf36a9d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 11:04:22 2016 +0200 Actually make monotonic time functions mockable. This is different from making the functions mockable, since monotime_t is opaque and so providing mocks for the functions is really hard. --- src/common/compat_time.c | 108 ++++++++++++++++++++++++++++++++++++++++++++--- src/common/compat_time.h | 9 ++++ 2 files changed, 112 insertions(+), 5 deletions(-) diff --git a/src/common/compat_time.c b/src/common/compat_time.c index b7d69cf..52abfeb 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -118,6 +118,74 @@ tor_gettimeofday(struct timeval *timeval) /** True iff monotime_init has been called. */ static int monotime_initialized = 0; +static monotime_t initialized_at; +#ifdef MONOTIME_COARSE_FN_IS_DIFFERENT +static monotime_coarse_t initialized_at_coarse; +#endif + +#ifdef TOR_UNIT_TESTS +/** True if we are running unit tests and overriding the current monotonic + * time. Note that mocked monotonic time might not be monotonic. + */ +static int monotime_mocking_enabled = 0; +static monotime_t initialized_at_saved; + +static int64_t mock_time_nsec = 0; +#ifdef MONOTIME_COARSE_FN_IS_DIFFERENT +static int64_t mock_time_nsec_coarse = 0; +static monotime_coarse_t initialized_at_coarse_saved; +#endif + +void +monotime_enable_test_mocking(void) +{ + if (BUG(monotime_initialized == 0)) { + monotime_init(); + } + + tor_assert_nonfatal(monotime_mocking_enabled == 0); + monotime_mocking_enabled = 1; + memcpy(&initialized_at_saved, + &initialized_at, sizeof(monotime_t)); + memset(&initialized_at, 0, sizeof(monotime_t)); +#ifdef MONOTIME_COARSE_FN_IS_DIFFERENT + memcpy(&initialized_at_coarse_saved, + &initialized_at_coarse, sizeof(monotime_coarse_t)); + memset(&initialized_at_coarse, 0, sizeof(monotime_coarse_t)); +#endif +} + +void +monotime_disable_test_mocking(void) +{ + tor_assert_nonfatal(monotime_mocking_enabled == 1); + monotime_mocking_enabled = 0; + + memcpy(&initialized_at, + &initialized_at_saved, sizeof(monotime_t)); +#ifdef MONOTIME_COARSE_FN_IS_DIFFERENT + memcpy(&initialized_at_coarse, + &initialized_at_coarse_saved, sizeof(monotime_coarse_t)); +#endif +} + +void +monotime_set_mock_time_nsec(int64_t nsec) +{ + tor_assert_nonfatal(monotime_mocking_enabled == 1); + mock_time_nsec = nsec; +} + +#ifdef MONOTIME_COARSE_FN_IS_DIFFERENT +void +monotime_coarse_set_mock_time_nsec(int64_t nsec) +{ + tor_assert_nonfatal(monotime_mocking_enabled == 1); + mock_time_nsec_coarse = nsec; +} +#endif +#endif + /* "ratchet" functions for monotonic time. */ #if defined(_WIN32) || defined(TOR_UNIT_TESTS) @@ -223,6 +291,13 @@ monotime_init_internal(void) void monotime_get(monotime_t *out) { +#ifdef TOR_UNIT_TESTS + if (monotime_mocking_enabled) { + out->abstime_ = (mock_time_nsec * mach_time_info.denom) + / mach_time_info.numer; + return; + } +#endif out->abstime_ = mach_absolute_time(); } @@ -254,6 +329,13 @@ monotime_init_internal(void) void monotime_get(monotime_t *out) { +#ifdef TOR_UNIT_TESTS + if (monotime_mocking_enabled) { + out->ts_.tv_sec = mock_time_nsec / ONE_BILLION; + out->ts_.tv_nsec = mock_time_nsec % ONE_BILLION; + return; + } +#endif int r = clock_gettime(CLOCK_MONOTONIC, &out->ts_); tor_assert(r == 0); } @@ -262,6 +344,13 @@ monotime_get(monotime_t *out) void monotime_coarse_get(monotime_coarse_t *out) { +#ifdef TOR_UNIT_TESTS + if (monotime_mocking_enabled) { + out->ts_.tv_sec = mock_time_nsec_coarse / ONE_BILLION; + out->ts_.tv_nsec = mock_time_nsec_coarse % ONE_BILLION; + return; + } +#endif int r = clock_gettime(CLOCK_MONOTONIC_COARSE, &out->ts_); tor_assert(r == 0); } @@ -323,6 +412,13 @@ monotime_get(monotime_t *out) monotime_init(); } +#ifdef TOR_UNIT_TESTS + if (monotime_mocking_enabled) { + out->pcount_ = (mock_time_nsec * ticks_per_second) / ONE_BILLION; + return; + } +#endif + /* Alas, QueryPerformanceCounter is not always monotonic: see bug list at https://www.python.org/dev/peps/pep-0418/#windows-queryperformancecounter @@ -340,6 +436,13 @@ monotime_get(monotime_t *out) void monotime_coarse_get(monotime_coarse_t *out) { +#ifdef TOR_UNIT_TESTS + if (monotime_mocking_enabled) { + out->tick_count_ = mock_time_nsec_coarse / ONE_MILLION; + return; + } +#endif + if (GetTickCount64_fn) { out->tick_count_ = (int64_t)GetTickCount64_fn(); } else { @@ -424,11 +527,6 @@ monotime_diff_nsec(const monotime_t *start, #error "No way to implement monotonic timers." #endif -static monotime_t initialized_at; -#ifdef MONOTIME_COARSE_FN_IS_DIFFERENT -static monotime_coarse_t initialized_at_coarse; -#endif - /** * Initialize the monotonic timer subsystem. Must be called before any * monotonic timer functions. This function is idempotent. diff --git a/src/common/compat_time.h b/src/common/compat_time.h index 8d61bc2..de6994f 100644 --- a/src/common/compat_time.h +++ b/src/common/compat_time.h @@ -130,6 +130,15 @@ void tor_gettimeofday(struct timeval *timeval); #ifdef TOR_UNIT_TESTS void tor_sleep_msec(int msec); + +void monotime_enable_test_mocking(void); +void monotime_disable_test_mocking(void); +void monotime_set_mock_time_nsec(int64_t); +#if defined(MONOTIME_COARSE_FN_IS_DIFFERENT) +void monotime_coarse_set_mock_time_nsec(int64_t); +#else +#define monotime_coarse_set_mock_time_nsec monotime_set_mock_time_nsec +#endif #endif #ifdef COMPAT_TIME_PRIVATE

1 0

[tor/master] Make monotime test mocking work with oom tests.
by nickm＠torproject.org 21 Jul '16

21 Jul '16

commit 61ce6dcb40df9aee9f6557ebee0a306aecb312ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 12:36:13 2016 +0200 Make monotime test mocking work with oom tests. --- src/or/relay.c | 5 ++- src/test/test_oom.c | 87 +++++++++++++++++++++++++++++------------------------ 2 files changed, 49 insertions(+), 43 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index a815a55..51b33cc 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2626,9 +2626,8 @@ channel_flush_from_first_active_circuit, (channel_t *chan, int max)) if (get_options()->CellStatistics || get_options()->TestingEnableCellStatsEvent) { uint32_t msec_waiting; - struct timeval tvnow; - tor_gettimeofday_cached(&tvnow); - msec_waiting = ((uint32_t)tv_to_msec(&tvnow)) - cell->inserted_time; + uint32_t msec_now = (uint32_t)monotime_coarse_absolute_msec(); + msec_waiting = msec_now - cell->inserted_time; if (get_options()->CellStatistics && !CIRCUIT_IS_ORIGIN(circ)) { or_circ = TO_OR_CIRCUIT(circ); diff --git a/src/test/test_oom.c b/src/test/test_oom.c index 2569b6e..a944464 100644 --- a/src/test/test_oom.c +++ b/src/test/test_oom.c @@ -134,10 +134,12 @@ test_oom_circbuf(void *arg) { or_options_t *options = get_options_mutable(); circuit_t *c1 = NULL, *c2 = NULL, *c3 = NULL, *c4 = NULL; - struct timeval tv = { 1389631048, 0 }; + uint64_t now_ns = 1389631048 * (uint64_t)1000000000; + const uint64_t start_ns = now_ns; (void) arg; + monotime_enable_test_mocking(); MOCK(circuit_mark_for_close_, circuit_mark_for_close_dummy_); /* Far too low for real life. */ @@ -150,11 +152,11 @@ test_oom_circbuf(void *arg) /* Now we're going to fake up some circuits and get them added to the global circuit list. */ - tv.tv_usec = 0; - tor_gettimeofday_cache_set(&tv); + monotime_coarse_set_mock_time_nsec(now_ns); c1 = dummy_origin_circuit_new(30); - tv.tv_usec = 10*1000; - tor_gettimeofday_cache_set(&tv); + + now_ns += 10 * 1000000; + monotime_coarse_set_mock_time_nsec(now_ns); c2 = dummy_or_circuit_new(20, 20); tt_int_op(packed_cell_mem_cost(), OP_EQ, @@ -163,15 +165,15 @@ test_oom_circbuf(void *arg) packed_cell_mem_cost() * 70); tt_int_op(cell_queues_check_size(), OP_EQ, 0); /* We are still not OOM */ - tv.tv_usec = 20*1000; - tor_gettimeofday_cache_set(&tv); + now_ns += 10 * 1000000; + monotime_coarse_set_mock_time_nsec(now_ns); c3 = dummy_or_circuit_new(100, 85); tt_int_op(cell_queues_check_size(), OP_EQ, 0); /* We are still not OOM */ tt_int_op(cell_queues_get_total_allocation(), OP_EQ, packed_cell_mem_cost() * 255); - tv.tv_usec = 30*1000; - tor_gettimeofday_cache_set(&tv); + now_ns += 10 * 1000000; + monotime_coarse_set_mock_time_nsec(now_ns); /* Adding this cell will trigger our OOM handler. */ c4 = dummy_or_circuit_new(2, 0); @@ -189,12 +191,12 @@ test_oom_circbuf(void *arg) packed_cell_mem_cost() * (257 - 30)); circuit_free(c1); - tv.tv_usec = 0; - tor_gettimeofday_cache_set(&tv); /* go back in time */ + + monotime_coarse_set_mock_time_nsec(start_ns); /* go back in time */ c1 = dummy_or_circuit_new(90, 0); - tv.tv_usec = 40*1000; /* go back to the future */ - tor_gettimeofday_cache_set(&tv); + now_ns += 10 * 1000000; + monotime_coarse_set_mock_time_nsec(now_ns); tt_int_op(cell_queues_check_size(), OP_EQ, 1); /* We are now OOM */ @@ -213,6 +215,7 @@ test_oom_circbuf(void *arg) circuit_free(c4); UNMOCK(circuit_mark_for_close_); + monotime_disable_test_mocking(); } /** Run unit tests for buffers.c */ @@ -221,12 +224,14 @@ test_oom_streambuf(void *arg) { or_options_t *options = get_options_mutable(); circuit_t *c1 = NULL, *c2 = NULL, *c3 = NULL, *c4 = NULL, *c5 = NULL; - struct timeval tv = { 1389641159, 0 }; uint32_t tvms; int i; smartlist_t *edgeconns = smartlist_new(); + const uint64_t start_ns = 1389641159 * (uint64_t)1000000000; + uint64_t now_ns = start_ns; (void) arg; + monotime_enable_test_mocking(); MOCK(circuit_mark_for_close_, circuit_mark_for_close_dummy_); @@ -238,54 +243,56 @@ test_oom_streambuf(void *arg) tt_int_op(cell_queues_get_total_allocation(), OP_EQ, 0); tt_int_op(buf_get_total_allocation(), OP_EQ, 0); + monotime_coarse_set_mock_time_nsec(start_ns); + /* Start all circuits with a bit of data queued in cells */ - tv.tv_usec = 500*1000; /* go halfway into the second. */ - tor_gettimeofday_cache_set(&tv); + + /* go halfway into the second. */ + monotime_coarse_set_mock_time_nsec(start_ns + 500 * 1000000); c1 = dummy_or_circuit_new(10,10); - tv.tv_usec = 510*1000; - tor_gettimeofday_cache_set(&tv); + + monotime_coarse_set_mock_time_nsec(start_ns + 510 * 1000000); c2 = dummy_origin_circuit_new(20); - tv.tv_usec = 520*1000; - tor_gettimeofday_cache_set(&tv); + monotime_coarse_set_mock_time_nsec(start_ns + 520 * 1000000); c3 = dummy_or_circuit_new(20,20); - tv.tv_usec = 530*1000; - tor_gettimeofday_cache_set(&tv); + monotime_coarse_set_mock_time_nsec(start_ns + 530 * 1000000); c4 = dummy_or_circuit_new(0,0); tt_int_op(cell_queues_get_total_allocation(), OP_EQ, packed_cell_mem_cost() * 80); - tv.tv_usec = 600*1000; - tor_gettimeofday_cache_set(&tv); + now_ns = start_ns + 600 * 1000000; + monotime_coarse_set_mock_time_nsec(now_ns); /* Add some connections to c1...c4. */ for (i = 0; i < 4; ++i) { edge_connection_t *ec; /* link it to a circuit */ - tv.tv_usec += 10*1000; - tor_gettimeofday_cache_set(&tv); + now_ns += 10 * 1000000; + monotime_coarse_set_mock_time_nsec(now_ns); ec = dummy_edge_conn_new(c1, CONN_TYPE_EXIT, 1000, 1000); tt_assert(ec); smartlist_add(edgeconns, ec); - tv.tv_usec += 10*1000; - tor_gettimeofday_cache_set(&tv); + now_ns += 10 * 1000000; + monotime_coarse_set_mock_time_nsec(now_ns); ec = dummy_edge_conn_new(c2, CONN_TYPE_AP, 1000, 1000); tt_assert(ec); smartlist_add(edgeconns, ec); - tv.tv_usec += 10*1000; - tor_gettimeofday_cache_set(&tv); + now_ns += 10 * 1000000; + monotime_coarse_set_mock_time_nsec(now_ns); ec = dummy_edge_conn_new(c4, CONN_TYPE_EXIT, 1000, 1000); /* Yes, 4 twice*/ tt_assert(ec); smartlist_add(edgeconns, ec); - tv.tv_usec += 10*1000; - tor_gettimeofday_cache_set(&tv); + now_ns += 10 * 1000000; + monotime_coarse_set_mock_time_nsec(now_ns); ec = dummy_edge_conn_new(c4, CONN_TYPE_EXIT, 1000, 1000); smartlist_add(edgeconns, ec); tt_assert(ec); } - tv.tv_sec += 1; - tv.tv_usec = 0; - tvms = (uint32_t) tv_to_msec(&tv); + now_ns -= now_ns % 1000000000; + now_ns += 1000000000; + monotime_coarse_set_mock_time_nsec(now_ns); + tvms = (uint32_t) monotime_coarse_absolute_msec(); tt_int_op(circuit_max_queued_cell_age(c1, tvms), OP_EQ, 500); tt_int_op(circuit_max_queued_cell_age(c2, tvms), OP_EQ, 490); @@ -309,9 +316,8 @@ test_oom_streambuf(void *arg) /* Now give c4 a very old buffer of modest size */ { edge_connection_t *ec; - tv.tv_sec -= 1; - tv.tv_usec = 0; - tor_gettimeofday_cache_set(&tv); + now_ns -= 1000000000; + monotime_coarse_set_mock_time_nsec(now_ns); ec = dummy_edge_conn_new(c4, CONN_TYPE_EXIT, 1000, 1000); tt_assert(ec); smartlist_add(edgeconns, ec); @@ -322,8 +328,8 @@ test_oom_streambuf(void *arg) tt_int_op(cell_queues_check_size(), OP_EQ, 0); /* And run over the limit. */ - tv.tv_usec = 800*1000; - tor_gettimeofday_cache_set(&tv); + now_ns += 800*1000000; + monotime_coarse_set_mock_time_nsec(now_ns); c5 = dummy_or_circuit_new(0,5); tt_int_op(cell_queues_get_total_allocation(), OP_EQ, @@ -355,6 +361,7 @@ test_oom_streambuf(void *arg) smartlist_free(edgeconns); UNMOCK(circuit_mark_for_close_); + monotime_disable_test_mocking(); } struct testcase_t oom_tests[] = {

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 21 Jul '16

21 Jul '16

commit 1113c114ce5482382926b6ceddba7fceb5a9224f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 21 09:15:32 2016 +0000 Update translations for https_everywhere_completed --- pt/https-everywhere.dtd | 2 +- pt/ssl-observatory.dtd | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index f92519a..9d22e68 100644 --- a/pt/https-everywhere.dtd +++ b/pt/https-everywhere.dtd @@ -15,7 +15,7 @@ <!ENTITY https-everywhere.about.or "ou"> <!ENTITY https-everywhere.about.donate_eff "Doar à EFF"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donativos a EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Donativos à EFF"> <!ENTITY https-everywhere.menu.about "Sobre o HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "Preferências do Observatório de SSL"> <!ENTITY https-everywhere.menu.globalEnable "Ativar HTTPS Everywhere"> diff --git a/pt/ssl-observatory.dtd b/pt/ssl-observatory.dtd index 3395a71..6d844a9 100644 --- a/pt/ssl-observatory.dtd +++ b/pt/ssl-observatory.dtd @@ -54,7 +54,7 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.explanation "O HTTPS Everywhere pode utilizar o observatório SSL da EFF. Isto faz duas coisas: (1) -envia as cópias dos certificados HTTPS para o bservatório e ajuda-nos a detetar os ataques 'man in the middle' e ajuda-nos a melhorar a segurança na Web e (2) +envia as cópias dos certificados HTTPS para o observatório, ajudando-nos a detetar os ataques 'man in the middle' e a melhorar a segurança na Web e (2) permite-nos avisar os utilizadores sobre as ligações inseguras ou sobre os ataques ao seu navegador."> <!--<!ENTITY ssl-observatory.prefs.explanation2 @@ -72,10 +72,10 @@ Passe com o rato pelas opções para mais informações:"> <!ENTITY ssl-observatory.prefs.hide "Ocultar opções avançadas"> <!ENTITY ssl-observatory.prefs.nonanon -"Verificar os certificados mesmo que o Tor não esteja disponível"> +"Verificar certificados mesmo que o Tor não esteja disponível"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -"Iremos tentar manter os seus dados protegidos, mas esta opção é um pouco menos segura"> +"Tentaremos manter os seus dados protegidos, mas esta opção é um pouco menos segura"> <!ENTITY ssl-observatory.prefs.priv_dns "Submeter e verificar certificados para nomes de DNS não públicos"> @@ -87,12 +87,12 @@ Passe com o rato pelas opções para mais informações:"> <!ENTITY ssl-observatory.prefs.title "Preferências do observatório SSL"> -<!ENTITY ssl-observatory.prefs.use "Utilizar o observatório?"> +<!ENTITY ssl-observatory.prefs.use "Utilizar observatório?"> <!ENTITY ssl-observatory.warning.title "Aviso do observatório SSL da EFF"> <!ENTITY ssl-observatory.warning.showcert "Mostrar a cadeia do certificado"> <!ENTITY ssl-observatory.warning.okay "Eu percebo"> -<!ENTITY ssl-observatory.warning.text "O obvservatório SSL da EFF emitiu um aviso sobre o certificado(s) HTTPS deste site:"> -<!ENTITY ssl-observatory.warning.defense "Se iniciou a sessão neste sítio, pode ser aconselhável alterar a sua palavra-passe assim que estabelecer uma ligação segura. (Estes avisos podem ser desativados no separador "Observatório SSL" nas preferências do HTTPS Everywhere)."> +<!ENTITY ssl-observatory.warning.text "O observatório SSL da EFF emitiu um aviso sobre o certificado(s) HTTPS deste site:"> +<!ENTITY ssl-observatory.warning.defense "Se iniciou a sessão neste site, pode ser aconselhável alterar a sua palavra-passe assim que estabelecer uma ligação segura. (Estes avisos podem ser desativados no separador "Observatório SSL" nas preferências do HTTPS Everywhere)."> <!ENTITY ssl-observatory.prefs.self_signed "Submeter e verificar os certificados auto-assinados">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 21 Jul '16

21 Jul '16

commit 51fc597e8869a6f498b84cac4db6f980fdad7197 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 21 09:15:26 2016 +0000 Update translations for https_everywhere --- pt/https-everywhere.dtd | 2 +- pt/ssl-observatory.dtd | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index f92519a..9d22e68 100644 --- a/pt/https-everywhere.dtd +++ b/pt/https-everywhere.dtd @@ -15,7 +15,7 @@ <!ENTITY https-everywhere.about.or "ou"> <!ENTITY https-everywhere.about.donate_eff "Doar à EFF"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donativos a EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Donativos à EFF"> <!ENTITY https-everywhere.menu.about "Sobre o HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "Preferências do Observatório de SSL"> <!ENTITY https-everywhere.menu.globalEnable "Ativar HTTPS Everywhere"> diff --git a/pt/ssl-observatory.dtd b/pt/ssl-observatory.dtd index 3395a71..6d844a9 100644 --- a/pt/ssl-observatory.dtd +++ b/pt/ssl-observatory.dtd @@ -54,7 +54,7 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.explanation "O HTTPS Everywhere pode utilizar o observatório SSL da EFF. Isto faz duas coisas: (1) -envia as cópias dos certificados HTTPS para o bservatório e ajuda-nos a detetar os ataques 'man in the middle' e ajuda-nos a melhorar a segurança na Web e (2) +envia as cópias dos certificados HTTPS para o observatório, ajudando-nos a detetar os ataques 'man in the middle' e a melhorar a segurança na Web e (2) permite-nos avisar os utilizadores sobre as ligações inseguras ou sobre os ataques ao seu navegador."> <!--<!ENTITY ssl-observatory.prefs.explanation2 @@ -72,10 +72,10 @@ Passe com o rato pelas opções para mais informações:"> <!ENTITY ssl-observatory.prefs.hide "Ocultar opções avançadas"> <!ENTITY ssl-observatory.prefs.nonanon -"Verificar os certificados mesmo que o Tor não esteja disponível"> +"Verificar certificados mesmo que o Tor não esteja disponível"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -"Iremos tentar manter os seus dados protegidos, mas esta opção é um pouco menos segura"> +"Tentaremos manter os seus dados protegidos, mas esta opção é um pouco menos segura"> <!ENTITY ssl-observatory.prefs.priv_dns "Submeter e verificar certificados para nomes de DNS não públicos"> @@ -87,12 +87,12 @@ Passe com o rato pelas opções para mais informações:"> <!ENTITY ssl-observatory.prefs.title "Preferências do observatório SSL"> -<!ENTITY ssl-observatory.prefs.use "Utilizar o observatório?"> +<!ENTITY ssl-observatory.prefs.use "Utilizar observatório?"> <!ENTITY ssl-observatory.warning.title "Aviso do observatório SSL da EFF"> <!ENTITY ssl-observatory.warning.showcert "Mostrar a cadeia do certificado"> <!ENTITY ssl-observatory.warning.okay "Eu percebo"> -<!ENTITY ssl-observatory.warning.text "O obvservatório SSL da EFF emitiu um aviso sobre o certificado(s) HTTPS deste site:"> -<!ENTITY ssl-observatory.warning.defense "Se iniciou a sessão neste sítio, pode ser aconselhável alterar a sua palavra-passe assim que estabelecer uma ligação segura. (Estes avisos podem ser desativados no separador "Observatório SSL" nas preferências do HTTPS Everywhere)."> +<!ENTITY ssl-observatory.warning.text "O observatório SSL da EFF emitiu um aviso sobre o certificado(s) HTTPS deste site:"> +<!ENTITY ssl-observatory.warning.defense "Se iniciou a sessão neste site, pode ser aconselhável alterar a sua palavra-passe assim que estabelecer uma ligação segura. (Estes avisos podem ser desativados no separador "Observatório SSL" nas preferências do HTTPS Everywhere)."> <!ENTITY ssl-observatory.prefs.self_signed "Submeter e verificar os certificados auto-assinados">

1 0

[tor/master] Revert "Make the monotonic{_coarse, }_get() functions mockable."
by nickm＠torproject.org 21 Jul '16

21 Jul '16

commit 72a1f0180dbbc0a96e128d940b53ebf0f1c570d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 10:30:21 2016 +0200 Revert "Make the monotonic{_coarse,}_get() functions mockable." This reverts commit 2999f0b33fec8e91ba8e4680d3f9d03b09fe9501. --- src/common/compat_time.c | 24 ++++++++++++------------ src/common/compat_time.h | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 974cf32..b7d69cf 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -220,8 +220,8 @@ monotime_init_internal(void) /** * Set "out" to the most recent monotonic time value */ -MOCK_IMPL(void, -monotime_get,(monotime_t *out)) +void +monotime_get(monotime_t *out) { out->abstime_ = mach_absolute_time(); } @@ -251,16 +251,16 @@ monotime_init_internal(void) /* no action needed. */ } -MOCK_IMPL(void, -monotime_get,(monotime_t *out)) +void +monotime_get(monotime_t *out) { int r = clock_gettime(CLOCK_MONOTONIC, &out->ts_); tor_assert(r == 0); } #ifdef CLOCK_MONOTONIC_COARSE -MOCK_IMPL(void, -monotime_coarse_get,(monotime_coarse_t *out)) +void +monotime_coarse_get(monotime_coarse_t *out) { int r = clock_gettime(CLOCK_MONOTONIC_COARSE, &out->ts_); tor_assert(r == 0); @@ -316,8 +316,8 @@ monotime_init_internal(void) // FreeLibrary(h) ? } -MOCK_IMPL(void, -monotime_get,(monotime_t *out)) +void +monotime_get(monotime_t *out) { if (BUG(monotime_initialized == 0)) { monotime_init(); @@ -337,8 +337,8 @@ monotime_get,(monotime_t *out)) LeaveCriticalSection(&monotime_lock); } -MOCK_IMPL(void, -monotime_coarse_get,(monotime_coarse_t *out)) +void +monotime_coarse_get(monotime_coarse_t *out) { if (GetTickCount64_fn) { out->tick_count_ = (int64_t)GetTickCount64_fn(); @@ -396,8 +396,8 @@ monotime_init_internal(void) tor_mutex_init(&monotime_lock); } -MOCK_IMPL(void, -monotime_get,(monotime_t *out)) +void +monotime_get(monotime_t *out) { if (BUG(monotime_initialized == 0)) { monotime_init(); diff --git a/src/common/compat_time.h b/src/common/compat_time.h index 206e5b6..8d61bc2 100644 --- a/src/common/compat_time.h +++ b/src/common/compat_time.h @@ -72,7 +72,7 @@ void monotime_init(void); /** * Set out to the current time. */ -MOCK_DECL(void, monotime_get, (monotime_t *out)); +void monotime_get(monotime_t *out); /** * Return the number of nanoseconds between start and end. */ @@ -102,7 +102,7 @@ uint64_t monotime_absolute_msec(void); /** * Set out to the current coarse time. */ -MOCK_DECL(void, monotime_coarse_get, (monotime_coarse_t *out)); +void monotime_coarse_get(monotime_coarse_t *out); uint64_t monotime_coarse_absolute_nsec(void); uint64_t monotime_coarse_absolute_usec(void); uint64_t monotime_coarse_absolute_msec(void);

1 0

[tor/master] Make the monotonic{_coarse, }_get() functions mockable.
by nickm＠torproject.org 21 Jul '16

21 Jul '16

commit 2999f0b33fec8e91ba8e4680d3f9d03b09fe9501 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 10:25:23 2016 +0200 Make the monotonic{_coarse,}_get() functions mockable. --- src/common/compat_time.c | 24 ++++++++++++------------ src/common/compat_time.h | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/common/compat_time.c b/src/common/compat_time.c index b7d69cf..974cf32 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -220,8 +220,8 @@ monotime_init_internal(void) /** * Set "out" to the most recent monotonic time value */ -void -monotime_get(monotime_t *out) +MOCK_IMPL(void, +monotime_get,(monotime_t *out)) { out->abstime_ = mach_absolute_time(); } @@ -251,16 +251,16 @@ monotime_init_internal(void) /* no action needed. */ } -void -monotime_get(monotime_t *out) +MOCK_IMPL(void, +monotime_get,(monotime_t *out)) { int r = clock_gettime(CLOCK_MONOTONIC, &out->ts_); tor_assert(r == 0); } #ifdef CLOCK_MONOTONIC_COARSE -void -monotime_coarse_get(monotime_coarse_t *out) +MOCK_IMPL(void, +monotime_coarse_get,(monotime_coarse_t *out)) { int r = clock_gettime(CLOCK_MONOTONIC_COARSE, &out->ts_); tor_assert(r == 0); @@ -316,8 +316,8 @@ monotime_init_internal(void) // FreeLibrary(h) ? } -void -monotime_get(monotime_t *out) +MOCK_IMPL(void, +monotime_get,(monotime_t *out)) { if (BUG(monotime_initialized == 0)) { monotime_init(); @@ -337,8 +337,8 @@ monotime_get(monotime_t *out) LeaveCriticalSection(&monotime_lock); } -void -monotime_coarse_get(monotime_coarse_t *out) +MOCK_IMPL(void, +monotime_coarse_get,(monotime_coarse_t *out)) { if (GetTickCount64_fn) { out->tick_count_ = (int64_t)GetTickCount64_fn(); @@ -396,8 +396,8 @@ monotime_init_internal(void) tor_mutex_init(&monotime_lock); } -void -monotime_get(monotime_t *out) +MOCK_IMPL(void, +monotime_get,(monotime_t *out)) { if (BUG(monotime_initialized == 0)) { monotime_init(); diff --git a/src/common/compat_time.h b/src/common/compat_time.h index 8d61bc2..206e5b6 100644 --- a/src/common/compat_time.h +++ b/src/common/compat_time.h @@ -72,7 +72,7 @@ void monotime_init(void); /** * Set out to the current time. */ -void monotime_get(monotime_t *out); +MOCK_DECL(void, monotime_get, (monotime_t *out)); /** * Return the number of nanoseconds between start and end. */ @@ -102,7 +102,7 @@ uint64_t monotime_absolute_msec(void); /** * Set out to the current coarse time. */ -void monotime_coarse_get(monotime_coarse_t *out); +MOCK_DECL(void, monotime_coarse_get, (monotime_coarse_t *out)); uint64_t monotime_coarse_absolute_nsec(void); uint64_t monotime_coarse_absolute_usec(void); uint64_t monotime_coarse_absolute_msec(void);

1 0

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 21 Jul '16

21 Jul '16

commit f889c73ee02073cd376756157d8ffb877f5b5558 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 21 05:48:01 2016 +0000 Update translations for tor-messenger-ircproperties_completed --- ja/irc.properties | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) diff --git a/ja/irc.properties b/ja/irc.properties new file mode 100644 index 0000000..3aa1b14 --- /dev/null +++ b/ja/irc.properties @@ -0,0 +1,208 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# LOCALIZATION NOTE (irc.usernameHint): +# This is displayed inside the accountUsernameInfoWithDescription +# string defined in imAccounts.properties when the user is +# configuring an IRC account. +irc.usernameHint=ニックネーム + +# LOCALIZATION NOTE (connection.error.*): +# These will show in the account manager if the account is +# disconnected because of an error. +connection.error.lost=サーバーとの接続が切断されました +connection.error.timeOut=接続がタイムアウトしました +connection.error.invalidUsername=%S はユーザーネームにできません +connection.error.invalidPassword=サーバーパスワードが間違っています +connection.error.passwordRequired=パスワードが必要です + +# LOCALIZATION NOTE (joinChat.*): +# These show up on the join chat menu. An underscore is for the access key. +joinChat.channel=チャンネル(_C) +joinChat.password=パスワード(_P) + +# LOCALIZATION NOTE (options.*): +# These are the protocol specific options shown in the account manager and +# account wizard windows. +options.server=サーバー +options.port=ポート +options.ssl=SSLを使用する +options.encoding=文字セット +options.quitMessage=終了メッセージ +options.partMessage=離席メッセージ +options.showServerTab=サーバからのメッセージを表示 +options.alternateNicks=別のニックネーム + +# LOCALIZATION NOTE (ctcp.version): +# %1$S is the nickname of the user whose version was requested. +# %2$S is the version response from the client. +ctcp.version=%1$S は "%2$S" を使用しています。 +# LOCALIZATION NOTE (ctcp.time): +# %1$S is the nickname of the user whose time was requested. +# %2$S is the time response. +ctcp.time=%1$Sの時間は%2$Sです。 + +# LOCALZIATION NOTE (command.*): +# These are the help messages for each command, the %S is the command name +# Each command first gives the parameter it accepts and then a description of +# the command. +command.action=%S <実行する動作>: 動作を実行します。 +command.ctcp=%S <ニックネーム> <メッセージ>: 対象の人物宛に CTCP メッセージを送信します。 +command.chanserv=%S <コマンド>: ChanServ にコマンドを送信します。 +command.deop=%S <ニックネーム1>[,<ニックネーム2>]*: 対象の人物のチャンネルオペレーター権限を剥奪します。実行するためにはあなたがチャンネルオペレーターである必要があります。 +command.devoice=%S <ニックネーム1>[,<ニックネーム2>]*: 対象の人物のチャンネルボイスステータスを剥奪します。実行するためにはあなたがチャンネルオペレーターである必要があります。 +command.invite2=%S <ニックネーム>[ <ニックネーム>]* [<チャンネル>]: 対象の人物を現在のあなたのチャンネルか、指定したチャンネルに招待します。 +command.join=%S <部屋1>[ <キー1>][,<部屋2>[ <キー2>]]*: 指定したチャンネルに入ります。必要であればそれぞれの部屋に対応するキーを指定できます。 +command.kick=%S <ニックネーム> [<メッセージ>]: 誰かをチャンネルから追い出します。実行するためにはあなたがチャンネルオペレーターである必要があります。 +command.list=%S: ネットワーク上のチャット部屋の一覧を表示します。サーバーによっては、この操作を行うとあなたとの接続を切断することがあります。 +command.memoserv=%S <コマンド>: MemoServ にコマンドを送信します。 +command.modeUser=%S (+|-)<新しいモード> [<ニックネーム>]: ユーザーのモードをオンまたはオフにします。 +command.modeChannel=%S <チャンネル>[ (+|-)<新しいモード> [<パラメーター>][,<パラメーター>]*]: チャンネルモードを取得または設定します。 +command.msg=%S <ニックネーム> <メッセージ>: ユーザにプライベートメッセージを送信します。（チャンネルにではなく） +command.nick=%S <新しいニックネーム>：自分のニックネームを変更します。 +command.nickserv=%S <コマンド>: NickServ にコマンドを送信します。 +command.notice=%S <ターゲット> <メッセージ>：ユーザかチャンネルに通知を送信します。 +command.op=%S <ニックネーム1>[,<ニックネーム2>]*: 対象の人物にチャンネルオペレーター権限を付与します。実行するためにはあなたがチャンネルオペレーターである必要があります。 +command.operserv=%S <コマンド>: OperServ にコマンドを送信します。 +command.part=%S [メッセージ]：現在のチャンネルを離れる。オプションでメッセージをつけられます。 +command.ping=%S [<ニックネーム>]: ユーザー（またはユーザーが指定されていない場合はサーバー）までの遅延を調査します。 +command.quit=%S <メッセージ>：サーバーへの接続を解除。オプションでメッセージをつけられます。 +command.quote=%S <コマンド>: このサーバーに生のコマンドを送信します。 +command.time=%S: IRCサーバーでの現在の現地時刻を表示します。 +command.topic=%S [<新しい話題>]: このチャンネルに話題を設定します。 +command.umode=%S (+|-)<新しいモード>: ユーザーのモードをオンまたはオフにします。 +command.version=%S <ニックネーム>: ユーザーの使用するクライアントのバージョンを要求します。 +command.voice=%S <ニックネーム1>[,<ニックネーム2>]*: 対象の人物にチャンネル投票権限を付与します。実行するためにはあなたがチャンネルオペレーターである必要があります。 +command.whois2=%S [<ニックネーム>]: ユーザーの情報を取得します。 + +# LOCALIZATION NOTE (message.*): +# These are shown as system messages in the conversation. +# %1$S is the nick and %2$S is the nick and host of the user who joined. +message.join=%1$S [%2$S] が入室しました。 +message.rejoined=あなたは部屋に再び入りました。 +# %1$S is the nick of who kicked you. +# %2$S is message.kicked.reason, if a kick message was given. +message.kicked.you=あなたは %1$S%2$S に追い出されました。 +# %1$S is the nick that is kicked, %2$S the nick of the person who kicked +# %1$S. %3$S is message.kicked.reason, if a kick message was given. +message.kicked=%1$S は %2$S%3$S に追い出されました。 +# %S is the kick message +message.kicked.reason=: %S +# %1$S is the new mode, %2$S is the nickname of the user whose mode +# was changed, and %3$S is who set the mode. +message.usermode=%2$S のモード %1$S は %3$S が設定しました。 +# %1$S is the new channel mode and %2$S is who set the mode. +message.channelmode=チャンネルのモード %1$S は %2$S が設定しました。 +# %S is the user's mode. +message.yourmode=あなたのモードは %S です。 +# Could not change the nickname. %S is the user's nick. +message.nick.fail=希望のニックネームは使用できませんでした。あなたのニックネームは %S のままです。 +# The parameter is the message.parted.reason, if a part message is given. +message.parted.you=あなたは部屋を去りました (Part%1$S)。 +# %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given. +message.parted=%1$S は部屋を去りました (Part%2$S)。 +# %S is the part message supplied by the user. +message.parted.reason=: %S +# %1$S is the user's nick, %2$S is message.quit2 if a quit message is given. +message.quit=%1$S は部屋を去りました (Quit%2$S)。 +# The parameter is the quit message given by the user. +message.quit2=: %S +# %1$S is the nickname of the user that invited us, %2$S is the conversation +# name. +message.inviteReceived=%1$S はあなたを %2$S に招待しました。 +# %1$S is the nickname of the invited user, %2$S is the conversation name +# they were invited to. +message.invited=%1$S は無事に %2$S に招待されました。 +# %1$S is the nickname of the invited user, %2$S is the conversation name +# they were invited to but are already in +message.alreadyInChannel=%1$S は既に %2$S にいます。 +# %S is the nickname of the user who was summoned. +message.summoned=%S は招喚されました。 +# %S is the nickname of the user whose WHOIS information follows this message. +message.whois=%S のWHOIS情報： +# %1$S is the nickname of the (offline) user whose WHOWAS information follows this message. +message.whowas=%1$S はオフラインです。%1$S のWHOWAS情報： +# %1$S is the entry description (from tooltip.*), %2$S is its value. +message.whoisEntry=\\ua0\\ua0\\ua0\\ua0%1$S: %2$S +# %S is the nickname that is not known to the server. +message.unknownNick=%S は不明なニックネームです。 +# %1$S is the nickname of the user who changed the mode and %2$S is the new +# channel key (password). +message.channelKeyAdded=%1$S はチャンネルパスワードを %2$S に変更しました。 +message.channelKeyRemoved=%S はチャンネルパスワードを削除しました。 +# This will be followed by a list of ban masks. +message.banMasks=以下の場所から接続するユーザーは %S から締め出されています： +message.noBanMasks=%S には禁止された場所は存在しません。 +message.banMaskAdded=%1$S に一致する場所から接続するユーザーは %2$S によって締め出されています。 +message.banMaskRemoved=%1$S に一致する場所から接続するユーザーはもう%2$S によって締め出されていません。 +# LOCALIZATION NOTE (message.ping): Semi-colon list of plural forms. +# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals +# %1$S is the nickname of the user or the server that was pinged. +# #2 is the delay (in milliseconds). +message.ping=%1$S からの Ping 応答は #2 ミリ秒かかりました。 + + +# LOCALIZATION NOTE (error.*): +# These are shown as error messages in the conversation or server tab. +# %S is the channel name. +error.noChannel=チャンネルは存在しません： %S。 +error.tooManyChannels=%S に参加できませんでした。あなたは多くのチャンネルに参加し過ぎました。 +# %1$S is your new nick, %2$S is the kill message from the server. +error.nickCollision=%1$S [%2$S] にニックネームを変更中、このニックネームは既に使用されています。 +error.erroneousNickname=%S はニックネームとして認められていません。 +error.banned=あなたはこのサーバーから締め出されました。 +error.bannedSoon=あなたは間もなくこのサーバーから締め出されます。 +error.mode.wrongUser=あなたは他人のモードを変更することはできません。 +# %S is the nickname or channel name that isn't available. +error.noSuchNick=%S はオンラインではありません。 +error.wasNoSuchNick=ニックネームは存在しません： %S +error.noSuchChannel=チャンネルは存在しません： %S。 +error.unavailable=%S は一時的に利用できなくなっています。 +# %S is the channel name. +error.channelBanned=あなたは %S から締め出されました。 +error.cannotSendToChannel=あなたは %S にメッセージを送信できません。 +error.channelFull=チャンネル %S はいっぱいです。 +error.inviteOnly=%S に参加するには、招待される必要があります。 +error.nonUniqueTarget=%S は一意なユーザー名@ホスト名または短縮名ではないか、一度に多くのチャンネルに参加しようとしました。 +error.notChannelOp=あなたは %S のチャンネルオペレーターではありません。 +error.notChannelOwner=あなたは %S のチャンネル所有者ではありません。 +error.wrongKey=%S に参加できませんでした。無効なチャンネルパスワード。 +error.sendMessageFailed=あなたのいまのメッセージを送信中にエラーが発生しました。再接続された後にもう一度お試しください。 +# %1$S is the channel the user tried to join, %2$S is the channel +# he was forwarded to. +error.channelForward=あなたは %1$S に参加することはできず、自動的に %2$S にリダイレクトされました。 +# %S is the mode that the user tried to set but was not recognized +# by the server as a valid mode. +error.unknownMode='%S' はこのサーバー上で有効なユーザーモードではありません。 + +# LOCALIZATION NOTE (tooltip.*): +# These are the descriptions given in a tooltip with information received +# from a whois response. +# The human readable ("realname") description of the user. +tooltip.realname=名前 +tooltip.server=接続先 +# The username and hostname that the user connects from (usually based on the +# reverse DNS of the user's IP, but often mangled by the server to +# protect users). +tooltip.connectedFrom=接続元 +tooltip.registered=登録済み +tooltip.registeredAs=このように登録されています +tooltip.secure=安全な接続を使用中 +# The away message of the user +tooltip.away=不在 +tooltip.ircOp=IRCオペレータ +tooltip.bot=Bot +tooltip.lastActivity=最後の活動 +# %S is the timespan elapsed since the last activity. +tooltip.timespan=%S 前 +tooltip.channels=いまいるところ： + +# %1$S is the server name, %2$S is some generic server information (usually a +# location or the date the user was last seen). +tooltip.serverValue=%1$S (%2$S) + +# LOCALIZATION NOTE (yes, no): +# These are used to turn true/false values into a yes/no response. +yes=はい +no=いいえ

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 21 Jul '16

21 Jul '16

commit fd778d6125c5455d7ee020435eb0da95ed5091db Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 21 05:47:57 2016 +0000 Update translations for tor-messenger-ircproperties --- ja/irc.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/irc.properties b/ja/irc.properties index e40e0a9..3aa1b14 100644 --- a/ja/irc.properties +++ b/ja/irc.properties @@ -66,7 +66,7 @@ command.notice=%S <ターゲット> <メッセージ>：ユーザか command.op=%S <ニックネーム1>[,<ニックネーム2>]*: 対象の人物にチャンネルオペレーター権限を付与します。実行するためにはあなたがチャンネルオペレーターである必要があります。 command.operserv=%S <コマンド>: OperServ にコマンドを送信します。 command.part=%S [メッセージ]：現在のチャンネルを離れる。オプションでメッセージをつけられます。 -command.ping=%S [<nick>]: Asks how much lag a user (or the server if no user specified) has. +command.ping=%S [<ニックネーム>]: ユーザー（またはユーザーが指定されていない場合はサーバー）までの遅延を調査します。 command.quit=%S <メッセージ>：サーバーへの接続を解除。オプションでメッセージをつけられます。 command.quote=%S <コマンド>: このサーバーに生のコマンドを送信します。 command.time=%S: IRCサーバーでの現在の現地時刻を表示します。 @@ -105,7 +105,7 @@ message.parted=%1$S は部屋を去りました (Part%2$S)。 # %S is the part message supplied by the user. message.parted.reason=: %S # %1$S is the user's nick, %2$S is message.quit2 if a quit message is given. -message.quit=%1$S has left the room (Quit%2$S). +message.quit=%1$S は部屋を去りました (Quit%2$S)。 # The parameter is the quit message given by the user. message.quit2=: %S # %1$S is the nickname of the user that invited us, %2$S is the conversation

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 21 Jul '16

21 Jul '16

commit ead9458b38b906eee4985574335ad19618d3b147 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 21 05:17:56 2016 +0000 Update translations for tor-messenger-ircproperties --- ja/irc.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ja/irc.properties b/ja/irc.properties index 0753a37..e40e0a9 100644 --- a/ja/irc.properties +++ b/ja/irc.properties @@ -29,8 +29,8 @@ options.server=サーバー options.port=ポート options.ssl=SSLを使用する options.encoding=文字セット -options.quitMessage=Quit message -options.partMessage=Part message +options.quitMessage=終了メッセージ +options.partMessage=離席メッセージ options.showServerTab=サーバからのメッセージを表示 options.alternateNicks=別のニックネーム @@ -99,9 +99,9 @@ message.yourmode=あなたのモードは %S です。 # Could not change the nickname. %S is the user's nick. message.nick.fail=希望のニックネームは使用できませんでした。あなたのニックネームは %S のままです。 # The parameter is the message.parted.reason, if a part message is given. -message.parted.you=You have left the room (Part%1$S). +message.parted.you=あなたは部屋を去りました (Part%1$S)。 # %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given. -message.parted=%1$S has left the room (Part%2$S). +message.parted=%1$S は部屋を去りました (Part%2$S)。 # %S is the part message supplied by the user. message.parted.reason=: %S # %1$S is the user's nick, %2$S is message.quit2 if a quit message is given.

1 0