October 2019 - tor-commits - lists.torproject.org

[tor/master] test_addr.c: use COCCI to suppress macros coccinelle cannot parse.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 7e7a4874b8fa333d1840cc5f2c0b118d6a0e7c47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 13:24:16 2019 -0400 test_addr.c: use COCCI to suppress macros coccinelle cannot parse. --- src/test/test_addr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 50543293c..09faa540f 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -51,6 +51,7 @@ test_addr_basic(void *arg) ; } +#ifndef COCCI #define test_op_ip6_(a,op,b,e1,e2) \ STMT_BEGIN \ tt_assert_test_fmt_type(a,b,e1" "#op" "e2,struct in6_addr*, \ @@ -68,6 +69,7 @@ test_addr_basic(void *arg) TT_EXIT_TEST_FUNCTION \ ); \ STMT_END +#endif /** Helper: Assert that two strings both decode as IPv6 addresses with * tor_inet_pton(), and both decode to the same address. */ @@ -110,6 +112,7 @@ test_addr_basic(void *arg) TT_DIE(("%s was not internal", a)); \ STMT_END +#ifndef COCCI /** Helper: Assert that a and b, when parsed by * tor_inet_pton(), give addresses that compare in the order defined by * op with tor_addr_compare(). */ @@ -134,6 +137,7 @@ test_addr_basic(void *arg) TT_DIE(("Failed: tor_addr_compare_masked(%s,%s,%d) %s 0", \ a, b, m, #op)); \ STMT_END +#endif /** Helper: assert that xx is parseable as a masked IPv6 address with * ports by tor_parse_mask_addr_ports(), with family f, IP address

1 0

[tor/master] namemap_st.h: Use COCCI to hide an initializer.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 514c61e4064dafa73895a8bf6b3733bd2e571c32 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:54:23 2019 -0400 namemap_st.h: Use COCCI to hide an initializer. --- src/lib/container/namemap_st.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/container/namemap_st.h b/src/lib/container/namemap_st.h index 5008fd585..2fa73fc17 100644 --- a/src/lib/container/namemap_st.h +++ b/src/lib/container/namemap_st.h @@ -28,7 +28,9 @@ struct namemap_t { struct smartlist_t *names; }; +#ifndef COCCI /** Macro to initialize a namemap. */ #define NAMEMAP_INIT() { HT_INITIALIZER(), NULL } +#endif #endif /* !defined(NAMEMAP_ST_H) */

1 0

[tor/master] Merge branch 'ticket31705_v2' into ticket31705_v2_merged
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit b2d487ae2249a307cd23255dbb1a22241eefd6ef Merge: 2d013bbe5 7e7a4874b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 09:39:06 2019 -0400 Merge branch 'ticket31705_v2' into ticket31705_v2_merged Conflicts: src/feature/dirparse/authcert_parse.c src/feature/dirparse/ns_parse.c src/feature/hs/hs_service.c src/lib/conf/conftesting.h src/lib/log/log.h src/lib/thread/threads.h src/test/test_options.c These conflicts were mostly related to autostyle improvements, with one or two due to doxygen fixes. changes/ticket31705 | 9 +++++ scripts/coccinelle/apply.sh | 9 +++++ scripts/coccinelle/test-operator-cleanup | 13 +++++++ scripts/coccinelle/tor-coccinelle.h | 60 ++++++++++++++++++++++++++++++++ scripts/coccinelle/try_parse.sh | 29 +++++++++++++++ src/app/config/config.c | 10 ++++++ src/core/mainloop/mainloop.c | 9 ++++- src/core/mainloop/periodic.h | 2 ++ src/core/or/circuitpadding.c | 2 ++ src/core/or/or_periodic.c | 2 ++ src/feature/control/control_cmd.c | 2 ++ src/feature/control/control_events.c | 2 ++ src/feature/dirauth/dirauth_periodic.c | 2 ++ src/feature/dircommon/consdiff.c | 2 ++ src/feature/hs/hs_service.c | 2 ++ src/feature/relay/relay_periodic.c | 2 ++ src/lib/buf/buffers.c | 2 ++ src/lib/cc/ctassert.h | 2 +- src/lib/conf/confmacros.h | 2 ++ src/lib/conf/conftesting.h | 9 ++--- src/lib/container/namemap_st.h | 2 ++ src/lib/container/smartlist.h | 2 ++ src/lib/crypt_ops/crypto_openssl_mgt.c | 6 ++-- src/lib/dispatch/dispatch_naming.c | 2 ++ src/lib/evloop/timers.c | 4 ++- src/lib/intmath/weakrng.h | 3 ++ src/lib/log/log.c | 2 +- src/lib/log/log.h | 4 ++- src/lib/log/ratelim.h | 2 ++ src/lib/log/util_bug.h | 9 +++-- src/lib/malloc/map_anon.c | 4 +-- src/lib/net/address.c | 2 +- src/lib/string/parse_int.c | 5 ++- src/lib/thread/threads.h | 4 ++- src/lib/tls/tortls_openssl.c | 2 ++ src/lib/version/git_revision.c | 4 +++ src/lib/wallclock/timeval.h | 2 ++ src/test/hs_test_helpers.c | 28 +++++++-------- src/test/test.h | 6 ++++ src/test/test_addr.c | 6 ++++ src/test/test_config.c | 2 ++ src/test/test_confparse.c | 2 ++ src/test/test_connection.c | 2 ++ src/test/test_controller.c | 4 +++ src/test/test_crypto.c | 2 ++ src/test/test_crypto_slow.c | 2 ++ src/test/test_dir.c | 2 ++ src/test/test_entrynodes.c | 2 ++ src/test/test_link_handshake.c | 2 ++ src/test/test_options.c | 2 ++ src/test/test_router.c | 10 +++--- src/test/test_scheduler.c | 52 +++++++++++++-------------- src/test/test_util.c | 4 +++ 53 files changed, 296 insertions(+), 63 deletions(-) diff --cc src/feature/hs/hs_service.c index 15db5dd1d,600d64cac..964bf68a1 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@@ -67,7 -67,8 +67,8 @@@ #include <unistd.h> #endif + #ifndef COCCI -/* Helper macro. Iterate over every service in the global map. The var is the +/** Helper macro. Iterate over every service in the global map. The var is the * name of the service pointer. */ #define FOR_EACH_SERVICE_BEGIN(var) \ STMT_BEGIN \ diff --cc src/lib/log/util_bug.h index c3141754d,8c233da73..dcff5fd9c --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@@ -208,10 -211,10 +211,10 @@@ if (bool_result && !var) { \ var = 1; \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \ - "!("#cond")", 1, NULL); \ + ("!("#cond")"), 1, NULL); \ } \ bool_result; } )) -#else /* !(defined(__GNUC__)) */ +#else /* !defined(__GNUC__) */ #define IF_BUG_ONCE__(cond,var) \ static int var = 0; \ if ((cond) ? \ diff --cc src/test/test_options.c index 82def205a,62d477a63..aeb5de210 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@@ -3882,193 -4163,10 +3882,195 @@@ test_options_validate__accel(void *igno tor_free(msg); } +static int mocked_granularity; + +static void +mock_set_log_time_granularity(int g) +{ + mocked_granularity = g; +} + +static void +test_options_init_logs_granularity(void *arg) +{ + options_test_data_t *tdata = get_options_test_data(""); + int rv; + (void) arg; + + MOCK(set_log_time_granularity, mock_set_log_time_granularity); + + /* Reasonable value. */ + tdata->opt->LogTimeGranularity = 100; + mocked_granularity = -1; + rv = options_init_logs(NULL, tdata->opt, 0); + tt_int_op(rv, OP_EQ, 0); + tt_int_op(mocked_granularity, OP_EQ, 100); + + /* Doesn't divide 1000. */ + tdata->opt->LogTimeGranularity = 249; + mocked_granularity = -1; + rv = options_init_logs(NULL, tdata->opt, 0); + tt_int_op(rv, OP_EQ, 0); + tt_int_op(mocked_granularity, OP_EQ, 250); + + /* Doesn't divide 1000. */ + tdata->opt->LogTimeGranularity = 3; + mocked_granularity = -1; + rv = options_init_logs(NULL, tdata->opt, 0); + tt_int_op(rv, OP_EQ, 0); + tt_int_op(mocked_granularity, OP_EQ, 4); + + /* Not a multiple of 1000. */ + tdata->opt->LogTimeGranularity = 1500; + mocked_granularity = -1; + rv = options_init_logs(NULL, tdata->opt, 0); + tt_int_op(rv, OP_EQ, 0); + tt_int_op(mocked_granularity, OP_EQ, 2000); + + /* Reasonable value. */ + tdata->opt->LogTimeGranularity = 3000; + mocked_granularity = -1; + rv = options_init_logs(NULL, tdata->opt, 0); + tt_int_op(rv, OP_EQ, 0); + tt_int_op(mocked_granularity, OP_EQ, 3000); + + /* Negative. (Shouldn't be allowed by rest of config parsing.) */ + tdata->opt->LogTimeGranularity = -1; + mocked_granularity = -1; + rv = options_init_logs(NULL, tdata->opt, 0); + tt_int_op(rv, OP_EQ, -1); + + /* Very big */ + tdata->opt->LogTimeGranularity = 3600 * 1000; + mocked_granularity = -1; + rv = options_init_logs(NULL, tdata->opt, 0); + tt_int_op(rv, OP_EQ, 0); + tt_int_op(mocked_granularity, OP_EQ, 3600 * 1000); + + done: + free_options_test_data(tdata); + UNMOCK(set_log_time_granularity); +} + +typedef struct { + char *name; + log_severity_list_t sev; + int fd; + bool stream; +} added_log_t; + +static smartlist_t *added_logs = NULL; + +static void +mock_add_stream_log_impl(const log_severity_list_t *sev, const char *name, + int fd) +{ + added_log_t *a = tor_malloc_zero(sizeof(added_log_t)); + a->name = tor_strdup(name); + memcpy(&a->sev, sev, sizeof(log_severity_list_t)); + a->fd = fd; + a->stream = true; + smartlist_add(added_logs, a); +} + +static int +mock_add_file_log(const log_severity_list_t *sev, const char *name, int fd) +{ + added_log_t *a = tor_malloc_zero(sizeof(added_log_t)); + a->name = tor_strdup(name); + memcpy(&a->sev, sev, sizeof(log_severity_list_t)); + a->fd = fd; + smartlist_add(added_logs, a); + return 0; +} + +static void +clear_added_logs(void) +{ + SMARTLIST_FOREACH(added_logs, added_log_t *, a, + { tor_free(a->name); tor_free(a); }); + smartlist_clear(added_logs); +} + +static void +test_options_init_logs_quiet(void *arg) +{ + (void)arg; + char *cfg = NULL; + options_test_data_t *tdata = get_options_test_data(""); + char *fn1 = tor_strdup(get_fname_rnd("log")); + const added_log_t *a; + int rv; + tdata->opt->RunAsDaemon = 0; + + added_logs = smartlist_new(); + MOCK(add_stream_log_impl, mock_add_stream_log_impl); + MOCK(add_file_log, mock_add_file_log); + + tt_ptr_op(tdata->opt->Logs, OP_EQ, NULL); + + /* First, try with no configured logs, and make sure that our configured + logs match the quiet level. */ + quiet_level = QUIET_SILENT; + rv = options_init_logs(NULL, tdata->opt, 0); + tt_int_op(rv, OP_EQ, 0); + tt_int_op(smartlist_len(added_logs), OP_EQ, 0); + + quiet_level = QUIET_HUSH; + rv = options_init_logs(NULL, tdata->opt, 0); + tt_int_op(rv, OP_EQ, 0); + tt_int_op(smartlist_len(added_logs), OP_EQ, 1); + a = smartlist_get(added_logs, 0); + tt_assert(a); + tt_assert(a->stream); + tt_int_op(a->fd, OP_EQ, fileno(stdout)); + tt_int_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, 0); + tt_int_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, 0); + tt_int_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS); + clear_added_logs(); + + quiet_level = QUIET_NONE; + rv = options_init_logs(NULL, tdata->opt, 0); + tt_int_op(rv, OP_EQ, 0); + tt_int_op(smartlist_len(added_logs), OP_EQ, 1); + a = smartlist_get(added_logs, 0); + tt_assert(a); + tt_assert(a->stream); + tt_int_op(a->fd, OP_EQ, fileno(stdout)); + tt_int_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, 0); + tt_int_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, LD_ALL_DOMAINS); + tt_int_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS); + clear_added_logs(); + + /* Make sure that adding a configured log makes the default logs go away. */ + tor_asprintf(&cfg, "Log info file %s\n", fn1); + free_options_test_data(tdata); + tdata = get_options_test_data(cfg); + rv = options_init_logs(NULL, tdata->opt, 0); + tt_int_op(rv, OP_EQ, 0); + tt_int_op(smartlist_len(added_logs), OP_EQ, 1); + a = smartlist_get(added_logs, 0); + tt_assert(a); + tt_assert(! a->stream); + tt_int_op(a->fd, OP_NE, fileno(stdout)); + tt_int_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, LD_ALL_DOMAINS); + tt_int_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, LD_ALL_DOMAINS); + tt_int_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS); + + done: + free_options_test_data(tdata); + tor_free(fn1); + tor_free(cfg); + clear_added_logs(); + smartlist_free(added_logs); + UNMOCK(add_stream_log_impl); + UNMOCK(add_file_log); +} + + #ifndef COCCI #define LOCAL_VALIDATE_TEST(name) \ { "validate__" #name, test_options_validate__ ## name, TT_FORK, NULL, NULL } + #endif struct testcase_t options_tests[] = { { "validate", test_options_validate, TT_FORK, NULL, NULL },

1 0

[tor/master] smartlist.h: use COCCI to hide SMARTLIST_FOREACH_JOIN from Coccinelle
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 41f44d87604c8b780e9c3a1e60f006633e0a6d1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:55:37 2019 -0400 smartlist.h: use COCCI to hide SMARTLIST_FOREACH_JOIN from Coccinelle --- src/lib/container/smartlist.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/container/smartlist.h b/src/lib/container/smartlist.h index 25638e4b2..1dadf4ae6 100644 --- a/src/lib/container/smartlist.h +++ b/src/lib/container/smartlist.h @@ -92,6 +92,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, size_t join_len, int terminate, size_t *len_out) ATTR_MALLOC; +#ifndef COCCI /* Helper: Given two lists of items, possibly of different types, such that * both lists are sorted on some common field (as determined by a comparison * expression cmpexpr), and such that one list (sl1) has no @@ -165,5 +166,6 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, #define SMARTLIST_FOREACH_JOIN_END(var1, var2) \ } \ STMT_END +#endif #endif /* !defined(TOR_SMARTLIST_H) */

1 0

[tor/master] Re-run make autostyle.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 931a5db2a7ded73ddd72cb6646b506d49782f3ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 09:40:31 2019 -0400 Re-run make autostyle. --- src/app/config/config.c | 2 +- src/core/mainloop/mainloop.c | 2 +- src/core/or/circuitpadding.c | 2 +- src/core/or/or_periodic.c | 2 +- src/feature/client/proxymode.h | 2 +- src/feature/control/control_cmd.c | 2 +- src/feature/control/control_events.c | 2 +- src/feature/dirauth/dirauth_periodic.c | 2 +- src/feature/dircommon/consdiff.c | 2 +- src/feature/dirparse/authcert_members.h | 2 +- src/feature/hs/hs_service.c | 2 +- src/feature/relay/relay_periodic.c | 2 +- src/feature/relay/router.c | 2 +- src/feature/relay/routermode.h | 4 ++-- src/lib/buf/buffers.c | 2 +- src/lib/conf/confmacros.h | 2 +- src/lib/conf/conftesting.h | 6 +++--- src/lib/container/smartlist.h | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 2 +- src/lib/dispatch/dispatch_naming.c | 2 +- src/lib/evloop/timers.c | 2 +- src/lib/log/log.h | 6 +++--- src/lib/log/util_bug.h | 2 +- src/lib/thread/threads.h | 2 +- src/lib/version/git_revision.c | 2 +- src/lib/wallclock/timeval.h | 2 +- src/test/test.h | 6 +++--- src/test/test_addr.c | 4 ++-- src/test/test_confparse.c | 2 +- src/test/test_connection.c | 2 +- src/test/test_controller.c | 2 +- src/test/test_crypto.c | 2 +- src/test/test_crypto_slow.c | 2 +- src/test/test_dir.c | 2 +- src/test/test_entrynodes.c | 2 +- src/test/test_link_handshake.c | 2 +- src/test/test_options.c | 2 +- src/test/test_util.c | 4 ++-- 38 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 32ae620b0..2cf64d1b7 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -191,7 +191,7 @@ static const char unix_q_socket_prefix[] = "unix:\""; { #name "DownloadSchedule", #name "DownloadInitialDelay", 0, 1 } #else #define DOWNLOAD_SCHEDULE(name) { NULL, NULL, 0, 1 } -#endif +#endif /* !defined(COCCI) */ /** A list of abbreviations and aliases to map command-line options, obsolete * option names, or alternative option names, to their current values. */ diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 0519935a1..33a53e416 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -1379,7 +1379,7 @@ CALLBACK(second_elapsed); #define CALLBACK(name, r, f) \ PERIODIC_EVENT(name, PERIODIC_EVENT_ROLE_ ## r, f) #define FL(name) (PERIODIC_EVENT_FLAG_ ## name) -#endif +#endif /* !defined(COCCI) */ STATIC periodic_event_item_t mainloop_periodic_events[] = { diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index f5481bc24..e9b14144c 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -131,7 +131,7 @@ STATIC smartlist_t *relay_padding_machines = NULL; if (!(circ)->padding_info[loop_var]) \ continue; #define FOR_EACH_ACTIVE_CIRCUIT_MACHINE_END } STMT_END ; -#endif +#endif /* !defined(COCCI) */ /** * Free the machineinfo at an index diff --git a/src/core/or/or_periodic.c b/src/core/or/or_periodic.c index 879d142cb..0e7900827 100644 --- a/src/core/or/or_periodic.c +++ b/src/core/or/or_periodic.c @@ -26,7 +26,7 @@ PERIODIC_EVENT(name, \ PERIODIC_EVENT_ROLE_##roles, \ flags) -#endif +#endif /* !defined(COCCI) */ #define FL(name) (PERIODIC_EVENT_FLAG_ ## name) diff --git a/src/feature/client/proxymode.h b/src/feature/client/proxymode.h index f8352922c..770a51915 100644 --- a/src/feature/client/proxymode.h +++ b/src/feature/client/proxymode.h @@ -14,4 +14,4 @@ int proxy_mode(const or_options_t *options); -#endif +#endif /* !defined(TOR_PROXYMODE_H) */ diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index 2ad7851b3..68179beef 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -2281,7 +2281,7 @@ typedef struct control_cmd_def_t { 0, \ &obsolete_syntax, \ } -#endif +#endif /* !defined(COCCI) */ /** * An array defining all the recognized controller commands. diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index b8a46c306..12b73641b 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -1675,7 +1675,7 @@ control_event_status(int type, int severity, const char *format, va_list args) r = control_event_status((event), (sev), format, ap); \ va_end(ap); \ } while (0) -#endif +#endif /* !defined(COCCI) */ /** Format and send an EVENT_STATUS_GENERAL event whose main text is obtained * by formatting the arguments using the printf-style format. */ diff --git a/src/feature/dirauth/dirauth_periodic.c b/src/feature/dirauth/dirauth_periodic.c index c02b9ac86..fc2635829 100644 --- a/src/feature/dirauth/dirauth_periodic.c +++ b/src/feature/dirauth/dirauth_periodic.c @@ -24,7 +24,7 @@ PERIODIC_EVENT(name, \ PERIODIC_EVENT_ROLE_##roles, \ flags) -#endif +#endif /* !defined(COCCI) */ #define FL(name) (PERIODIC_EVENT_FLAG_##name) diff --git a/src/feature/dircommon/consdiff.c b/src/feature/dircommon/consdiff.c index 3b6bffbbb..fbfa9e0c0 100644 --- a/src/feature/dircommon/consdiff.c +++ b/src/feature/dircommon/consdiff.c @@ -535,7 +535,7 @@ typedef struct router_id_iterator_t { * Initializer for a router_id_iterator_t. */ #define ROUTER_ID_ITERATOR_INIT { { NULL, 0 }, { NULL, 0 } } -#endif +#endif /* !defined(COCCI) */ /** Given an index *idxp into the consensus at cons, advance * the index to the next router line ("r ...") in the consensus, or to diff --git a/src/feature/dirparse/authcert_members.h b/src/feature/dirparse/authcert_members.h index 8f6fdf17c..3b44c3eb0 100644 --- a/src/feature/dirparse/authcert_members.h +++ b/src/feature/dirparse/authcert_members.h @@ -26,4 +26,4 @@ NO_ARGS, NEED_OBJ),\ T01("dir-address", K_DIR_ADDRESS, GE(1), NO_OBJ) -#endif +#endif /* !defined(TOR_AUTHCERT_MEMBERS_H) */ diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 964bf68a1..da772fa6d 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -89,7 +89,7 @@ (var = service->desc_next); \ if (var == NULL) continue; #define FOR_EACH_DESCRIPTOR_END } STMT_END ; -#endif +#endif /* !defined(COCCI) */ /* Onion service directory file names. */ static const char fname_keyfile_prefix[] = "hs_ed25519"; diff --git a/src/feature/relay/relay_periodic.c b/src/feature/relay/relay_periodic.c index 7dc4cb453..d1b318395 100644 --- a/src/feature/relay/relay_periodic.c +++ b/src/feature/relay/relay_periodic.c @@ -37,7 +37,7 @@ PERIODIC_EVENT(name, \ PERIODIC_EVENT_ROLE_##roles, \ flags) -#endif +#endif /* !defined(COCCI) */ #define FL(name) (PERIODIC_EVENT_FLAG_##name) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 92803f88a..5c7901093 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -386,7 +386,7 @@ get_server_identity_key,(void)) return server_identitykey; } -#endif +#endif /* defined(HAVE_MODULE_RELAY) */ /** Return true iff we are a server and the server identity key * has been set. */ diff --git a/src/feature/relay/routermode.h b/src/feature/relay/routermode.h index f6195a869..9891a038a 100644 --- a/src/feature/relay/routermode.h +++ b/src/feature/relay/routermode.h @@ -25,7 +25,7 @@ void set_server_advertised(int s); /** Is the relay module enabled? */ #define have_module_relay() (1) -#else +#else /* !defined(HAVE_MODULE_RELAY) */ #define dir_server_mode(options) (((void)(options)),0) #define server_mode(options) (((void)(options)),0) @@ -37,6 +37,6 @@ void set_server_advertised(int s); #define have_module_relay() (0) -#endif +#endif /* defined(HAVE_MODULE_RELAY) */ #endif /* !defined(TOR_ROUTERMODE_H) */ diff --git a/src/lib/buf/buffers.c b/src/lib/buf/buffers.c index 28710ebab..4adc08fdb 100644 --- a/src/lib/buf/buffers.c +++ b/src/lib/buf/buffers.c @@ -110,7 +110,7 @@ memset(a,0,SENTINEL_LEN); \ } while (0) #endif /* defined(DISABLE_MEMORY_SENTINELS) */ -#endif +#endif /* !defined(COCCI) */ /** Move all bytes stored in chunk to the front of chunk->mem, * to free up space at the end. */ diff --git a/src/lib/conf/confmacros.h b/src/lib/conf/confmacros.h index 6449458a1..67082454a 100644 --- a/src/lib/conf/confmacros.h +++ b/src/lib/conf/confmacros.h @@ -21,7 +21,7 @@ **/ #define END_OF_CONFIG_VARS \ { .member = { .name = NULL } DUMMY_CONF_TEST_MEMBERS } -#endif +#endif /* !defined(COCCI) */ /** * Declare a config_var_t as a member named membername of the structure diff --git a/src/lib/conf/conftesting.h b/src/lib/conf/conftesting.h index 8f82b5bf1..dbfd56407 100644 --- a/src/lib/conf/conftesting.h +++ b/src/lib/conf/conftesting.h @@ -72,8 +72,8 @@ typedef union { #define DUMMY_CONF_TEST_MEMBERS , .var_ptr_dummy={ .INT=NULL } #define DUMMY_TYPECHECK_INSTANCE(tp) \ static tp tp ## _dummy -#endif -#endif +#endif /* defined(TOR_UNIT_TESTS) */ +#endif /* !defined(COCCI) */ #ifndef USE_CONF_TESTING #define CONF_TEST_MEMBERS(tp, conftype, member) @@ -82,6 +82,6 @@ typedef union { struct tor_semicolon_eater #define DUMMY_CONF_TEST_MEMBERS -#endif /* defined(TOR_UNIT_TESTS) */ +#endif /* !defined(USE_CONF_TESTING) */ #endif /* !defined(TOR_LIB_CONF_CONFTESTING_H) */ diff --git a/src/lib/container/smartlist.h b/src/lib/container/smartlist.h index 1dadf4ae6..984cd2d29 100644 --- a/src/lib/container/smartlist.h +++ b/src/lib/container/smartlist.h @@ -166,6 +166,6 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, #define SMARTLIST_FOREACH_JOIN_END(var1, var2) \ } \ STMT_END -#endif +#endif /* !defined(COCCI) */ #endif /* !defined(TOR_SMARTLIST_H) */ diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index 617c0dcd7..2fbebd87e 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -126,7 +126,7 @@ crypto_openssl_get_header_version_str(void) #error "OpenSSL has been built without thread support. Tor requires an \ OpenSSL library with thread support enabled." #endif -#endif +#endif /* !defined(COCCI) */ #ifndef NEW_THREAD_API /** Helper: OpenSSL uses this callback to manipulate mutexes. */ diff --git a/src/lib/dispatch/dispatch_naming.c b/src/lib/dispatch/dispatch_naming.c index 79411cb3a..e8e28cc71 100644 --- a/src/lib/dispatch/dispatch_naming.c +++ b/src/lib/dispatch/dispatch_naming.c @@ -57,7 +57,7 @@ dispatch_naming_init(void) return namemap_get_size(&type##_id_map); \ } \ EAT_SEMICOLON -#endif +#endif /* !defined(COCCI) */ DECLARE_ID_MAP_FNS(message); DECLARE_ID_MAP_FNS(channel); diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c index 23562971c..c5bb0f595 100644 --- a/src/lib/evloop/timers.c +++ b/src/lib/evloop/timers.c @@ -64,7 +64,7 @@ struct timeout_cb { #else /* We're not exposing any of the functions outside this file. */ #define TIMEOUT_PUBLIC static -#endif /* defined(__GNUC__) */ +#endif /* defined(COCCI) || ... */ /* We're not using periodic events. */ #define TIMEOUT_DISABLE_INTERVALS /* We always know the global_timeouts object, so we don't need each timeout diff --git a/src/lib/log/log.h b/src/lib/log/log.h index 19cb9484d..5cf8a36cf 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -27,8 +27,8 @@ #error "Your syslog.h thinks high numbers are more important. " \ "We aren't prepared to deal with that." #endif -#endif -#else /* !(defined(HAVE_SYSLOG_H)) */ +#endif /* LOG_DEBUG < LOG_ERR */ +#else /* !defined(HAVE_SYSLOG_H) */ /* Note: Syslog's logging code refers to priorities, with 0 being the most * important. Thus, all our comparisons needed to be reversed when we added * syslog support. @@ -310,7 +310,7 @@ MOCK_DECL(STATIC void, logv, (int severity, log_domain_mask_t domain, va_list ap) CHECK_PRINTF(5,0)); MOCK_DECL(STATIC void, add_stream_log_impl,( const log_severity_list_t *severity, const char *name, int fd)); -#endif +#endif /* defined(LOG_PRIVATE) */ #if defined(LOG_PRIVATE) || defined(TOR_UNIT_TESTS) /** Given a severity, yields an index into log_severity_list_t.masks to use diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index dcff5fd9c..d0a311ac6 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -225,7 +225,7 @@ 1)) \ : 0) #endif /* defined(__GNUC__) */ -#endif +#endif /* !defined(COCCI) */ #define IF_BUG_ONCE_VARNAME_(a) \ warning_logged_on_ ## a ## __ diff --git a/src/lib/thread/threads.h b/src/lib/thread/threads.h index 2e63dac5d..ad9ad98c7 100644 --- a/src/lib/thread/threads.h +++ b/src/lib/thread/threads.h @@ -109,7 +109,7 @@ typedef struct atomic_counter_t { #ifndef COCCI #define ATOMIC_LINKAGE static #endif -#else /* !(defined(HAVE_WORKING_STDATOMIC)) */ +#else /* !defined(HAVE_WORKING_STDATOMIC) */ typedef struct atomic_counter_t { tor_mutex_t mutex; size_t val; diff --git a/src/lib/version/git_revision.c b/src/lib/version/git_revision.c index 338ba2bc3..6cfb3b4ec 100644 --- a/src/lib/version/git_revision.c +++ b/src/lib/version/git_revision.c @@ -24,5 +24,5 @@ const char tor_bug_suffix[] = " (on Tor " VERSION " " #include "micro-revision.i" #endif -#endif +#endif /* !defined(COCCI) */ ")"; diff --git a/src/lib/wallclock/timeval.h b/src/lib/wallclock/timeval.h index 897a86441..4710a3dfd 100644 --- a/src/lib/wallclock/timeval.h +++ b/src/lib/wallclock/timeval.h @@ -83,6 +83,6 @@ ((tv1)->tv_usec op (tv2)->tv_usec) : \ ((tv1)->tv_sec op (tv2)->tv_sec)) #endif /* !defined(timercmp) */ -#endif +#endif /* !defined(COCCI) */ #endif /* !defined(TOR_TIMEVAL_H) */ diff --git a/src/test/test.h b/src/test/test.h index e9caef3fe..feaa13a3a 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -65,7 +65,7 @@ tt_assert_test_fmt_type(a,b,#a" "#op" "#b,int64_t,(val1_ op val2_), \ int64_t, "%"PRId64, \ {print_ = (int64_t) value_;}, {}, TT_EXIT_TEST_FUNCTION) -#endif +#endif /* !defined(COCCI) */ /** * Declare that the test is done, even though no tt___op() calls were made. @@ -164,7 +164,7 @@ void free_pregenerated_keys(void); NULL, \ NULL, \ } -#endif +#endif /* !defined(COCCI) */ #define NS(name) US_CONCAT_3_(NS_MODULE, NS_SUBMODULE, name) #define NS_FULL(module, submodule, name) US_CONCAT_3_(module, submodule, name) @@ -175,7 +175,7 @@ void free_pregenerated_keys(void); extern int CALLED(mock_fn); \ static retval NS(mock_fn) args; int CALLED(mock_fn) = 0 #define NS_MOCK(name) MOCK(name, NS(name)) -#endif +#endif /* !defined(COCCI) */ #define NS_UNMOCK(name) UNMOCK(name) extern const struct testcase_setup_t passthrough_setup; diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 44f3cd9ec..04380d1cc 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -70,7 +70,7 @@ test_addr_basic(void *arg) TT_EXIT_TEST_FUNCTION \ ); \ STMT_END -#endif +#endif /* !defined(COCCI) */ /** Helper: Assert that two strings both decode as IPv6 addresses with * tor_inet_pton(), and both decode to the same address. */ @@ -138,7 +138,7 @@ test_addr_basic(void *arg) TT_DIE(("Failed: tor_addr_compare_masked(%s,%s,%d) %s 0", \ a, b, m, #op)); \ STMT_END -#endif +#endif /* !defined(COCCI) */ /** Helper: assert that xx is parseable as a masked IPv6 address with * ports by tor_parse_mask_addr_ports(), with family f, IP address diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c index 33979813f..206fe0fc0 100644 --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@ -1044,7 +1044,7 @@ test_confparse_find_option_name(void *arg) #define BADVAL_TEST(name) \ { "badval_" #name, test_confparse_assign_badval, 0, \ &passthrough_setup, (void*)&bv_ ## name } -#endif +#endif /* !defined(COCCI) */ struct testcase_t confparse_tests[] = { CONFPARSE_TEST(init, 0), diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 3148c1af6..0d2827670 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -888,7 +888,7 @@ test_failed_orconn_tracker(void *arg) /* where arg is an expression (constant, variable, compound expression) */ #define CONNECTION_TESTCASE_ARG(name, fork, setup, arg) \ { #name "_" #arg, test_conn_##name, fork, &setup, (void *)arg } -#endif +#endif /* !defined(COCCI) */ struct testcase_t connection_tests[] = { CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st), diff --git a/src/test/test_controller.c b/src/test/test_controller.c index c68e35ab3..793696c47 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -130,7 +130,7 @@ test_controller_parse_cmd(void *arg) { &syntax, \ ARRAY_LENGTH(array), \ array } -#endif +#endif /* !defined(COCCI) */ static const parser_testcase_t one_to_three_tests[] = { ERR("", "Need at least 1 argument(s)"), diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index ae9c51e00..2c57e50a4 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -2982,7 +2982,7 @@ test_crypto_failure_modes(void *arg) #define ED25519_TEST(name, fl) \ ED25519_TEST_ONE(name, (fl), "donna"), \ ED25519_TEST_ONE(name, (fl), "ref10") -#endif +#endif /* !defined(COCCI) */ struct testcase_t crypto_tests[] = { CRYPTO_LEGACY(formats), diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c index 4f0cfbc64..9ee7b100b 100644 --- a/src/test/test_crypto_slow.c +++ b/src/test/test_crypto_slow.c @@ -595,7 +595,7 @@ test_crypto_ed25519_fuzz_donna(void *arg) #define ED25519_TEST(name, fl) \ ED25519_TEST_ONE(name, (fl), "donna"), \ ED25519_TEST_ONE(name, (fl), "ref10") -#endif +#endif /* !defined(COCCI) */ struct testcase_t slow_crypto_tests[] = { CRYPTO_LEGACY(s2k_rfc2440), diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 77cc1f97b..02988d247 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -7220,7 +7220,7 @@ test_dir_format_versions_list(void *arg) /* where arg is a string constant */ #define DIR_ARG(name,flags,arg) \ { #name "_" arg, test_dir_##name, (flags), &passthrough_setup, (void*) arg } -#endif +#endif /* !defined(COCCI) */ struct testcase_t dir_tests[] = { DIR_LEGACY(nicknames), diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 598babe22..dec7874c7 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -3062,7 +3062,7 @@ static const struct testcase_setup_t upgrade_circuits = { &upgrade_circuits, (void*)(arg REASONABLY_FUTURE) }, \ { #name "_reasonably_past", test_entry_guard_ ## name, TT_FORK, \ &upgrade_circuits, (void*)(arg REASONABLY_PAST) } -#endif +#endif /* !defined(COCCI) */ struct testcase_t entrynodes_tests[] = { NO_PREFIX_TEST(node_preferred_orport), diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index 1371e1ef7..18c170003 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -1528,7 +1528,7 @@ AUTHENTICATE_FAIL(missing_ed_auth, #define TEST_AUTHENTICATE_ED(name) \ { "authenticate/" #name "_ed25519" , test_link_handshake_auth_ ## name, \ TT_FORK, &setup_authenticate, (void*)3 } -#endif +#endif /* !defined(COCCI) */ struct testcase_t link_handshake_tests[] = { TEST_RSA(certs_ok, TT_FORK), diff --git a/src/test/test_options.c b/src/test/test_options.c index aeb5de210..6b6a52ae8 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -696,7 +696,7 @@ test_options_validate__logs(void *ignored) tt_int_op(ret, OP_EQ, -1); #else tt_int_op(ret, OP_EQ, 0); -#endif +#endif /* defined(_WIN32) */ free_options_test_data(tdata); tdata = get_options_test_data(""); diff --git a/src/test/test_util.c b/src/test/test_util.c index 09978a13c..3e4975fcd 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -317,7 +317,7 @@ test_util_write_chunks_to_file(void *arg) _TFE(a, b, tm_min ); \ _TFE(a, b, tm_sec ); \ TT_STMT_END -#endif +#endif /* !defined(COCCI) */ static void test_util_time(void *arg) @@ -6284,7 +6284,7 @@ test_util_map_anon_nofork(void *arg) { "compress_dos/" #name, test_util_decompress_dos, 0, \ &compress_setup, \ (char*)(identifier) } -#endif +#endif /* !defined(COCCI) */ #ifdef _WIN32 #define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL }

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1447'
by teor＠torproject.org 24 Oct '19

24 Oct '19

1 0

[translation/tails-persistence-setup_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup_completed
by translation＠torproject.org 23 Oct '19

23 Oct '19

commit 782edeb02a9af0fc5064cc72bc57fac45c3d5f8f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 23:49:51 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-s… --- ca/ca.po | 335 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 335 insertions(+) diff --git a/ca/ca.po b/ca/ca.po new file mode 100644 index 000000000..be92c8866 --- /dev/null +++ b/ca/ca.po @@ -0,0 +1,335 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Benny Beat <bennybeat(a)gmail.com>, 2019 +# Eloi García i Fargas, 2014 +# escufi <escufi(a)gmail.com>, 2018 +# Humbert, 2014 +# jmontane, 2019 +# laia_, 2014-2016 +# Vte A.F <viarfer3(a)inf.upv.es>, 2017 +msgid "" +msgstr "" +"Project-Id-Version: Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" +"POT-Creation-Date: 2019-10-21 09:06+0200\n" +"PO-Revision-Date: 2019-10-23 23:46+0000\n" +"Last-Translator: Benny Beat <bennybeat(a)gmail.com>\n" +"Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../lib/Tails/Persistence/Setup.pm:265 +msgid "Setup Tails persistent volume" +msgstr "Configura el volum persistent de Tails" + +#: ../lib/Tails/Persistence/Setup.pm:343 ../lib/Tails/Persistence/Setup.pm:481 +msgid "Error" +msgstr "Error" + +#: ../lib/Tails/Persistence/Setup.pm:372 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "El dispositiu %s ja té un volum persistent." + +#: ../lib/Tails/Persistence/Setup.pm:380 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "El dispositiu %s no té prou espai lliure." + +#: ../lib/Tails/Persistence/Setup.pm:387 ../lib/Tails/Persistence/Setup.pm:401 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "El dispositiu %s no té un volum persistent." + +#: ../lib/Tails/Persistence/Setup.pm:393 +#, perl-format +msgid "" +"Cannot delete the persistent volume on %s while in use. You should restart " +"Tails without persistence." +msgstr "No es pot eliminar el volum persistent a %s mentre està en ús. Heu de reiniciar Tails sense persistència." + +#: ../lib/Tails/Persistence/Setup.pm:407 +#, perl-format +msgid "Persistence volume on %s is not unlocked." +msgstr "El volum de persistència %s no està desbloquejat." + +#: ../lib/Tails/Persistence/Setup.pm:412 +#, perl-format +msgid "Persistence volume on %s is not mounted." +msgstr "El volum de persistència %s no està muntat." + +#: ../lib/Tails/Persistence/Setup.pm:417 +#, perl-format +msgid "" +"Persistence volume on %s is not readable. Permissions or ownership problems?" +msgstr "No es pot llegir el volum de persistència %s. Potser per problemes amb els permisos o la propietat?" + +#: ../lib/Tails/Persistence/Setup.pm:422 +#, perl-format +msgid "Persistence volume on %s is not writable." +msgstr "No es pot escriure al volum de persistència %s." + +#: ../lib/Tails/Persistence/Setup.pm:431 +#, perl-format +msgid "Tails is running from non-USB / non-SDIO device %s." +msgstr "Tails s'està executant des d'un dispositiu %s no-USB / no-SDIO" + +#: ../lib/Tails/Persistence/Setup.pm:437 +#, perl-format +msgid "Device %s is optical." +msgstr "El dispositiu %s és òptic." + +#: ../lib/Tails/Persistence/Setup.pm:444 +#, perl-format +msgid "Device %s was not created using a USB image or Tails Installer." +msgstr "El dispositiu %s no es va crear amb una imatge USB ni l'instal·lador del Tails" + +#: ../lib/Tails/Persistence/Setup.pm:688 +msgid "Persistence wizard - Finished" +msgstr "Assistent de persistència - Acabat" + +#: ../lib/Tails/Persistence/Setup.pm:691 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "Qualsevol canvi que hagueu fet només tindrà efecte després de reiniciar Tails. \n\nHeu de tancar ara l'aplicació. " + +#: ../lib/Tails/Persistence/Configuration/Setting.pm:113 +msgid "Custom" +msgstr "Personalitza" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:55 +msgid "Personal Data" +msgstr "Dades Personals" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:57 +msgid "Keep files stored in the `Persistent' directory" +msgstr "Conserva els arxius emmagatzemats en la carpeta \"Persistent\"" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "Browser Bookmarks" +msgstr "Marcadors del navegador" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:72 +msgid "Bookmarks saved in the Tor Browser" +msgstr "Adreces d'interès desades al Navegador Tor" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:85 +msgid "Network Connections" +msgstr "Connexions en xarxa" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:87 +msgid "Configuration of network devices and connections" +msgstr "Configuració de dispositius en xarxa i connexions" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Additional Software" +msgstr "Programari addicional" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:102 +msgid "Software installed when starting Tails" +msgstr "Programari instal·lat en iniciar el Tails" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Printers" +msgstr "Impressores" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:122 +msgid "Printers configuration" +msgstr "Configuració d'impressores" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:135 +msgid "Thunderbird" +msgstr "Thunderbird" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:137 +msgid "Thunderbird emails, feeds, and settings" +msgstr "Correu electrònic de Thunderbird, notícies i configuració" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +msgid "GnuPG" +msgstr "GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:152 +msgid "GnuPG keyrings and configuration" +msgstr "Claus i configuració de GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:165 +msgid "Bitcoin Client" +msgstr "Client Bitcoin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:167 +msgid "Electrum's bitcoin wallet and configuration" +msgstr "Moneder de Bitcoin d'Electrum i configuració" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:180 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:182 +msgid "Pidgin profiles and OTR keyring" +msgstr "Perfils de Pidgin i clauer d'OTR" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:195 +msgid "SSH Client" +msgstr "Client SSH" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:197 +msgid "SSH keys, configuration and known hosts" +msgstr "Claus SSH, configuració i amfitrions coneguts" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:210 +msgid "Dotfiles" +msgstr "Dotfiles" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:212 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "Symlink a $HOME tot arxiu o carpeta trobat al directori 'dotfiles'" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:96 +msgid "Persistence wizard - Persistent volume creation" +msgstr "Assistent de persistència - Creació de volum persistent" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:99 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "Escolliu una contrasenya per protegir el volum persistent" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:103 +#, perl-format +msgid "" +"A %s persistent volume will be created on the %s %s device. Data on " +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "Es crearà un volum persistent de %s al dispositiu %s %s . Les dades d'aquest volum seràn emmagatzemades en una forma encriptada protegida per contrasenya. " + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:108 +msgid "Create" +msgstr "Crea" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:151 +msgid "" +"Beware! Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See the Encrypted " +"persistence page of the Tails documentation to learn more." +msgstr "Aneu amb compte! L'ús de la persistència té conseqüències que cal entendre bé. El Tails no us pot ajudar si l'utilitza malament. Consulteu la pàgina de persistència xifradade la documentació del Tails per a més informació." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:179 +msgid "Passphrase:" +msgstr "Frase de contrasenya:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:187 +msgid "Verify Passphrase:" +msgstr "Comprova la contrasenya" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:198 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:266 +msgid "Passphrase can't be empty" +msgstr "La contrasenya no pot quedar buida" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:233 +msgid "Show Passphrase" +msgstr "Mostra la contrasenya" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:257 +msgid "Passphrases do not match" +msgstr "La contrasenya no coincideix" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:312 +#: ../lib/Tails/Persistence/Step/Delete.pm:103 +#: ../lib/Tails/Persistence/Step/Configure.pm:181 +msgid "Failed" +msgstr "Fallit" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 +msgid "Mounting Tails persistence partition." +msgstr "S'esta muntant la partició persistent de Tails." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 +msgid "The Tails persistence partition will be mounted." +msgstr "La partició persistent de Tails serà muntada. " + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:332 +msgid "Correcting permissions of the persistent volume." +msgstr "S'estan corregint els permisos del volum persistent." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:335 +msgid "The permissions of the persistent volume will be corrected." +msgstr "Els permisos del volum persistent seran corregits." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:343 +msgid "Creating default persistence configuration." +msgstr "S'està creant la configuració de persistència predeterminada." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:346 +msgid "The default persistence configuration will be created." +msgstr "Es crearà la configuració de persistència predeterminada." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:361 +msgid "Creating..." +msgstr "Creant..." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:364 +msgid "Creating the persistent volume..." +msgstr "Creant el volum persistent..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:53 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "Assistent de persistència - Eliminació del volum persistent" + +#: ../lib/Tails/Persistence/Step/Delete.pm:56 +msgid "Your persistent data will be deleted." +msgstr "Les dades persistents s'esborraran" + +#: ../lib/Tails/Persistence/Step/Delete.pm:60 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the %s %s device, will be deleted." +msgstr "El volum persistent %s (%s), en el dispositiu %s %s s'esborrarà." + +#: ../lib/Tails/Persistence/Step/Delete.pm:66 +msgid "Delete" +msgstr "Esborra" + +#: ../lib/Tails/Persistence/Step/Delete.pm:117 +msgid "Deleting..." +msgstr "Esborrant..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:120 +msgid "Deleting the persistent volume..." +msgstr "Esborrant el volum persistent..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:88 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "Assistent de persistència - Configuració del volum persistent" + +#: ../lib/Tails/Persistence/Step/Configure.pm:91 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "Especifiqueu els arxius que seran desats al volum persistent" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:95 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "Els arxius seleccionats seran desats a la partició encriptada %s (%s) en el dispositiu %s %s ." + +#: ../lib/Tails/Persistence/Step/Configure.pm:101 +msgid "Save" +msgstr "Desa" + +#: ../lib/Tails/Persistence/Step/Configure.pm:195 +msgid "Saving..." +msgstr "Desant..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:198 +msgid "Saving persistence configuration..." +msgstr "Desant la configuració persistent..."

1 0

[translation/tails-persistence-setup] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup
by translation＠torproject.org 23 Oct '19

23 Oct '19

commit cfd7db6bdc440806c4bf34fae766d63e3e60de3a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 23:49:42 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-s… --- ca/ca.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index e4fc43e9d..be92c8866 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Benny Beat <bennybeat(a)gmail.com>, 2019 # Eloi García i Fargas, 2014 # escufi <escufi(a)gmail.com>, 2018 # Humbert, 2014 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-10-21 09:06+0200\n" -"PO-Revision-Date: 2019-10-23 05:50+0000\n" -"Last-Translator: jmontane\n" +"PO-Revision-Date: 2019-10-23 23:46+0000\n" +"Last-Translator: Benny Beat <bennybeat(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -67,12 +68,12 @@ msgstr "El volum de persistència %s no està muntat." #, perl-format msgid "" "Persistence volume on %s is not readable. Permissions or ownership problems?" -msgstr "El volum de persistència %s no és llegible. Permisos o problemes de propietat?" +msgstr "No es pot llegir el volum de persistència %s. Potser per problemes amb els permisos o la propietat?" #: ../lib/Tails/Persistence/Setup.pm:422 #, perl-format msgid "Persistence volume on %s is not writable." -msgstr "El volum de persistència %s no es pot escriure." +msgstr "No es pot escriure al volum de persistència %s." #: ../lib/Tails/Persistence/Setup.pm:431 #, perl-format @@ -134,7 +135,7 @@ msgstr "Programari addicional" #: ../lib/Tails/Persistence/Configuration/Presets.pm:102 msgid "Software installed when starting Tails" -msgstr "Programari instal·lat al iniciar Tails" +msgstr "Programari instal·lat en iniciar el Tails" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Printers" @@ -150,7 +151,7 @@ msgstr "Thunderbird" #: ../lib/Tails/Persistence/Configuration/Presets.pm:137 msgid "Thunderbird emails, feeds, and settings" -msgstr "Correu electrònic de Thunderbird, feeds i configuració" +msgstr "Correu electrònic de Thunderbird, notícies i configuració" #: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "GnuPG" @@ -218,7 +219,7 @@ msgid "" "Beware! Using persistence has consequences that must be well " "understood. Tails can't help you if you use it wrong! See the Encrypted " "persistence page of the Tails documentation to learn more." -msgstr "Aneu amb compte! L'ús de la persistència té conseqüències que cal entendre bé. Tails no us pot ajudar si l'utilitza malament. Consulteu la pàgina de persistència xifradade la documentació de Tails per obtenir més informació." +msgstr "Aneu amb compte! L'ús de la persistència té conseqüències que cal entendre bé. El Tails no us pot ajudar si l'utilitza malament. Consulteu la pàgina de persistència xifradade la documentació del Tails per a més informació." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:179 msgid "Passphrase:" @@ -235,7 +236,7 @@ msgstr "La contrasenya no pot quedar buida" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:233 msgid "Show Passphrase" -msgstr "Mostra contrasenya" +msgstr "Mostra la contrasenya" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:257 msgid "Passphrases do not match" @@ -265,7 +266,7 @@ msgstr "Els permisos del volum persistent seran corregits." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:343 msgid "Creating default persistence configuration." -msgstr "Creant configuració de persistència predeterminada." +msgstr "S'està creant la configuració de persistència predeterminada." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:346 msgid "The default persistence configuration will be created."

1 0

[translation/tails-greeter-2] https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2
by translation＠torproject.org 23 Oct '19

23 Oct '19

commit 77aef7619b6bccb7370046c3520599908eb97d63 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 23:49:10 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2 --- ca/ca.po | 138 +++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 85 insertions(+), 53 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index 0aeddad8f..29f18225d 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -14,6 +14,7 @@ # Vte A.F <viarfer3(a)inf.upv.es>, 2017 # Miquel Bosch, 2018 # erinm, 2019 +# Benny Beat <bennybeat(a)gmail.com>, 2019 # #, fuzzy msgid "" @@ -22,7 +23,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-11 00:25+0200\n" "PO-Revision-Date: 2016-11-18 21:29+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Benny Beat <bennybeat(a)gmail.com>, 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "" #: ../data/greeter.ui.h:1 msgid "Administration Password" -msgstr "" +msgstr "Contrasenya d'administador" #: ../data/greeter.ui.h:2 msgid "" @@ -40,27 +41,30 @@ msgid "" "tasks. Otherwise, the administration password is disabled for better " "security." msgstr "" +"Configureu una contrasenya d'administrador si heu de dur a terme tasques " +"d'administració. D'altra banda, la contrasenya d'administrador romandrà " +"deshabilitada per a més seguretat." #: ../data/greeter.ui.h:3 msgid "Enter an administration password" -msgstr "" +msgstr "Inseriu la contrasenya d'administrador" #: ../data/greeter.ui.h:4 msgid "Confirm" -msgstr "" +msgstr "Confirma" #: ../data/greeter.ui.h:5 msgid "Confirm your administration password" -msgstr "" +msgstr "Confirmeu la contrasenya d'administrador " #: ../data/greeter.ui.h:6 msgid "Disable" -msgstr "" +msgstr "Deshabilitar " #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:8 msgid "Windows Camouflage" -msgstr "" +msgstr "Camuflatge de Windows" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:10 @@ -68,15 +72,17 @@ msgid "" "This option makes Tails look like Microsoft Windows 10. This can be useful " "to avoid attracting suspicion in public places." msgstr "" +"Aquesta opció permet a Tails visualitzar-se com Microsoft Windows 10. " +"Permeten no aixecar sospites en llocs públics." #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:12 msgid "Microsoft Windows 10 camouflage" -msgstr "" +msgstr "Camuflatge de Microsoft Windows 10" #: ../data/greeter.ui.h:13 msgid "MAC Address Spoofing" -msgstr "" +msgstr "Falsejament de direcció MAC" #: ../data/greeter.ui.h:14 msgid "" @@ -85,28 +91,34 @@ msgid "" " as it helps you hide your geographical location. But it might also create " "connectivity problems or look suspicious." msgstr "" +"El falsejament de la direcció MAC amaga el número de serie de xarxa " +"(d'interfícies sense fils o amb fil) a la xarxa local. El falsejament de " +"direccions MAC en general és segur al amagar la localització geogràfica. " +"Però també crea problemes de connectivitat i sembla sospitós. " #: ../data/greeter.ui.h:15 msgid "Spoof all MAC addresses (default)" -msgstr "" +msgstr "Falsejament de totes les direccions MAC (per defecte)" #: ../data/greeter.ui.h:16 msgid "Don't spoof MAC addresses" -msgstr "" +msgstr "No falsejar les direccions MAC" #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532 msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "" +msgstr "No es pot desbloquejar la memòria encriptada amb la contrasenya." #: ../data/greeter.ui.h:18 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "" +"Configurarà el pont i el servidor intermedi de Tor, posterior a una connexió" +" a la xarxa." #: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" -msgstr "" +msgstr "Benvingut a Tails!" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:21 @@ -114,81 +126,85 @@ msgctxt "" msgid "" "To get guided through Tails' settings, click on Take a Tour above" msgstr "" +"Per esser guiat als paràmetres de Tails, faci click a Fer un visita " +"guiada a dalt." #: ../data/greeter.ui.h:22 msgid "Language & Region" -msgstr "" +msgstr "Llengua i regió" #: ../data/greeter.ui.h:23 msgid "Default Settings" -msgstr "" +msgstr "Paràmetres per defecte" #: ../data/greeter.ui.h:24 msgid "Save Language & Region Settings" -msgstr "" +msgstr "Desar paràmetres de llengua i regió" #: ../data/greeter.ui.h:25 msgid "_Language" -msgstr "" +msgstr "_Llengua" #: ../data/greeter.ui.h:26 msgid "_Keyboard Layout" -msgstr "" +msgstr "_Disposició del teclat" #: ../data/greeter.ui.h:27 msgid "_Formats" -msgstr "" +msgstr "_Formats" #: ../data/greeter.ui.h:28 msgid "_Time Zone" -msgstr "" +msgstr "_Zona horària" #: ../data/greeter.ui.h:29 msgid "Encrypted _Persistent Storage" -msgstr "" +msgstr "_Emmagatzematge persistent encriptat" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" -msgstr "" +msgstr "Mostra contrasenya" #: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" -msgstr "" +msgstr "Paràmetres d'emmagatzematge persistent" #. The label for this placeholder text is not very big, so keep this string #. short. #: ../data/greeter.ui.h:33 msgid "Enter your passphrase to unlock the persistent storage" -msgstr "" +msgstr "Entrar contrasenya per desbloquejar l'emmagatzematge persistent" #: ../data/greeter.ui.h:34 ../tailsgreeter/gui.py:478 #: ../tailsgreeter/gui.py:528 msgid "Unlock" -msgstr "" +msgstr "Desbloquejar" #: ../data/greeter.ui.h:35 msgid "Relock Persistent Storage" -msgstr "" +msgstr "Re-bloquejar l'emmagatzemament persistent" #: ../data/greeter.ui.h:36 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" +"El vostre emmagatzematge persistent està desbloquejat. Reinicieu Tails per a" +" bloquejar-lo de nou." #: ../data/greeter.ui.h:37 msgid "_Additional Settings" -msgstr "" +msgstr "_Paràmetres addicionals" #: ../data/greeter.ui.h:38 msgid "Save Additional Settings" -msgstr "" +msgstr "Desar paràmetres addicionals" #: ../data/greeter.ui.h:39 msgid "Add an additional setting" -msgstr "" +msgstr "Afegir paràmetres addicionals" #: ../data/greeter.ui.h:40 msgid "Network Configuration" -msgstr "" +msgstr "Configuració de xarxa" #: ../data/greeter.ui.h:41 msgid "" @@ -196,98 +212,103 @@ msgid "" "configure a Tor bridge or a local proxy. To work completely offline, you can" " disable all networking." msgstr "" +"Si la connexió a Internet és censurada, filtrada o amb servidor intermedi " +"pot configurar un pont o servidor intermedi Tor. Per treballar fora de " +"línia, pot deshabilitar totes les xarxes." #: ../data/greeter.ui.h:42 msgid "Connect directly to the Tor network (default)" -msgstr "" +msgstr "Connectat directament a la xarxa Tor (per defecte)" #: ../data/greeter.ui.h:43 msgid "Configure a Tor bridge or local proxy" -msgstr "" +msgstr "Configureu un pont Tor o un proxy local" #: ../data/greeter.ui.h:44 msgid "Disable all networking" -msgstr "" +msgstr "Desactiva tota la xarxa" #: ../data/greeter.ui.h:45 msgid "" "The default settings are safe in most situations. To add a custom setting, " "press the \"+\" button below." msgstr "" +"Els valors per defecte són segurs en la majoria de situacions. Per afegir " +"una configuració personalitzada, pressionar el botó \"+\"." #: ../data/greeter.ui.h:46 msgid "_Administration Password" -msgstr "" +msgstr "_Contrasenya d'administrador" #: ../data/greeter.ui.h:47 ../tailsgreeter/utils.py:45 msgid "Off (default)" -msgstr "" +msgstr "Desactivació (defecte)" #: ../data/greeter.ui.h:48 msgid "_MAC Address Spoofing" -msgstr "" +msgstr "_Adreça MAC simulada" #: ../data/greeter.ui.h:49 ../tailsgreeter/utils.py:43 msgid "On (default)" -msgstr "" +msgstr "Activació (defecte)" #: ../data/greeter.ui.h:50 msgid "_Network Connection" -msgstr "" +msgstr "_Connexió de xarxa" #: ../data/greeter.ui.h:51 ../tailsgreeter/gui.py:385 msgid "Direct (default)" -msgstr "" +msgstr "Directe (defecte)" #: ../data/greeter.ui.h:52 msgid "_Windows Camouflage" -msgstr "" +msgstr "_Camuflatge de finestres" #: ../tailsgreeter/gui.py:391 msgid "Bridge & Proxy" -msgstr "" +msgstr "Pont i servidor intermedi" #: ../tailsgreeter/gui.py:397 msgid "Offline" -msgstr "" +msgstr "Fora de línia" #: ../tailsgreeter/gui.py:481 msgid "Failed to relock persistent storage." -msgstr "" +msgstr "Error al blocar l'emmagatzemament persistent." #: ../tailsgreeter/gui.py:499 msgid "Unlocking…" -msgstr "" +msgstr "Desbloquejar" #: ../tailsgreeter/gui.py:594 msgid "Additional Settings" -msgstr "" +msgstr "Paràmetres adicionals" #: ../tailsgreeter/gui.py:602 msgid "Cancel" -msgstr "" +msgstr "Cancel·la" #: ../tailsgreeter/gui.py:608 msgid "Add" -msgstr "" +msgstr "Afegeix" #: ../tailsgreeter/gui.py:616 msgid "Back" -msgstr "" +msgstr "Enrera" #: ../tailsgreeter/gui.py:730 msgid "Shutdown" -msgstr "" +msgstr "Tancar" #: ../tailsgreeter/gui.py:735 msgid "_Start Tails" -msgstr "" +msgstr "_Iniciar Tails" #. Translators: please do not translate this string (it is read from #. Gtk translation) #: ../tailsgreeter/language.py:137 msgid "default:LTR" -msgstr "" +msgstr "per defecte:LTR" #: ../tailsgreeter/persistence.py:91 #, python-brace-format @@ -295,6 +316,8 @@ msgid "" "live-persist failed with return code {returncode}:\n" "{stderr}" msgstr "" +"live-persist ha fallat amb el següent codi {returncode}:\n" +"{stderr}" #: ../tailsgreeter/persistence.py:124 ../tailsgreeter/persistence.py:141 #, python-brace-format @@ -303,6 +326,9 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"cryptsetup amb el següent codi {returncode}:\n" +"{stdout}\n" +"{stderr}" #: ../tailsgreeter/persistence.py:158 #, python-brace-format @@ -311,6 +337,9 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"ive-persist ha fallat amb el següent codi {returncode}:\n" +"{stdout}\n" +"{stderr}" #: ../tailsgreeter/persistence.py:172 #, python-brace-format @@ -319,11 +348,14 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"unmount ha fallat amb el següent codi {returncode}:\n" +"{stdout}\n" +"{stderr}" #: ../tailsgreeter/utils.py:48 msgid "On" -msgstr "" +msgstr "Activat" #: ../tailsgreeter/utils.py:50 msgid "Off" -msgstr "" +msgstr "Desactivar"

1 0

[translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
by translation＠torproject.org 23 Oct '19

23 Oct '19

commit 0ade21a1f780bed08a9e5f7cffe34b3af12794d2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 23:47:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- ca/messages.json | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/ca/messages.json b/ca/messages.json index 0d638c7d4..d0f4311ae 100644 --- a/ca/messages.json +++ b/ca/messages.json @@ -1,80 +1,80 @@ { "appDesc": { - "message": "Snowflake is a WebRTC pluggable transport for Tor." + "message": "Snowflake és un complement per al Tor, basat en WebRTC." }, "popupEnabled": { - "message": "Enabled" + "message": "Habilitat" }, "popupLearnMore": { - "message": "Learn more" + "message": "Més informació" }, "popupStatusOff": { - "message": "Snowflake is off" + "message": "Snowflake està inhabilitat" }, "popupStatusOn": { - "message": "Number of users currently connected: $1" + "message": "Nombre d'usuaris connectats actualment: $1" }, "popupStatusReady": { - "message": "Your Snowflake is ready to help users circumvent censorship" + "message": "El vostre Snowflake està preparat per ajudar a altres usuaris a eludir la censura" }, "popupWebRTCOff": { - "message": "WebRTC feature is not detected." + "message": "No s'ha detectat la característica WebRTC." }, "popupBridgeUnreachable": { - "message": "Could not connect to the bridge." + "message": "No es pot connectar al pont de línia." }, "popupDescOn": { - "message": "Number of users your Snowflake has helped circumvent censorship in the last 24 hours: $1" + "message": "Nombre d'usuaris que el vostre Snowflake ha ajudat a eludir la censura en les últimes 24 hores: $1" }, "badgeCookiesOff": { - "message": "Cookies are not enabled." + "message": "Les galetes no estan activades." }, "websiteIntro": { - "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">documentation wiki</a>." + "message": "Snowflake és un sistema per defensar-se contra la censura a Internet. La gent a qui s'aplica aquesta censura pot utilitzar Snowflake per accedir a Internet. La connexió funciona mitjançant servidors intermediaris de Snowflake, creats per voluntaris. Per a més informació quant al funcionament del Snowflake, veieu la <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\">documentació al wiki</a>." }, "docWiki": { - "message": "documentation wiki" + "message": "Wiki de documentació" }, "browser": { - "message": "Browser" + "message": "Navegador" }, "censoredUsers": { - "message": "If your internet access is censored, you should download <a href=\"https://www.torproject.org/download/\">Tor Browser</a>." + "message": "Si s'està aplicant cap censura al vostre accés a Internet, baixeu el <a href=\"https://www.torproject.org/download/\">Navegador Tor</a>." }, "extension": { - "message": "Extension" + "message": "Complement" }, "installExtension": { - "message": "If your internet access is not censored, you should consider installing the Snowflake extension to help users in censored networks. There is no need to worry about which websites people are accessing through your proxy. Their visible browsing IP address will match their Tor exit node, not yours." + "message": "Si el vostre accés a Internet no està censurat, considereu instal·lar el complement Snowflake per ajudar a usuaris amb censura a les seves connexions. No us heu d'amoïnar pel contingut web que visitin mitjançant el vostre servidor intermediari. La seva adreça IP coincidirà amb el node de sortida del Tor, no la vostra IP." }, "installFirefox": { - "message": "Install in Firefox" + "message": "Instal·la al Firefox " }, "installChrome": { - "message": "Install in Chrome" + "message": "Instal·la al Chrome" }, "reportingBugs": { - "message": "Reporting Bugs" + "message": "Informació d'errors" }, "fileBug": { - "message": "If you encounter problems with Snowflake as a client or a proxy, please consider filing a bug. To do so, you will have to," + "message": "Si trobeu cap problema utilitzant el Snowflake com a client o com a servidor intermediari, notifiqueu l'error. Simplement," }, "sharedAccount": { - "message": "Either <a href=\"https://trac.torproject.org/projects/tor/register\">create an account</a> or <a href=\"https://trac.torproject.org/projects/tor/login\">log in</a> using the shared cypherpunks account with password writecode." + "message": "<a href=\"https://trac.torproject.org/projects/tor/register\">Creeu un compte</a> o <a href=\"https://trac.torproject.org/projects/tor/login\">Inicieu la sessió</a> al compte compartit cypherpunks amb el codi facilitat." }, "bugTracker": { - "message": "<a href=\"https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a> using our bug tracker." + "message": "<a href=\"https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">Empleneu un tiquet</a> mitjançant el nostre sistema." }, "descriptive": { - "message": "Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug. Consider adding keywords snowflake-webextension or snowflake-client to let us know how which part of the Snowflake system is experiencing problems." + "message": "Sigueu el més descriptiu possible en emplenar (en anglès) el tiquet i, si és possible, afegiu informes de registre que siguin d'ajuda a reproduir el problema. Considereu afegir les paraules clau snowflake-webextension o snowflake-client segons calgui per ajudar-nos a saber on esteu experimentant el problema." }, "embed": { - "message": "Embed" + "message": "Incrusta" }, "possible": { - "message": "It is now possible to embed the Snowflake badge on any website:" + "message": "Podeu afegir la insígnia del Snowflake a qualsevol web:" }, "looksLike": { - "message": "Which looks like this:" + "message": "I es veurà d'aquesta manera:" } }

1 0