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

[webwml/master] fix header sizes in job posting
by sebastian＠torproject.org 31 Aug '16

31 Aug '16

commit b9b304970d5aba9cb965e41893b0091466a3e256 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Aug 31 18:39:21 2016 +0200 fix header sizes in job posting --- about/en/jobs-grants-officer.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/about/en/jobs-grants-officer.wml b/about/en/jobs-grants-officer.wml index 3227fa6..eb93b0b 100644 --- a/about/en/jobs-grants-officer.wml +++ b/about/en/jobs-grants-officer.wml @@ -28,9 +28,9 @@ understanding.” Officer. This new, senior level position will report directly to the Executive Director and will manage the offsite Accounting Manager. -<h1 id="major-responsibilities-and-duties">The Chief Financial and +<h2 id="major-responsibilities-and-duties">The Chief Financial and Grants Officer will serve as the Tor Project's senior grants officer. -Grant-related tasks include, but are not limited to:</h1> +Grant-related tasks include, but are not limited to:</h2> <ul> <li>Oversee grants and contracts to ensure compliance with funder

1 0

[tor/master] Fix all "BUG" warnings created from link-handshake tests.
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit 26a63a93033fd2f46558b7b1ec2140c4d309cc38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 11:37:18 2016 -0400 Fix all "BUG" warnings created from link-handshake tests. --- src/test/test_link_handshake.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index 4038783..49e24ab 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -173,6 +173,8 @@ test_link_handshake_certs_ok(void *arg) UNMOCK(tor_tls_cert_matches_key); UNMOCK(connection_or_write_var_cell_to_buf); UNMOCK(connection_or_send_netinfo); + memset(c1->identity_digest, 0, sizeof(c1->identity_digest)); + memset(c2->identity_digest, 0, sizeof(c2->identity_digest)); connection_free_(TO_CONN(c1)); connection_free_(TO_CONN(c2)); tor_free(cell1); @@ -209,6 +211,7 @@ recv_certs_cleanup(const struct testcase_t *test, void *obj) if (d) { tor_free(d->cell); certs_cell_free(d->ccell); + connection_or_remove_from_identity_map(d->c); connection_free_(TO_CONN(d->c)); circuitmux_free(d->chan->base_.cmux); tor_free(d->chan); @@ -650,6 +653,8 @@ authenticate_data_cleanup(const struct testcase_t *test, void *arg) authenticate_data_t *d = arg; if (d) { tor_free(d->cell); + connection_or_remove_from_identity_map(d->c1); + connection_or_remove_from_identity_map(d->c2); connection_free_(TO_CONN(d->c1)); connection_free_(TO_CONN(d->c2)); circuitmux_free(d->chan2->base_.cmux); @@ -677,6 +682,8 @@ authenticate_data_setup(const struct testcase_t *test) MOCK(channel_set_circid_type, mock_set_circid_type); d->c1 = or_connection_new(CONN_TYPE_OR, AF_INET); d->c2 = or_connection_new(CONN_TYPE_OR, AF_INET); + tor_addr_from_ipv4h(&d->c1->base_.addr, 0x01020304); + tor_addr_from_ipv4h(&d->c2->base_.addr, 0x05060708); d->key1 = pk_generate(2); d->key2 = pk_generate(3);

1 0

[tor/master] Another log testing helper helper, for matching partial strings.
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit 14c07f3f2199053e92c6bea90da332efbb3811e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 11:35:12 2016 -0400 Another log testing helper helper, for matching partial strings. --- src/test/log_test_helpers.c | 17 +++++++++++++++++ src/test/log_test_helpers.h | 1 + 2 files changed, 18 insertions(+) diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index 166a777..1828689 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -59,6 +59,23 @@ mock_saved_log_has_message(const char *msg) return has_msg; } +int +mock_saved_log_has_message_containing(const char *msg) +{ + if (saved_logs) { + SMARTLIST_FOREACH(saved_logs, mock_saved_log_entry_t *, m, + { + if (msg && m->generated_msg && + strstr(m->generated_msg, msg)) { + return 1; + } + }); + } + + return 0; +} + + /* Do the saved logs have any messages with severity? */ int mock_saved_log_has_severity(int severity) diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 1966f17..d767453 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -25,6 +25,7 @@ int setup_capture_of_logs(int new_level); void teardown_capture_of_logs(int prev); int mock_saved_log_has_message(const char *msg); +int mock_saved_log_has_message_containing(const char *msg); int mock_saved_log_has_severity(int severity); int mock_saved_log_has_entry(void);

1 0

[tor/master] Improvements to test_link_handshake: check specific error messages
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit 1f7dc823c5077101e4b0760ded1d7259d57d7506 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 12:11:01 2016 -0400 Improvements to test_link_handshake: check specific error messages Otherwise it's too easy to lose our test coverage. --- src/test/test_link_handshake.c | 64 +++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 10 deletions(-) diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index 49e24ab..ce12f2a 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -15,6 +15,7 @@ #include "scheduler.h" #include "test.h" +#include "log_test_helpers.h" static var_cell_t *mock_got_var_cell = NULL; @@ -335,30 +336,51 @@ test_link_handshake_recv_certs_ok_server(void *arg) test_link_handshake_recv_certs_ ## name(void *arg) \ { \ certs_data_t *d = arg; \ + const char *require_failure_message = NULL; \ + const int prev_level = setup_capture_of_logs(LOG_INFO); \ { code ; } \ channel_tls_process_certs_cell(d->cell, d->chan); \ tt_int_op(1, ==, mock_close_called); \ tt_int_op(0, ==, mock_send_authenticate_called); \ tt_int_op(0, ==, mock_send_netinfo_called); \ + if (require_failure_message) { \ + tt_assert(mock_saved_log_has_message_containing( \ + require_failure_message)); \ + } \ done: \ - ; \ + teardown_capture_of_logs(prev_level); \ } -CERTS_FAIL(badstate, d->c->base_.state = OR_CONN_STATE_CONNECTING) -CERTS_FAIL(badproto, d->c->link_proto = 2) -CERTS_FAIL(duplicate, d->c->handshake_state->received_certs_cell = 1) +CERTS_FAIL(badstate, + require_failure_message = "We're not doing a v3 handshake!"; + d->c->base_.state = OR_CONN_STATE_CONNECTING;) +CERTS_FAIL(badproto, + require_failure_message = "not using link protocol >= 3"; + d->c->link_proto = 2) +CERTS_FAIL(duplicate, + require_failure_message = "We already got one"; + d->c->handshake_state->received_certs_cell = 1) CERTS_FAIL(already_authenticated, + require_failure_message = "We're already authenticated!"; d->c->handshake_state->authenticated = 1) -CERTS_FAIL(empty, d->cell->payload_len = 0) -CERTS_FAIL(bad_circid, d->cell->circ_id = 1) -CERTS_FAIL(truncated_1, d->cell->payload[0] = 5) +CERTS_FAIL(empty, + require_failure_message = "It had no body"; + d->cell->payload_len = 0) +CERTS_FAIL(bad_circid, + require_failure_message = "It had a nonzero circuit ID"; + d->cell->circ_id = 1) +CERTS_FAIL(truncated_1, + require_failure_message = "It couldn't be parsed"; + d->cell->payload[0] = 5) CERTS_FAIL(truncated_2, { + require_failure_message = "It couldn't be parsed"; d->cell->payload_len = 4; memcpy(d->cell->payload, "\x01\x01\x00\x05", 4); }) CERTS_FAIL(truncated_3, { + require_failure_message = "It couldn't be parsed"; d->cell->payload_len = 7; memcpy(d->cell->payload, "\x01\x01\x00\x05""abc", 7); }) @@ -370,30 +392,35 @@ CERTS_FAIL(truncated_3, CERTS_FAIL(not_x509, { + require_failure_message = "Received undecodable certificate"; certs_cell_cert_setlen_body(certs_cell_get_certs(d->ccell, 0), 3); certs_cell_get_certs(d->ccell, 0)->cert_len = 3; REENCODE(); }) CERTS_FAIL(both_link, { + require_failure_message = "Duplicate x509 certificate"; certs_cell_get_certs(d->ccell, 0)->cert_type = 1; certs_cell_get_certs(d->ccell, 1)->cert_type = 1; REENCODE(); }) CERTS_FAIL(both_id_rsa, { + require_failure_message = "Duplicate x509 certificate"; certs_cell_get_certs(d->ccell, 0)->cert_type = 2; certs_cell_get_certs(d->ccell, 1)->cert_type = 2; REENCODE(); }) CERTS_FAIL(both_auth, { + require_failure_message = "Duplicate x509 certificate"; certs_cell_get_certs(d->ccell, 0)->cert_type = 3; certs_cell_get_certs(d->ccell, 1)->cert_type = 3; REENCODE(); }) CERTS_FAIL(wrong_labels_1, { + require_failure_message = "The link certificate was not valid"; certs_cell_get_certs(d->ccell, 0)->cert_type = 2; certs_cell_get_certs(d->ccell, 1)->cert_type = 1; REENCODE(); @@ -404,6 +431,7 @@ CERTS_FAIL(wrong_labels_2, const tor_x509_cert_t *b; const uint8_t *enca; size_t lena; + require_failure_message = "The link certificate was not valid"; tor_tls_get_my_certs(1, &a, &b); tor_x509_cert_get_der(a, &enca, &lena); certs_cell_cert_setlen_body(certs_cell_get_certs(d->ccell, 1), lena); @@ -414,16 +442,20 @@ CERTS_FAIL(wrong_labels_2, }) CERTS_FAIL(wrong_labels_3, { + require_failure_message = "The certs we wanted were missing"; certs_cell_get_certs(d->ccell, 0)->cert_type = 2; certs_cell_get_certs(d->ccell, 1)->cert_type = 3; REENCODE(); }) CERTS_FAIL(server_missing_certs, { + require_failure_message = "The certs we wanted were missing"; d->c->handshake_state->started_here = 0; }) CERTS_FAIL(server_wrong_labels_1, { + require_failure_message = + "The authentication certificate was not valid"; d->c->handshake_state->started_here = 0; certs_cell_get_certs(d->ccell, 0)->cert_type = 2; certs_cell_get_certs(d->ccell, 1)->cert_type = 3; @@ -582,13 +614,19 @@ test_link_handshake_recv_authchallenge_ok_unrecognized(void *arg) test_link_handshake_recv_authchallenge_ ## name(void *arg) \ { \ authchallenge_data_t *d = arg; \ + const char *require_failure_message = NULL; \ + const int prev_level = setup_capture_of_logs(LOG_INFO); \ { code ; } \ channel_tls_process_auth_challenge_cell(d->cell, d->chan); \ tt_int_op(1, ==, mock_close_called); \ tt_int_op(0, ==, mock_send_authenticate_called); \ tt_int_op(0, ==, mock_send_netinfo_called); \ + if (require_failure_message) { \ + tt_assert(mock_saved_log_has_message_containing( \ + require_failure_message)); \ + } \ done: \ - ; \ + teardown_capture_of_logs(prev_level); \ } AUTHCHALLENGE_FAIL(badstate, @@ -805,13 +843,19 @@ test_link_handshake_auth_cell(void *arg) test_link_handshake_auth_ ## name(void *arg) \ { \ authenticate_data_t *d = arg; \ + const char *require_failure_message = NULL; \ + const int prev_level = setup_capture_of_logs(LOG_INFO); \ { code ; } \ tt_int_op(d->c2->handshake_state->authenticated, ==, 0); \ channel_tls_process_authenticate_cell(d->cell, d->chan2); \ tt_int_op(mock_close_called, ==, 1); \ tt_int_op(d->c2->handshake_state->authenticated, ==, 0); \ - done: \ - ; \ + if (require_failure_message) { \ + tt_assert(mock_saved_log_has_message_containing( \ + require_failure_message)); \ + } \ + done: \ + teardown_capture_of_logs(prev_level); \ } AUTHENTICATE_FAIL(badstate,

1 0

[tor/master] Merge remote-tracking branch 'teor/bug19905'
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit debe846cb88c1157c1820c88a7128dd2362335d3 Merge: bbac9e1 b822c58 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 10:58:41 2016 -0400 Merge remote-tracking branch 'teor/bug19905' Makefile.am | 4 ++-- changes/bug19905 | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix the test network IPv6 check so it works on Linux
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit b822c5891a2a62640c1d64849f735559e55c662e Author: teor <teor2345(a)gmail.com> Date: Wed Aug 31 15:22:34 2016 +1000 Fix the test network IPv6 check so it works on Linux --- Makefile.am | 4 ++-- changes/bug19905 | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index e45856c..c160af9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -100,11 +100,11 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert # only run IPv6 tests if we can ping6 ::1 (localhost) # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011) # only run mixed tests if we have a tor-stable binary -# see #17015 for autodetection of different tor versions +# Try both the BSD and the Linux ping6 syntax, because they're incompatible test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) @flavors="$(TEST_CHUTNEY_FLAVORS)"; \ - if ping6 -q -c 1 -o ::1 >/dev/null 2>&1; then \ + if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 >/dev/null 2>&1; then \ echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \ else \ diff --git a/changes/bug19905 b/changes/bug19905 new file mode 100644 index 0000000..b689740 --- /dev/null +++ b/changes/bug19905 @@ -0,0 +1,3 @@ + o Minor bugfixes (IPv6, testing): + - Check for IPv6 correctly on Linux when running test networks. + Fixes bug 19905; bugfix on 0.2.7.3-rc; patch by teor.

1 0

[tor/master] Don't warn on unlink(bw_accounting) when errno == ENOENT
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit bbac9e1d0ceb173e2c3c12b1837b6036f10f50ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 10:57:09 2016 -0400 Don't warn on unlink(bw_accounting) when errno == ENOENT Patch from pastly; fixes bug 19964. --- changes/bug19964 | 6 ++++++ src/or/hibernate.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug19964 b/changes/bug19964 new file mode 100644 index 0000000..af71942 --- /dev/null +++ b/changes/bug19964 @@ -0,0 +1,6 @@ + o Minor bugfixes (logging): + - When we are unable to remove the bw_accounting file, do not warn + if the reason we couldn't remove it was that it didn't exist. + Fixes bug 19964; bugfix on 0.2.5.4-alpha. Patch + from 'pastly'. + diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 209aae0..7e25306 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -692,7 +692,7 @@ read_bandwidth_usage(void) int res; res = unlink(fname); - if (res != 0) { + if (res != 0 && errno != ENOENT) { log_warn(LD_FS, "Failed to unlink %s: %s", fname, strerror(errno));

1 0

[tor/master] Fix a deref-before-null-check complaint
by nickm＠torproject.org 31 Aug '16

31 Aug '16

commit c15b99e6e99fef6130dd6c53609a664efd82ef50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 31 10:32:10 2016 -0400 Fix a deref-before-null-check complaint Found by coverity scan; this is CID 1372329. Also, reindent some oddly indented code. --- src/or/circuitbuild.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 2e7ea2f..aa2b0b2 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -855,7 +855,12 @@ circuit_pick_extend_handshake(uint8_t *cell_type_out, /* XXXX030 Remove support for deciding to use TAP. */ /* It is an error to extend if there is no previous node. */ - tor_assert_nonfatal(node_prev); + if (BUG(node_prev == NULL)) { + *cell_type_out = RELAY_COMMAND_EXTEND; + *create_cell_type_out = CELL_CREATE; + return; + } + /* It is an error for a node with a known version to be so old it does not * support ntor. */ tor_assert_nonfatal(routerstatus_version_supports_ntor(node_prev->rs, 1)); @@ -863,16 +868,15 @@ circuit_pick_extend_handshake(uint8_t *cell_type_out, /* Assume relays without tor versions or routerstatuses support ntor. * The authorities enforce ntor support, and assuming and failing is better * than allowing a malicious node to perform a protocol downgrade to TAP. */ - if (node_prev && - *handshake_type_out != ONION_HANDSHAKE_TYPE_TAP && + if (*handshake_type_out != ONION_HANDSHAKE_TYPE_TAP && (node_has_curve25519_onion_key(node_prev) || (routerstatus_version_supports_ntor(node_prev->rs, 1)))) { - *cell_type_out = RELAY_COMMAND_EXTEND2; - *create_cell_type_out = CELL_CREATE2; - } else { - *cell_type_out = RELAY_COMMAND_EXTEND; - *create_cell_type_out = CELL_CREATE; - } + *cell_type_out = RELAY_COMMAND_EXTEND2; + *create_cell_type_out = CELL_CREATE2; + } else { + *cell_type_out = RELAY_COMMAND_EXTEND; + *create_cell_type_out = CELL_CREATE; + } } /** This is the backbone function for building circuits.

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 31 Aug '16

31 Aug '16

commit 47571f21d6bc29fe5801a5d1c6fa09b514c1b462 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 31 11:46:21 2016 +0000 Update translations for tails-misc_completed --- hr_HR.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index 7c5a967..c9477f2 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-07-31 10:43+0200\n" -"PO-Revision-Date: 2016-08-30 09:52+0000\n" +"PO-Revision-Date: 2016-08-31 11:33+0000\n" "Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -236,14 +236,14 @@ msgstr "Druge poruke pružene od strane GnuPG-a:" #: config/chroot_local-includes/usr/local/bin/icedove:27 msgid "The Claws Mail persistence feature is activated." -msgstr "Claws Mail-ova značajka trajnosti je aktivirana." +msgstr "Claws Mailova značajka trajnosti je aktivirana." #: config/chroot_local-includes/usr/local/bin/icedove:29 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." -msgstr "Ako imate email-ove pohranjene u Claws Mail-u, trebali bi <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrirati svoje podatke</a> prije pokretanja Icedove-a." +msgstr "Ako imate emailove pohranjene u Claws Mailu, trebali bi <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrirati svoje podatke</a> prije pokretanja Icedovea." #: config/chroot_local-includes/usr/local/bin/icedove:34 msgid "" @@ -262,7 +262,7 @@ msgstr "Isključi" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" -msgstr "Nije dostupno" +msgstr "nije dostupno" #: config/chroot_local-includes/usr/local/bin/tails-about:19 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 @@ -283,7 +283,7 @@ msgstr "Informacije o verziji:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:27 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 msgid "About Tails" -msgstr "O Tails-u" +msgstr "O Tailsu" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 31 Aug '16

31 Aug '16

commit 4609e61acfefa46f61dc258314b155c43af80bad Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 31 11:46:17 2016 +0000 Update translations for tails-misc --- hr_HR.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index 7c5a967..c9477f2 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-07-31 10:43+0200\n" -"PO-Revision-Date: 2016-08-30 09:52+0000\n" +"PO-Revision-Date: 2016-08-31 11:33+0000\n" "Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -236,14 +236,14 @@ msgstr "Druge poruke pružene od strane GnuPG-a:" #: config/chroot_local-includes/usr/local/bin/icedove:27 msgid "The Claws Mail persistence feature is activated." -msgstr "Claws Mail-ova značajka trajnosti je aktivirana." +msgstr "Claws Mailova značajka trajnosti je aktivirana." #: config/chroot_local-includes/usr/local/bin/icedove:29 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." -msgstr "Ako imate email-ove pohranjene u Claws Mail-u, trebali bi <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrirati svoje podatke</a> prije pokretanja Icedove-a." +msgstr "Ako imate emailove pohranjene u Claws Mailu, trebali bi <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrirati svoje podatke</a> prije pokretanja Icedovea." #: config/chroot_local-includes/usr/local/bin/icedove:34 msgid "" @@ -262,7 +262,7 @@ msgstr "Isključi" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" -msgstr "Nije dostupno" +msgstr "nije dostupno" #: config/chroot_local-includes/usr/local/bin/tails-about:19 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 @@ -283,7 +283,7 @@ msgstr "Informacije o verziji:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:27 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 msgid "About Tails" -msgstr "O Tails-u" +msgstr "O Tailsu" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124

1 0