tor-commits August 2013

tor-commits@lists.torproject.org

19 participants
1224 discussions

[tor/master] Prepare patch for ticket 5129 for merging.
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit ebd4ab1506517b32ee3bd5bd1597b4373aa56ee7 Author: Peter Retzlaff <peter.retzlaff(a)student.hpi.uni-potsdam.de> Date: Mon May 27 19:16:43 2013 +0000 Prepare patch for ticket 5129 for merging. - Preserve old eventdns code. - Add function to close sockets cross-platform, without accounting. - Add changes/ file. --- changes/ticket5129 | 3 ++ src/common/compat.c | 141 ++++++++++++++++++++++++++++++++++++++------------- src/common/compat.h | 12 +++++ src/ext/eventdns.c | 9 ++++ src/or/connection.c | 21 ++------ 5 files changed, 133 insertions(+), 53 deletions(-) diff --git a/changes/ticket5129 b/changes/ticket5129 new file mode 100644 index 0000000..c05ca68 --- /dev/null +++ b/changes/ticket5129 @@ -0,0 +1,3 @@ + o Minor features: + - Use the SOCK_NONBLOCK socket type, if supported, to open nonblocking + sockets in a single system call. Implements ticket #5129. diff --git a/src/common/compat.c b/src/common/compat.c index 0e943f3..af8f288 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -948,24 +948,40 @@ socket_accounting_unlock(void) } /** As close(), but guaranteed to work for sockets across platforms (including - * Windows, where close()ing a socket doesn't work. Returns 0 on success, -1 - * on failure. */ + * Windows, where close()ing a socket doesn't work. Returns 0 on success and + * the socket error code on failure. */ int -tor_close_socket(tor_socket_t s) +tor_close_socket_simple(tor_socket_t s) { int r = 0; /* On Windows, you have to call close() on fds returned by open(), - * and closesocket() on fds returned by socket(). On Unix, everything - * gets close()'d. We abstract this difference by always using - * tor_close_socket to close sockets, and always using close() on - * files. - */ -#if defined(_WIN32) - r = closesocket(s); -#else - r = close(s); -#endif + * and closesocket() on fds returned by socket(). On Unix, everything + * gets close()'d. We abstract this difference by always using + * tor_close_socket to close sockets, and always using close() on + * files. + */ + #if defined(_WIN32) + r = closesocket(s); + #else + r = close(s); + #endif + + if (r != 0) { + int err = tor_socket_errno(-1); + log_info(LD_NET, "Close returned an error: %s", tor_socket_strerror(err)); + return err; + } + + return r; +} + +/** As tor_close_socket_simple(), but keeps track of the number + * of open sockets. Returns 0 on success, -1 on failure. */ +int +tor_close_socket(tor_socket_t s) +{ + int r = tor_close_socket_simple(s); socket_accounting_lock(); #ifdef DEBUG_SOCKET_COUNTING @@ -980,13 +996,11 @@ tor_close_socket(tor_socket_t s) if (r == 0) { --n_sockets_open; } else { - int err = tor_socket_errno(-1); - log_info(LD_NET, "Close returned an error: %s", tor_socket_strerror(err)); #ifdef _WIN32 - if (err != WSAENOTSOCK) + if (r != WSAENOTSOCK) --n_sockets_open; #else - if (err != EBADF) + if (r != EBADF) --n_sockets_open; #endif r = -1; @@ -1032,17 +1046,38 @@ mark_socket_open(tor_socket_t s) tor_socket_t tor_open_socket(int domain, int type, int protocol) { + return tor_open_socket_with_extensions(domain, type, protocol, 1, 0); +} + +/** As socket(), but creates a nonblocking socket and + * counts the number of open sockets. */ +tor_socket_t +tor_open_socket_nonblocking(int domain, int type, int protocol) +{ + return tor_open_socket_with_extensions(domain, type, protocol, 1, 1); +} + +/** As socket(), but counts the number of open sockets and handles + * socket creation with either of SOCK_CLOEXEC and SOCK_NONBLOCK specified. + * cloexec and nonblock should be either 0 or 1 to indicate + * if the corresponding extension should be used.*/ +tor_socket_t +tor_open_socket_with_extensions(int domain, int type, int protocol, + int cloexec, int nonblock) +{ tor_socket_t s; -#ifdef SOCK_CLOEXEC - s = socket(domain, type|SOCK_CLOEXEC, protocol); +#if defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK) + int ext_flags = (cloexec ? SOCK_CLOEXEC : 0) | + (nonblock ? SOCK_NONBLOCK : 0); + s = socket(domain, type|ext_flags, protocol); if (SOCKET_OK(s)) goto socket_ok; /* If we got an error, see if it is EINVAL. EINVAL might indicate that, - * even though we were built on a system with SOCK_CLOEXEC support, we - * are running on one without. */ + * even though we were built on a system with SOCK_CLOEXEC and SOCK_NONBLOCK + * support, we are running on one without. */ if (errno != EINVAL) return s; -#endif /* SOCK_CLOEXEC */ +#endif /* SOCK_CLOEXEC && SOCK_NONBLOCK */ s = socket(domain, type, protocol); if (! SOCKET_OK(s)) @@ -1051,15 +1086,18 @@ tor_open_socket(int domain, int type, int protocol) #if defined(FD_CLOEXEC) if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) { log_warn(LD_FS,"Couldn't set FD_CLOEXEC: %s", strerror(errno)); -#if defined(_WIN32) - closesocket(s); -#else - close(s); -#endif - return -1; + tor_close_socket_simple(s); + return TOR_INVALID_SOCKET; } #endif + if (nonblock) { + if (set_socket_nonblocking(s) == -1) { + tor_close_socket_simple(s); + return TOR_INVALID_SOCKET; + } + } + goto socket_ok; /* So that socket_ok will not be unused. */ socket_ok: @@ -1070,19 +1108,41 @@ tor_open_socket(int domain, int type, int protocol) return s; } -/** As socket(), but counts the number of open sockets. */ +/** As accept(), but counts the number of open sockets. */ tor_socket_t tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) { + return tor_accept_socket_with_extensions(sockfd, addr, len, 1, 0); +} + +/** As accept(), but returns a nonblocking socket and + * counts the number of open sockets. */ +tor_socket_t +tor_accept_socket_nonblocking(tor_socket_t sockfd, struct sockaddr *addr, + socklen_t *len) +{ + return tor_accept_socket_with_extensions(sockfd, addr, len, 1, 1); +} + +/** As accept(), but counts the number of open sockets and handles + * socket creation with either of SOCK_CLOEXEC and SOCK_NONBLOCK specified. + * cloexec and nonblock should be either 0 or 1 to indicate + * if the corresponding extension should be used.*/ +tor_socket_t +tor_accept_socket_with_extensions(tor_socket_t sockfd, struct sockaddr *addr, + socklen_t *len, int cloexec, int nonblock) +{ tor_socket_t s; -#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) - s = accept4(sockfd, addr, len, SOCK_CLOEXEC); +#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK) + int ext_flags = (cloexec ? SOCK_CLOEXEC : 0) | + (nonblock ? SOCK_NONBLOCK : 0); + s = accept4(sockfd, addr, len, ext_flags); if (SOCKET_OK(s)) goto socket_ok; /* If we got an error, see if it is ENOSYS. ENOSYS indicates that, * even though we were built on a system with accept4 support, we * are running on one without. Also, check for EINVAL, which indicates that - * we are missing SOCK_CLOEXEC support. */ + * we are missing SOCK_CLOEXEC/SOCK_NONBLOCK support. */ if (errno != EINVAL && errno != ENOSYS) return s; #endif @@ -1092,13 +1152,22 @@ tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) return s; #if defined(FD_CLOEXEC) - if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) { - log_warn(LD_NET, "Couldn't set FD_CLOEXEC: %s", strerror(errno)); - close(s); - return TOR_INVALID_SOCKET; + if (cloexec) { + if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) { + log_warn(LD_NET, "Couldn't set FD_CLOEXEC: %s", strerror(errno)); + tor_close_socket_simple(s); + return TOR_INVALID_SOCKET; + } } #endif + if (nonblock) { + if (set_socket_nonblocking(s) == -1) { + tor_close_socket_simple(s); + return TOR_INVALID_SOCKET; + } + } + goto socket_ok; /* So that socket_ok will not be unused. */ socket_ok: diff --git a/src/common/compat.h b/src/common/compat.h index 258fc99..89a5d7f 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -450,10 +450,22 @@ typedef int socklen_t; #define TOR_INVALID_SOCKET (-1) #endif +int tor_close_socket_simple(tor_socket_t s); int tor_close_socket(tor_socket_t s); +tor_socket_t tor_open_socket_with_extensions( + int domain, int type, int protocol, + int cloexec, int nonblock); tor_socket_t tor_open_socket(int domain, int type, int protocol); +tor_socket_t tor_open_socket_nonblocking(int domain, int type, int protocol); tor_socket_t tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len); +tor_socket_t tor_accept_socket_nonblocking(tor_socket_t sockfd, + struct sockaddr *addr, + socklen_t *len); +tor_socket_t tor_accept_socket_with_extensions(tor_socket_t sockfd, + struct sockaddr *addr, + socklen_t *len, + int cloexec, int nonblock); int get_n_open_sockets(void); #define tor_socket_send(s, buf, len, flags) send(s, buf, len, flags) diff --git a/src/ext/eventdns.c b/src/ext/eventdns.c index 66280cc..8b934c4 100644 --- a/src/ext/eventdns.c +++ b/src/ext/eventdns.c @@ -2298,6 +2298,10 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns); +#if 1 + ns->socket = tor_open_socket_nonblocking(address->sa_family, SOCK_DGRAM, 0); + if (!SOCKET_OK(ns->socket)) { err = 1; goto out1; } +#else ns->socket = tor_open_socket(address->sa_family, SOCK_DGRAM, 0); if (ns->socket < 0) { err = 1; goto out1; } #ifdef _WIN32 @@ -2314,6 +2318,7 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, } #endif +#endif /* 1 */ if (global_bind_addr_is_set && !sockaddr_is_loopback((struct sockaddr*)&global_bind_address)) { if (bind(ns->socket, (struct sockaddr *)&global_bind_address, @@ -3473,8 +3478,12 @@ main(int c, char **v) { if (servertest) { int sock; struct sockaddr_in my_addr; +#if 1 + sock = tor_open_socket_nonblocking(PF_INET, SOCK_DGRAM, 0) +#else sock = tor_open_socket(PF_INET, SOCK_DGRAM, 0); fcntl(sock, F_SETFL, O_NONBLOCK); +#endif my_addr.sin_family = AF_INET; my_addr.sin_port = htons(10053); my_addr.sin_addr.s_addr = INADDR_ANY; diff --git a/src/or/connection.c b/src/or/connection.c index 6a3cc7b..28de35b 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -970,7 +970,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, log_notice(LD_NET, "Opening %s on %s", conn_type_to_string(type), fmt_addrport(&addr, usePort)); - s = tor_open_socket(tor_addr_family(&addr), + s = tor_open_socket_nonblocking(tor_addr_family(&addr), is_tcp ? SOCK_STREAM : SOCK_DGRAM, is_tcp ? IPPROTO_TCP: IPPROTO_UDP); if (!SOCKET_OK(s)) { @@ -1054,7 +1054,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, strerror(errno)); goto err; } - s = tor_open_socket(AF_UNIX, SOCK_STREAM, 0); + s = tor_open_socket_nonblocking(AF_UNIX, SOCK_STREAM, 0); if (! SOCKET_OK(s)) { log_warn(LD_NET,"Socket creation failed: %s.", strerror(errno)); goto err; @@ -1102,9 +1102,6 @@ connection_listener_new(const struct sockaddr *listensockaddr, tor_assert(0); } - if (set_socket_nonblocking(s) == -1) - goto err; - lis_conn = listener_connection_new(type, listensockaddr->sa_family); conn = TO_CONN(lis_conn); conn->socket_family = listensockaddr->sa_family; @@ -1252,7 +1249,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) tor_assert((size_t)remotelen >= sizeof(struct sockaddr_in)); memset(&addrbuf, 0, sizeof(addrbuf)); - news = tor_accept_socket(conn->s,remote,&remotelen); + news = tor_accept_socket_nonblocking(conn->s,remote,&remotelen); if (!SOCKET_OK(news)) { /* accept() error */ int e = tor_socket_errno(conn->s); if (ERRNO_IS_ACCEPT_EAGAIN(e)) { @@ -1272,10 +1269,6 @@ connection_handle_listener_read(connection_t *conn, int new_type) (int)news,(int)conn->s); make_socket_reuseable(news); - if (set_socket_nonblocking(news) == -1) { - tor_close_socket(news); - return 0; - } if (options->ConstrainedSockets) set_constrained_socket_buffers(news, (int)options->ConstrainedSockSize); @@ -1467,7 +1460,7 @@ connection_connect(connection_t *conn, const char *address, return -1; } - s = tor_open_socket(protocol_family,SOCK_STREAM,IPPROTO_TCP); + s = tor_open_socket_nonblocking(protocol_family,SOCK_STREAM,IPPROTO_TCP); if (! SOCKET_OK(s)) { *socket_error = tor_socket_errno(-1); log_warn(LD_NET,"Error creating network socket: %s", @@ -1509,12 +1502,6 @@ connection_connect(connection_t *conn, const char *address, } } - if (set_socket_nonblocking(s) == -1) { - *socket_error = tor_socket_errno(s); - tor_close_socket(s); - return -1; - } - if (options->ConstrainedSockets) set_constrained_socket_buffers(s, (int)options->ConstrainedSockSize);

1 0

[tor/master] Split the socketpair replacement code into its own function for testing
by nickm＠torproject.org 02 Aug '13

02 Aug '13

commit d6adf055828283dda2ca9c0c77a80348778c45df Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 2 10:36:01 2013 -0400 Split the socketpair replacement code into its own function for testing --- src/common/compat.c | 17 +++++++++++++++-- src/common/compat.h | 9 +++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 8aab12a..d69e3b0 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -23,6 +23,7 @@ * we can also take out the configure check. */ #define _GNU_SOURCE +#define COMPAT_PRIVATE #include "compat.h" #ifdef _WIN32 @@ -1291,6 +1292,18 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) return 0; #else + return tor_ersatz_socketpair(family, type, protocol, fd); +#endif +} + +#ifdef NEED_ERSATZ_SOCKETPAIR +/** + * Helper used to implement socketpair on systems that lack it, by + * making a direct connection to localhost. + */ +STATIC int +tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) +{ /* This socketpair does not work when localhost is down. So * it's really not the same thing at all. But it's close enough * for now, and really, when localhost is down sometimes, we @@ -1301,7 +1314,7 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) tor_socket_t acceptor = -1; struct sockaddr_in listen_addr; struct sockaddr_in connect_addr; - int size; + socklen_t size; int saved_errno = -1; if (protocol @@ -1384,8 +1397,8 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) if (acceptor != -1) tor_close_socket(acceptor); return -saved_errno; -#endif } +#endif /** Number of extra file descriptors to keep in reserve beyond those that we * tell Tor it's allowed to use. */ diff --git a/src/common/compat.h b/src/common/compat.h index 89a5d7f..8e700a9 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -8,6 +8,7 @@ #include "orconfig.h" #include "torint.h" +#include "testsupport.h" #ifdef _WIN32 #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0501 @@ -738,5 +739,13 @@ char *format_win32_error(DWORD err); #endif +#ifdef COMPAT_PRIVATE +#if !defined(HAVE_SOCKETPAIR) || defined(_WIN32) || defined(TOR_UNIT_TESTS) +#define NEED_ERSATZ_SOCKETPAIR +STATIC int tor_ersatz_socketpair(int family, int type, int protocol, + tor_socket_t fd[2]); +#endif +#endif + #endif

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 02 Aug '13

02 Aug '13

commit 4ed5aae5805ba3fda14e0e446a59a01974a1c1f8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 2 14:16:15 2013 +0000 Update translations for liveusb-creator_completed --- lv/lv.po | 210 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 113 insertions(+), 97 deletions(-) diff --git a/lv/lv.po b/lv/lv.po index c806aa8..6cf88ce 100644 --- a/lv/lv.po +++ b/lv/lv.po @@ -9,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2013-04-29 09:00+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" +"POT-Creation-Date: 2013-08-01 15:27+0200\n" +"PO-Revision-Date: 2013-08-02 14:10+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" +"Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,12 +24,12 @@ msgstr "" msgid "%(distribution)s LiveUSB Creator" msgstr "%(distribution)s LiveUSB Creator" -#: ../liveusb/gui.py:758 +#: ../liveusb/gui.py:776 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s izvēlēts" -#: ../liveusb/creator.py:1018 +#: ../liveusb/creator.py:1004 #, python-format msgid "%s already bootable" msgstr "%s jau ir sāknējams" @@ -86,16 +86,16 @@ msgid "" "persist after a reboot." msgstr "Piešķirot pastāvīgam pārklājumam papildu vietu savā USB zibatmiņā, Jums būs iespēja glabāt datus un paliekoši modificēt dzīvu sistēmu, kura darbojas. To nedarot, pēc pārlādes nebūs iespējams saglabāt datus." -#: ../liveusb/creator.py:1120 ../liveusb/creator.py:1383 +#: ../liveusb/creator.py:1106 ../liveusb/creator.py:1369 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Aprēķina %s SHA1" -#: ../liveusb/creator.py:1331 +#: ../liveusb/creator.py:1317 msgid "Cannot find" msgstr "Nav iespējams atrast" -#: ../liveusb/creator.py:574 +#: ../liveusb/creator.py:545 #, python-format msgid "Cannot find device %s" msgstr "Nav iespējams atrast ierīci %s" @@ -118,74 +118,73 @@ msgstr "Klonēt\n&&\njaunināt" msgid "Create Live USB" msgstr "Izveidot Dzīvu USB" -#: ../liveusb/creator.py:429 +#: ../liveusb/creator.py:400 #, python-format msgid "Creating %sMB persistent overlay" msgstr "Rada %sMB lielu pastāvīgo pārklājumu" -#: ../liveusb/gui.py:534 +#: ../liveusb/gui.py:556 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -" Setting a maximum limit of 8G for the persistent storage." -msgstr "Ierīce vēl nav uzmontēta, tāpēc nav iespējams noteikt brīvās vietas daudzumu. Iestata pastāvīgās krātuves maksimālo lielumu 8G." - -#: ../liveusb/gui.py:197 -#, python-format -msgid "Device is too small: it must be at least %s MiB." -msgstr "Ierīce ir pārāk maza: tai jābūt vismaz %s MiB lielai." +msgstr "Ierīce vēl nav uzmontēta, tāpēc nav iespējams noteikt brīvas vietas daudzumu." #: ../liveusb/dialog.py:157 #, python-format msgid "Download %(distribution)s" msgstr "Lejuplādēt %(distribution)s" -#: ../liveusb/gui.py:732 +#: ../liveusb/gui.py:750 msgid "Download complete!" msgstr "Lejupielāde pabeigta!" -#: ../liveusb/gui.py:736 +#: ../liveusb/gui.py:754 msgid "Download failed: " msgstr "Lejupielāde neizdevās: " -#: ../liveusb/gui.py:84 +#: ../liveusb/gui.py:88 #, python-format msgid "Downloading %s..." msgstr "Lejuplādē %s..." -#: ../liveusb/creator.py:1116 +#: ../liveusb/creator.py:1102 msgid "Drive is a loopback, skipping MBR reset" msgstr "Disks ir cilptestā, tiek izlaista MBR atiestatīšana" -#: ../liveusb/creator.py:1196 +#: ../liveusb/creator.py:808 +#, python-format +msgid "Entering unmount_device for '%(device)s'" +msgstr "Ievada unmount_device objektam '%(device)s'" + +#: ../liveusb/creator.py:1182 msgid "Error probing device" msgstr "Kļūda pētot ierīci" -#: ../liveusb/gui.py:226 +#: ../liveusb/gui.py:227 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." msgstr "Kļūda: Nav iespējams iegūt ierīces UUID vai piešķirt iezīmi. Nespēj turpināt." -#: ../liveusb/creator.py:405 +#: ../liveusb/creator.py:376 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." msgstr "Kļūda: Live CD SHA1 nav derīgs. Lai apietu šo verifikācijas pārbaudi, programmu var izpildīt ar argumentu --noverify ." -#: ../liveusb/creator.py:144 +#: ../liveusb/creator.py:145 msgid "Extracting live image to USB device..." msgstr "Tiešo attēlu izvērš USB ierīcē..." -#: ../liveusb/creator.py:1061 +#: ../liveusb/creator.py:1047 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formatē %(device)s kā FAT32" -#: ../liveusb/creator.py:139 +#: ../liveusb/creator.py:140 msgid "ISO MD5 checksum passed" msgstr "ISO MD5 kontrolsumma bija sekmīga" -#: ../liveusb/creator.py:137 +#: ../liveusb/creator.py:138 msgid "ISO MD5 checksum verification failed" msgstr "ISO MD5 kontrolsummas verifikācija bija nesekmīga" @@ -195,65 +194,77 @@ msgid "" "downloaded for you." msgstr "Ja neizvēlēsities esošu Dzīvu ISO, tiks lejuplādēts atlasītais izlaidums." -#: ../liveusb/gui.py:601 +#: ../liveusb/gui.py:619 msgid "Installation complete!" msgstr "Instalēšana ir pabeigta!" -#: ../liveusb/gui.py:276 +#: ../liveusb/gui.py:279 #, python-format msgid "Installation complete! (%s)" msgstr "Instalēšana pabeigta! (%s)" -#: ../liveusb/gui.py:602 +#: ../liveusb/gui.py:620 msgid "Installation was completed. Press OK to close this program." msgstr "Instalēšana ir pabeigta. Nospiediet Labi, lai aizvērtu programmu." -#: ../liveusb/creator.py:913 ../liveusb/creator.py:1237 +#: ../liveusb/creator.py:900 ../liveusb/creator.py:1223 msgid "Installing bootloader..." msgstr "Instalē sāknēšanas lādētāju..." -#: ../liveusb/gui.py:281 +#: ../liveusb/gui.py:284 msgid "LiveUSB creation failed!" msgstr "LiveUSB izveide neizdevās!" -#: ../liveusb/creator.py:1332 +#: ../liveusb/creator.py:1318 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Pirms sākat šo programmu, pārliecinieties, ka tiek izvērsta visa tilpdatne jeb zipfails liveusb-creator." -#: ../liveusb/creator.py:1208 +#: ../liveusb/creator.py:1194 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Pārliecinieties, ka USB atslēga ir iesprausta un formatēta kā FAT datņu sistēma" -#: ../liveusb/creator.py:847 +#: ../liveusb/creator.py:830 #, python-format msgid "Mount %s exists after unmounting" msgstr "Pēc nomontēšanas pastāv montējums %s" -#: ../liveusb/gui.py:663 ../liveusb/gui.py:680 +#: ../liveusb/gui.py:681 ../liveusb/gui.py:698 msgid "Next" msgstr "Nākamais" -#: ../liveusb/gui.py:541 +#: ../liveusb/gui.py:562 #, python-format msgid "No free space on device %(device)s" msgstr "Uz ierīces %(device)s nav brīvas vietas" -#: ../liveusb/creator.py:824 +#: ../liveusb/creator.py:797 msgid "No mount points found" msgstr "Montēšanas punkti netika atrasti" -#: ../liveusb/creator.py:422 -msgid "Not enough free space on device." -msgstr "Uz ierīces nav pietiekami daudz brīvas vietas." +#: ../liveusb/creator.py:393 +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "Uz ierīces nav pietiekami daudz brīvas vietas.\n%dMB ISO + %dMB pārklājums > %dMB brīvas vietas" -#: ../liveusb/gui.py:546 +#: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Nodalījums ir FAT16; Pārklājuma izmērs tiek ierobežots līdz 2G" -#: ../liveusb/gui.py:592 +#: ../liveusb/gui.py:539 +msgid "Partition is FAT32; Restricting overlay size to 4G" +msgstr "Nodalījums ir FAT32. Pārklājuma izmērs tiek ierobežots līdz 4G." + +#: ../liveusb/creator.py:226 ../liveusb/creator.py:837 +#, python-format +msgid "Partitioning device %(device)s" +msgstr "Nodalīšanas ierīce %(device)s" + +#: ../liveusb/gui.py:610 msgid "Persistent Storage" msgstr "Pastāvīgā krātuve" @@ -261,53 +272,53 @@ msgstr "Pastāvīgā krātuve" msgid "Persistent Storage (0 MB)" msgstr "Pastāvīga glabātuve (0 MB)" -#: ../liveusb/gui.py:661 ../liveusb/gui.py:678 +#: ../liveusb/gui.py:679 ../liveusb/gui.py:696 msgid "Press 'Next' if you wish to continue." msgstr "Nospiediet 'Nākamais', ja vēlaties turpināt." -#: ../liveusb/gui.py:452 +#: ../liveusb/gui.py:456 msgid "Refreshing releases..." msgstr "Atsvaidzinoši izlaidumi..." -#: ../liveusb/gui.py:457 +#: ../liveusb/gui.py:461 msgid "Releases updated!" msgstr "Laidieni atjaunināti!" -#: ../liveusb/creator.py:936 ../liveusb/creator.py:1255 +#: ../liveusb/creator.py:923 ../liveusb/creator.py:1241 #, python-format msgid "Removing %(file)s" msgstr "Noņem %(file)s" -#: ../liveusb/creator.py:498 +#: ../liveusb/creator.py:469 msgid "Removing existing Live OS" -msgstr "Notiek esošās Live OS noņemšana" +msgstr "Noņem esošo Live OS" -#: ../liveusb/creator.py:1110 +#: ../liveusb/creator.py:1096 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Atiestata %s pamatsāknēšanas ierakstu jeb MBR" -#: ../liveusb/gui.py:743 +#: ../liveusb/gui.py:761 msgid "Select Live ISO" msgstr "Izvēlēties Live ISO" -#: ../liveusb/creator.py:181 +#: ../liveusb/creator.py:182 msgid "Setting up OLPC boot file..." msgstr "Iestata OLPC sāknēšanas datni..." -#: ../liveusb/creator.py:738 +#: ../liveusb/creator.py:711 #, python-format msgid "" "Some partitions of USB device %(device)s are mounted. They will be unmounted" " before starting the installation process." msgstr "Daži USB iekārtas %(device)s nodalījumi ir uzmontēti. Pirms instalēšanas procesa sākšanas tie tiks nomontēti." -#: ../liveusb/creator.py:130 +#: ../liveusb/creator.py:131 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Avota veids neatbalsta ISO kontrolsummas MD5 verifikāciju, šis solis tiek izlaists" -#: ../liveusb/creator.py:1144 +#: ../liveusb/creator.py:1130 msgid "Synchronizing data on disk..." msgstr "Sinhronizē datus uz diska..." @@ -315,19 +326,19 @@ msgstr "Sinhronizē datus uz diska..." msgid "Target Device" msgstr "Mērķierīce" -#: ../liveusb/gui.py:625 +#: ../liveusb/gui.py:643 msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." msgstr "Ierīces pamatsāknēšanas ieraksts jeb MBR ir tukšs. Nospiežot 'Veidot Live USB' atkāroti, atiestatīs ierīces MBR." -#: ../liveusb/gui.py:746 +#: ../liveusb/gui.py:764 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "Atlasīto datni nav iespējams lasīt. Lūdzu sakārtojiet atļaujas vai izvēlieties citu datni. " -#: ../liveusb/creator.py:366 +#: ../liveusb/creator.py:337 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" @@ -365,109 +376,114 @@ msgstr "Norises josla rāda cik tālu aizritējis LiveUSB izveidošanas process" msgid "This is the status console, where all messages get written to." msgstr "Šis ir statusa žurnāls, kurā tiek ierakstīti visi ziņojumi." -#: ../liveusb/creator.py:908 +#: ../liveusb/creator.py:895 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Nespēj mainīt sējuma iezīmi: %(message)s" -#: ../liveusb/creator.py:507 ../liveusb/creator.py:518 +#: ../liveusb/creator.py:478 ../liveusb/creator.py:489 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "Nespēj chmod %(file)s: %(message)s" -#: ../liveusb/creator.py:488 +#: ../liveusb/creator.py:459 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "Nespēj kopēt %(infile)s uz %(outfile)s: %(message)s" -#: ../liveusb/gui.py:414 +#: ../liveusb/gui.py:418 msgid "Unable to find any USB drive" msgstr "Nespēj atrast vismaz vienu USB disku" -#: ../liveusb/creator.py:1198 +#: ../liveusb/creator.py:1184 msgid "Unable to find any removable device" msgstr "Nespēj atrast jebkādu noņemamu ierīci" -#: ../liveusb/creator.py:1038 +#: ../liveusb/creator.py:1024 msgid "Unable to find partition" msgstr "Nespēj atrast nodalījumu" -#: ../liveusb/creator.py:1278 +#: ../liveusb/creator.py:1264 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Nespēj sasniegt Win32_LogicalDisk; win32com vaicājums nesniedza atbildes" -#: ../liveusb/gui.py:653 +#: ../liveusb/gui.py:671 msgid "Unable to mount device" msgstr "Nespēj uzmontēt ierīci" -#: ../liveusb/creator.py:812 +#: ../liveusb/creator.py:785 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Nespēj montēt iekārtu: %(message)s" -#: ../liveusb/creator.py:523 +#: ../liveusb/creator.py:494 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "Nespēj noņemt direktoriju no iepriekšējās LiveOS: %(message)s" -#: ../liveusb/creator.py:511 +#: ../liveusb/creator.py:482 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Nespēj noņemt datni no iepriekšējās LiveOS: %(message)s" -#: ../liveusb/creator.py:1113 +#: ../liveusb/creator.py:1099 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "Nespēj atiestatīt MBR. Iespējams, ka nav instalēta pakotne `syslinux`." -#: ../liveusb/gui.py:752 +#: ../liveusb/gui.py:770 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "Nespēj lietot atlasīto datni. Iespējams, veiktos labāk, ja ISO tiktu pārvietots uz diska sakni (proti, C:\\)" -#: ../liveusb/creator.py:719 +#: ../liveusb/creator.py:692 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Nespēj rakstīt %(device)s, šis solis tiek izlaists." -#: ../liveusb/creator.py:411 +#: ../liveusb/creator.py:382 msgid "Unknown ISO, skipping checksum verification" msgstr "Nezināms ISO, tiek izlaista kontrolsummas verifikācija" -#: ../liveusb/creator.py:808 +#: ../liveusb/creator.py:781 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Nezināms dbus izņēmums cenšoties montēt iekārtu: %(message)s" -#: ../liveusb/creator.py:787 ../liveusb/creator.py:887 +#: ../liveusb/creator.py:760 ../liveusb/creator.py:874 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Nezināma datņu sistēma. Iespējams, ierīci nepieciešams pārformatēt." -#: ../liveusb/gui.py:80 +#: ../liveusb/gui.py:84 #, python-format msgid "Unknown release: %s" msgstr "Nezināms laidiens: %s" -#: ../liveusb/creator.py:835 +#: ../liveusb/creator.py:822 +#, python-format +msgid "Unmounting '%(udi)s' on '%(device)s'" +msgstr "Nomontē '%(udi)s' , kurš atrodas uz '%(device)s'" + +#: ../liveusb/creator.py:818 #, python-format -msgid "Unmounting %(device)s" -msgstr "Nomontē %(device)s" +msgid "Unmounting mounted filesystems on '%(device)s'" +msgstr "Nomontē uz '%(device)s' uzmontētās datņu sistēmas" -#: ../liveusb/creator.py:792 ../liveusb/creator.py:890 +#: ../liveusb/creator.py:765 ../liveusb/creator.py:877 #, python-format msgid "Unsupported filesystem: %s" msgstr "Datņu sistēma, kura netiek atbalstīta: %s" -#: ../liveusb/creator.py:790 +#: ../liveusb/creator.py:763 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "Neatbalstīta datņusistēma: %s\nGadījumā, ja cenšaties jaunināt manuāli instalētu Tails sistēmu (proti, tādu, kuru nav instalējis šis instalētājs), šī izvēles iespēja netiek atbalstīta: Jums vispirms jāinstalē no jauna, piem., izvēloties darbību \"Klonēt & instalēt\"." -#: ../liveusb/creator.py:1211 +#: ../liveusb/creator.py:1197 #, python-format msgid "" "Unsupported filesystem: %s\n" @@ -482,65 +498,65 @@ msgstr "Jaunināt no ISO" msgid "Use existing Live system ISO" msgstr "Lietot esošo Dzīvas sistēmas ISO" -#: ../liveusb/creator.py:132 +#: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" msgstr "Verificē ISO MD5 kontrolsummu" -#: ../liveusb/creator.py:385 +#: ../liveusb/creator.py:356 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "Verificē LiveCD attēla kontrolsummu SHA1..." -#: ../liveusb/creator.py:389 +#: ../liveusb/creator.py:360 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Verificē LiveCD attēla kontrolsummu SHA256..." -#: ../liveusb/creator.py:884 ../liveusb/creator.py:1204 +#: ../liveusb/creator.py:871 ../liveusb/creator.py:1190 msgid "Verifying filesystem..." msgstr "Verificē datņu sistēmu..." -#: ../liveusb/gui.py:659 +#: ../liveusb/gui.py:677 msgid "Warning: All data on the selected drive will be lost." msgstr "Brīdinājums: Visi, uz atlasītā diska esošie dati tiks pazaudēti." -#: ../liveusb/gui.py:676 +#: ../liveusb/gui.py:694 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Brīdinājums: Jauna pastāvīga pārklājuma izveide, dzēsīs esošo." -#: ../liveusb/gui.py:639 +#: ../liveusb/gui.py:657 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." msgstr "Brīdinājums: Ierīces pamatsāknēšanas ieraksts neatbilst sistēmas syslinux MBR. Ja rodas problēmas sāknējot ar šo karti, mēģiniet izpildīt liveusb-creator ar iespēju --reset-mbr ." -#: ../liveusb/gui.py:389 +#: ../liveusb/gui.py:392 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." msgstr "Brīdinājums: Šis rīks jālieto administratora režīmā. Lai to izdarītu, ar labo peles taustiņu noklikšķiniet uz ikonas un atveriet Rekvizītus. Verot cilni Savietojamība, atzīmējiet lodziņu \"Izpildīt programmu administratora režīmā\"." -#: ../liveusb/creator.py:151 +#: ../liveusb/creator.py:152 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "Ieraksts ierīcē tika veikts ar ātrumu %(speed)d MB/sec" -#: ../liveusb/creator.py:636 +#: ../liveusb/creator.py:607 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" msgstr "Tiek lietota veca syslinux-extlinux versija, kura neatbalsta datņu sistēmu ext4 " -#: ../liveusb/gui.py:737 +#: ../liveusb/gui.py:755 msgid "You can try again to resume your download" msgstr "Variet vēlreiz mēģināt atjaunot lejupielādi" -#: ../liveusb/creator.py:91 +#: ../liveusb/creator.py:92 msgid "You must run this application as root" msgstr "Šī lietotne jāizpilda saknes režīmā" -#: ../liveusb/gui.py:673 +#: ../liveusb/gui.py:691 msgid "" "Your device already contains a LiveOS.\n" "If you continue, this will be overwritten."

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Aug '13

02 Aug '13

commit 11badced949ea39aba322435621b1332a207adfc Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 2 14:16:12 2013 +0000 Update translations for liveusb-creator --- lv/lv.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lv/lv.po b/lv/lv.po index a88ccbd..6cf88ce 100644 --- a/lv/lv.po +++ b/lv/lv.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:27+0200\n" -"PO-Revision-Date: 2013-08-02 13:42+0000\n" +"PO-Revision-Date: 2013-08-02 14:10+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" @@ -153,7 +153,7 @@ msgstr "Disks ir cilptestā, tiek izlaista MBR atiestatīšana" #: ../liveusb/creator.py:808 #, python-format msgid "Entering unmount_device for '%(device)s'" -msgstr "" +msgstr "Ievada unmount_device objektam '%(device)s'" #: ../liveusb/creator.py:1182 msgid "Error probing device" @@ -249,7 +249,7 @@ msgstr "Montēšanas punkti netika atrasti" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "" +msgstr "Uz ierīces nav pietiekami daudz brīvas vietas.\n%dMB ISO + %dMB pārklājums > %dMB brīvas vietas" #: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G" @@ -257,12 +257,12 @@ msgstr "Nodalījums ir FAT16; Pārklājuma izmērs tiek ierobežots līdz 2G" #: ../liveusb/gui.py:539 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "" +msgstr "Nodalījums ir FAT32. Pārklājuma izmērs tiek ierobežots līdz 4G." #: ../liveusb/creator.py:226 ../liveusb/creator.py:837 #, python-format msgid "Partitioning device %(device)s" -msgstr "" +msgstr "Nodalīšanas ierīce %(device)s" #: ../liveusb/gui.py:610 msgid "Persistent Storage" @@ -291,7 +291,7 @@ msgstr "Noņem %(file)s" #: ../liveusb/creator.py:469 msgid "Removing existing Live OS" -msgstr "Notiek esošās Live OS noņemšana" +msgstr "Noņem esošo Live OS" #: ../liveusb/creator.py:1096 #, python-format @@ -464,12 +464,12 @@ msgstr "Nezināms laidiens: %s" #: ../liveusb/creator.py:822 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "" +msgstr "Nomontē '%(udi)s' , kurš atrodas uz '%(device)s'" #: ../liveusb/creator.py:818 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "" +msgstr "Nomontē uz '%(device)s' uzmontētās datņu sistēmas" #: ../liveusb/creator.py:765 ../liveusb/creator.py:877 #, python-format

1 0

r26276: {website} update mirrors (website/trunk/include)
by Andrew Lewman 02 Aug '13

02 Aug '13

Author: phobos Date: 2013-08-02 14:16:07 +0000 (Fri, 02 Aug 2013) New Revision: 26276 Modified: website/trunk/include/mirrors-table.wmi Log: update mirrors Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-08-02 14:04:10 UTC (rev 26275) +++ website/trunk/include/mirrors-table.wmi 2013-08-02 14:16:07 UTC (rev 26276) @@ -18,40 +18,6 @@ <tr> - <td>NL</td> - - <td>Amorphis</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>EE</td> <td>CyberSIDE</td> @@ -239,23 +205,6 @@ <tr> - <td>LT</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td></td> @@ -341,6 +290,23 @@ <tr> + <td>AT</td> + + <td>cyberarmy</td> + + <td>Up to date</td> + + <td> - </td> + <td> - </td> + <td><a href="http://tor.cyberarmy.at/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NO</td> <td>MultiNet AS</td> @@ -358,6 +324,23 @@ <tr> + <td>DE</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td> - </td> + <td><a href="http://tor.taskserver.de/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>FR</td> <td></td> @@ -647,49 +630,49 @@ <tr> - <td>SE</td> + <td>DE</td> - <td>homosu</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>NL</td> - <td>[[:bbs:]]</td> + <td>BBLN.nl</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://mirror.bbln.nl/tor/dist/">http</a></td> + <td><a href="http://mirror.bbln.nl/tor/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>NL</td> + <td>INT</td> - <td>BBLN.nl</td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.bbln.nl/tor/dist/">http</a></td> - <td><a href="http://mirror.bbln.nl/tor/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -732,23 +715,74 @@ <tr> - <td>TN</td> + <td>NL</td> + <td>Amorphis</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DK</td> + + <td>Zentrum der Gesundheit</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>LT</td> + <td></td> - <td>DO NOT USE. Out of date.</td> + <td>Up to date</td> <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> - <td><a href="http://torproject.antagonism.org/">http</a></td> <td> - </td> - <td><a href="https://torproject.antagonism.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> + <td>SE</td> + + <td>homosu</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td>hessmo</td> @@ -766,6 +800,23 @@ <tr> + <td>TN</td> + + <td></td> + + <td>DO NOT USE. Out of date.</td> + + <td> - </td> + <td> - </td> + <td><a href="http://torproject.antagonism.org/">http</a></td> + <td> - </td> + <td><a href="https://torproject.antagonism.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>EE</td> <td></td> @@ -902,23 +953,6 @@ <tr> - <td>AT</td> - - <td>cyberarmy</td> - - <td>Unknown</td> - - <td> - </td> - <td> - </td> - <td><a href="http://tor.cyberarmy.at/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td></td> @@ -940,15 +974,15 @@ <td></td> - <td>DO NOT USE. Out of date.</td> + <td>Unknown</td> + <td><a href="ftp://mirrors.go-parts.com/tor/">ftp</a></td> + <td><a href="http://mirrors.go-parts.com/tor/dist/">http</a></td> <td> - </td> - <td><a href="http://mirrors.go-part.com/tor/dist/">http</a></td> <td> - </td> <td> - </td> + <td><a href="rsync://mirrors.go-parts.com/mirrors/tor/">rsync</a></td> <td> - </td> - <td><a href="rsync://mirrors.go-part.com/tor/dist/">rsync</a></td> - <td> - </td> </tr> <tr> @@ -1004,23 +1038,6 @@ <tr> - <td>INT</td> - - <td>CoralCDN</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td></td>

1 0

[tor-browser-bundle/master] Add Micah's key to https-everywhere's keyring.
by mikeperry＠torproject.org 02 Aug '13

02 Aug '13

commit ea00519951bc39c200a695c03fec8313a8d5b025 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Aug 2 15:46:34 2013 +0200 Add Micah's key to https-everywhere's keyring. --- gitian/gpg/https-everywhere.gpg | Bin 5693 -> 61380 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index b0afcf7..565f376 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ

1 0

r26275: {website} update go-part to the plural. (website/trunk)
by Andrew Lewman 02 Aug '13

02 Aug '13

Author: phobos Date: 2013-08-02 14:04:10 +0000 (Fri, 02 Aug 2013) New Revision: 26275 Modified: website/trunk/update-mirrors.pl Log: update go-part to the plural. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2013-08-02 14:00:55 UTC (rev 26274) +++ website/trunk/update-mirrors.pl 2013-08-02 14:04:10 UTC (rev 26275) @@ -1050,10 +1050,10 @@ httpWebsiteMirror => "", httpsWebsiteMirror => "", rsyncWebsiteMirror => "", - ftpWebsiteMirror => "", - httpDistMirror => "http://mirrors.go-part.com/tor/dist/", + ftpWebsiteMirror => "ftp://mirrors.go-parts.com/tor/", + httpDistMirror => "http://mirrors.go-parts.com/tor/dist/", httpsDistMirror => "", - rsyncDistMirror => "rsync://mirrors.go-part.com/tor/dist/", + rsyncDistMirror => "rsync://mirrors.go-parts.com/mirrors/tor/", hiddenServiceMirror => "", }, mirror089 => {

1 0

r26274: {website} add a new mirror (website/trunk)
by Andrew Lewman 02 Aug '13

02 Aug '13

Author: phobos Date: 2013-08-02 14:00:55 +0000 (Fri, 02 Aug 2013) New Revision: 26274 Modified: website/trunk/update-mirrors.pl Log: add a new mirror Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2013-08-02 02:48:38 UTC (rev 26273) +++ website/trunk/update-mirrors.pl 2013-08-02 14:00:55 UTC (rev 26274) @@ -1199,6 +1199,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "" + }, + mirror097 => { + adminContact => "marz.michael at gmail.com", + orgName => "", + isoCC => "DE", + subRegion => "", + region => "", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.taskserver.de/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "" } );

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Aug '13

02 Aug '13

commit 99bcee07fe49cf4d83f624b80ac1f7b6d86269dd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 2 13:46:15 2013 +0000 Update translations for liveusb-creator --- lv/lv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lv/lv.po b/lv/lv.po index b618a9c..a88ccbd 100644 --- a/lv/lv.po +++ b/lv/lv.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:27+0200\n" -"PO-Revision-Date: 2013-08-02 09:27+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-08-02 13:42+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -126,7 +126,7 @@ msgstr "Rada %sMB lielu pastāvīgo pārklājumu" #: ../liveusb/gui.py:556 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." -msgstr "" +msgstr "Ierīce vēl nav uzmontēta, tāpēc nav iespējams noteikt brīvas vietas daudzumu." #: ../liveusb/dialog.py:157 #, python-format

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 02 Aug '13

02 Aug '13

commit e374f227deb3618367d043ece867150f9b4f31b7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 2 13:46:04 2013 +0000 Update translations for whisperback --- fa/fa.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/fa.po b/fa/fa.po index 8b3b504..8d54d66 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-08-02 13:12+0000\n" +"PO-Revision-Date: 2013-08-02 13:20+0000\n" "Last-Translator: backtrack <razavi.moh(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2013