- tor-commits - lists.torproject.org

[tor/master] Make the pt/transports test not crash.
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit b1bd30c24c4d9ee1a760c0fb28e18bc597bb0df5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 25 16:54:06 2011 -0500 Make the pt/transports test not crash. --- src/or/transports.c | 4 +--- src/test/test_pt.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 5e96b39..10155c4 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -699,9 +699,7 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) err: mp->conf_state = PT_PROTO_BROKEN; log_warn(LD_CONFIG, "Managed proxy at '%s' failed the configuration protocol" - " and will be destroyed.", mp->argv[0]); - - return; + " and will be destroyed.", mp->argv ? mp->argv[0] : ""); } /** Parses an ENV-ERROR line and warns the user accordingly. */ diff --git a/src/test/test_pt.c b/src/test/test_pt.c index f97b21f..45f4411 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -91,7 +91,7 @@ test_pt_protocol(void) { char line[200]; - managed_proxy_t *mp = tor_malloc(sizeof(managed_proxy_t)); + managed_proxy_t *mp = tor_malloc_zero(sizeof(managed_proxy_t)); mp->conf_state = PT_PROTO_LAUNCHED; mp->transports = smartlist_create();

1 0

[tor/master] Rename tor_process_destroy() to tor_process_handle_destroy().
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit 6b3c3b968f9607e45fa18f91cedfc8fce8d0d8cc Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Oct 24 16:04:31 2011 +0200 Rename tor_process_destroy() to tor_process_handle_destroy(). --- src/common/util.c | 4 ++-- src/common/util.h | 4 ++-- src/or/transports.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 9df88eb..198a88b 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3520,8 +3520,8 @@ tor_spawn_background(const char *const filename, const char **argv, * If also_terminate_process is true, also terminate the * process of the process handle. */ void -tor_process_destroy(process_handle_t *process_handle, - int also_terminate_process) +tor_process_handle_destroy(process_handle_t *process_handle, + int also_terminate_process) { if (also_terminate_process) { if (tor_terminate_process(process_handle) < 0) { diff --git a/src/common/util.h b/src/common/util.h index 9d3472a..0ff328f 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -420,8 +420,8 @@ char *tor_join_win_cmdline(const char *argv[]); int tor_process_get_pid(process_handle_t *process_handle); int tor_terminate_process(process_handle_t *process_handle); -void tor_process_destroy(process_handle_t *process_handle, - int also_terminate_process); +void tor_process_handle_destroy(process_handle_t *process_handle, + int also_terminate_process); #ifdef UTIL_PRIVATE /* Prototypes for private functions only used by util.c (and unit tests) */ diff --git a/src/or/transports.c b/src/or/transports.c index fc95a73..e60e98f 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -238,7 +238,7 @@ proxy_prepare_for_restart(managed_proxy_t *mp) tor_assert(mp->conf_state == PT_PROTO_COMPLETED); /* destroy the process handle and terminate the process. */ - tor_process_destroy(mp->process_handle, 1); + tor_process_handle_destroy(mp->process_handle, 1); /* create process handle for the upcoming new process. */ mp->process_handle = tor_malloc_zero(sizeof(process_handle_t)); @@ -545,7 +545,7 @@ managed_proxy_destroy(managed_proxy_t *mp, /* free the argv */ free_execve_args(mp->argv); - tor_process_destroy(mp->process_handle, also_terminate_process); + tor_process_handle_destroy(mp->process_handle, also_terminate_process); tor_free(mp); }

1 0

[tor-cloud/master] Change example IP to a valid one
by runa＠torproject.org 25 Nov '11

25 Nov '11

commit c4e11c67f265b5f28e68159804ccbb735fc559df Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Fri Nov 25 21:47:26 2011 +0000 Change example IP to a valid one --- html/index.html | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/html/index.html b/html/index.html index 6327488..5d7e2cb 100644 --- a/html/index.html +++ b/html/index.html @@ -282,9 +282,9 @@ page will show some details about the instance you have selected, including Public DNS. If the AWS Management Console says that the Public DNS for your instance is - ec2-012-34-56-789.compute-1.amazonaws.com, then you know that the IP - address is 012.34.56.789. All of the bridges run on port 443, so the - address of your bridge is 012.34.56.789:443. + ec2-192-0-2-27.compute-1.amazonaws.com, then you know that the IP + address is 192.0.2.27. All of the bridges run on port 443, so the + address of your bridge is 192.0.2.27:443. 4. How can I check if my bridge is running? There are two ways you can check to see if your bridge is running;

1 0

[tor/master] Merge remote-tracking branch 'sebastian/pure_removal'
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit cb8059b42dddf25cdfc516a0e7fa869f2b727aee Merge: 25c9e3a 75d8ad7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 25 14:54:04 2011 -0500 Merge remote-tracking branch 'sebastian/pure_removal' changes/pure_removal | 7 +++++++ src/common/address.h | 4 ++-- src/common/compat.h | 12 +++++------- src/common/container.h | 28 +++++++++++----------------- src/common/util.h | 46 +++++++++++++++++++++------------------------- src/or/config.h | 2 +- 6 files changed, 47 insertions(+), 52 deletions(-)

1 0

[tor/master] Purge ATTR_PURE from the code
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit 75d8ad7320477593655f1ecd0842ed0ef52ed51c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 25 17:56:00 2011 +0100 Purge ATTR_PURE from the code We're using it incorrectly in many cases, and it doesn't help as far as we know. --- changes/pure_removal | 7 +++++++ src/common/address.h | 4 ++-- src/common/compat.h | 12 +++++------- src/common/container.h | 28 +++++++++++----------------- src/common/util.h | 46 +++++++++++++++++++++------------------------- src/or/config.h | 2 +- 6 files changed, 47 insertions(+), 52 deletions(-) diff --git a/changes/pure_removal b/changes/pure_removal new file mode 100644 index 0000000..4a3343c --- /dev/null +++ b/changes/pure_removal @@ -0,0 +1,7 @@ + o Code simplifications and refactorings: + - Remove the pure attribute from all functions that used it previously. + In many cases this we assigned it incorrectly, because the functions + might assert or call impure functions, and we don't have evidence + that keeping the pure attribute is worthwhile. Implements changes + suggested in ticket 4421. + diff --git a/src/common/address.h b/src/common/address.h index 359b026..bc225a6 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -149,7 +149,7 @@ int tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, unsigned int tor_addr_hash(const tor_addr_t *addr); int tor_addr_is_v4(const tor_addr_t *addr); -int tor_addr_is_internal(const tor_addr_t *ip, int for_listening) ATTR_PURE; +int tor_addr_is_internal(const tor_addr_t *ip, int for_listening); /** Longest length that can be required for a reverse lookup name. */ /* 32 nybbles, 32 dots, 8 characters of "ip6.arpa", 1 NUL: 73 characters. */ @@ -185,7 +185,7 @@ int tor_addr_port_split(int severity, const char *addrport, char **address_out, uint16_t *port_out); /* IPv4 helpers */ -int is_internal_IP(uint32_t ip, int for_listening) ATTR_PURE; +int is_internal_IP(uint32_t ip, int for_listening); int addr_port_lookup(int severity, const char *addrport, char **address, uint32_t *addr, uint16_t *port_out); int parse_port_range(const char *port, uint16_t *port_min_out, diff --git a/src/common/compat.h b/src/common/compat.h index b005dd2..e08b0d7 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -135,7 +135,6 @@ extern INLINE double U64_TO_DBL(uint64_t x) { /* GCC has several useful attributes. */ #if defined(__GNUC__) && __GNUC__ >= 3 #define ATTR_NORETURN __attribute__((noreturn)) -#define ATTR_PURE __attribute__((pure)) #define ATTR_CONST __attribute__((const)) #define ATTR_MALLOC __attribute__((malloc)) #define ATTR_NORETURN __attribute__((noreturn)) @@ -168,7 +167,6 @@ extern INLINE double U64_TO_DBL(uint64_t x) { #define PREDICT_UNLIKELY(exp) __builtin_expect(!!(exp), 0) #else #define ATTR_NORETURN -#define ATTR_PURE #define ATTR_CONST #define ATTR_MALLOC #define ATTR_NORETURN @@ -271,9 +269,9 @@ int tor_asprintf(char **strp, const char *fmt, ...) int tor_vasprintf(char **strp, const char *fmt, va_list args); const void *tor_memmem(const void *haystack, size_t hlen, const void *needle, - size_t nlen) ATTR_PURE ATTR_NONNULL((1,3)); + size_t nlen) ATTR_NONNULL((1,3)); static const void *tor_memstr(const void *haystack, size_t hlen, - const char *needle) ATTR_PURE ATTR_NONNULL((1,3)); + const char *needle) ATTR_NONNULL((1,3)); static INLINE const void * tor_memstr(const void *haystack, size_t hlen, const char *needle) { @@ -546,9 +544,9 @@ long tor_weak_random(void); /* ===== OS compatibility */ const char *get_uname(void); -uint16_t get_uint16(const void *cp) ATTR_PURE ATTR_NONNULL((1)); -uint32_t get_uint32(const void *cp) ATTR_PURE ATTR_NONNULL((1)); -uint64_t get_uint64(const void *cp) ATTR_PURE ATTR_NONNULL((1)); +uint16_t get_uint16(const void *cp) ATTR_NONNULL((1)); +uint32_t get_uint32(const void *cp) ATTR_NONNULL((1)); +uint64_t get_uint64(const void *cp) ATTR_NONNULL((1)); void set_uint16(void *cp, uint16_t v) ATTR_NONNULL((1)); void set_uint32(void *cp, uint32_t v) ATTR_NONNULL((1)); void set_uint64(void *cp, uint64_t v) ATTR_NONNULL((1)); diff --git a/src/common/container.h b/src/common/container.h index 4a6eba7..fe071cc 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -35,19 +35,14 @@ void smartlist_remove(smartlist_t *sl, const void *element); void *smartlist_pop_last(smartlist_t *sl); void smartlist_reverse(smartlist_t *sl); void smartlist_string_remove(smartlist_t *sl, const char *element); -int smartlist_isin(const smartlist_t *sl, const void *element) ATTR_PURE; -int smartlist_string_isin(const smartlist_t *sl, const char *element) - ATTR_PURE; -int smartlist_string_pos(const smartlist_t *, const char *elt) ATTR_PURE; -int smartlist_string_isin_case(const smartlist_t *sl, const char *element) - ATTR_PURE; -int smartlist_string_num_isin(const smartlist_t *sl, int num) ATTR_PURE; -int smartlist_strings_eq(const smartlist_t *sl1, const smartlist_t *sl2) - ATTR_PURE; -int smartlist_digest_isin(const smartlist_t *sl, const char *element) - ATTR_PURE; -int smartlist_overlap(const smartlist_t *sl1, const smartlist_t *sl2) - ATTR_PURE; +int smartlist_isin(const smartlist_t *sl, const void *element); +int smartlist_string_isin(const smartlist_t *sl, const char *element); +int smartlist_string_pos(const smartlist_t *, const char *elt); +int smartlist_string_isin_case(const smartlist_t *sl, const char *element); +int smartlist_string_num_isin(const smartlist_t *sl, int num); +int smartlist_strings_eq(const smartlist_t *sl1, const smartlist_t *sl2); +int smartlist_digest_isin(const smartlist_t *sl, const char *element); +int smartlist_overlap(const smartlist_t *sl1, const smartlist_t *sl2); void smartlist_intersect(smartlist_t *sl1, const smartlist_t *sl2); void smartlist_subtract(smartlist_t *sl1, const smartlist_t *sl2); @@ -55,14 +50,14 @@ void smartlist_subtract(smartlist_t *sl1, const smartlist_t *sl2); #ifdef DEBUG_SMARTLIST /** Return the number of items in sl. */ -static INLINE int smartlist_len(const smartlist_t *sl) ATTR_PURE; +static INLINE int smartlist_len(const smartlist_t *sl); static INLINE int smartlist_len(const smartlist_t *sl) { tor_assert(sl); return (sl)->num_used; } /** Return the idxth element of sl. */ -static INLINE void *smartlist_get(const smartlist_t *sl, int idx) ATTR_PURE; +static INLINE void *smartlist_get(const smartlist_t *sl, int idx); static INLINE void *smartlist_get(const smartlist_t *sl, int idx) { tor_assert(sl); tor_assert(idx>=0); @@ -114,8 +109,7 @@ void smartlist_uniq_strings(smartlist_t *sl); void smartlist_uniq_digests(smartlist_t *sl); void smartlist_uniq_digests256(smartlist_t *sl); void *smartlist_bsearch(smartlist_t *sl, const void *key, - int (*compare)(const void *key, const void **member)) - ATTR_PURE; + int (*compare)(const void *key, const void **member)); int smartlist_bsearch_idx(const smartlist_t *sl, const void *key, int (*compare)(const void *key, const void **member), int *found_out); diff --git a/src/common/util.h b/src/common/util.h index 77ed1ca..b872574 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -173,19 +173,15 @@ int n_bits_set_u8(uint8_t v); #define HEX_CHARACTERS "0123456789ABCDEFabcdef" void tor_strlower(char *s) ATTR_NONNULL((1)); void tor_strupper(char *s) ATTR_NONNULL((1)); -int tor_strisprint(const char *s) ATTR_PURE ATTR_NONNULL((1)); -int tor_strisnonupper(const char *s) ATTR_PURE ATTR_NONNULL((1)); -int strcmp_opt(const char *s1, const char *s2) ATTR_PURE; -int strcmpstart(const char *s1, const char *s2) ATTR_PURE ATTR_NONNULL((1,2)); -int strcmp_len(const char *s1, const char *s2, size_t len) - ATTR_PURE ATTR_NONNULL((1,2)); -int strcasecmpstart(const char *s1, const char *s2) - ATTR_PURE ATTR_NONNULL((1,2)); -int strcmpend(const char *s1, const char *s2) ATTR_PURE ATTR_NONNULL((1,2)); -int strcasecmpend(const char *s1, const char *s2) - ATTR_PURE ATTR_NONNULL((1,2)); -int fast_memcmpstart(const void *mem, size_t memlen, - const char *prefix) ATTR_PURE; +int tor_strisprint(const char *s) ATTR_NONNULL((1)); +int tor_strisnonupper(const char *s) ATTR_NONNULL((1)); +int strcmp_opt(const char *s1, const char *s2); +int strcmpstart(const char *s1, const char *s2) ATTR_NONNULL((1,2)); +int strcmp_len(const char *s1, const char *s2, size_t len) ATTR_NONNULL((1,2)); +int strcasecmpstart(const char *s1, const char *s2) ATTR_NONNULL((1,2)); +int strcmpend(const char *s1, const char *s2) ATTR_NONNULL((1,2)); +int strcasecmpend(const char *s1, const char *s2) ATTR_NONNULL((1,2)); +int fast_memcmpstart(const void *mem, size_t memlen, const char *prefix); void tor_strstrip(char *s, const char *strip) ATTR_NONNULL((1,2)); long tor_parse_long(const char *s, int base, long min, @@ -197,19 +193,19 @@ double tor_parse_double(const char *s, double min, double max, int *ok, uint64_t tor_parse_uint64(const char *s, int base, uint64_t min, uint64_t max, int *ok, char **next); const char *hex_str(const char *from, size_t fromlen) ATTR_NONNULL((1)); -const char *eat_whitespace(const char *s) ATTR_PURE; -const char *eat_whitespace_eos(const char *s, const char *eos) ATTR_PURE; -const char *eat_whitespace_no_nl(const char *s) ATTR_PURE; -const char *eat_whitespace_eos_no_nl(const char *s, const char *eos) ATTR_PURE; -const char *find_whitespace(const char *s) ATTR_PURE; -const char *find_whitespace_eos(const char *s, const char *eos) ATTR_PURE; -const char *find_str_at_start_of_line(const char *haystack, const char *needle) - ATTR_PURE; +const char *eat_whitespace(const char *s); +const char *eat_whitespace_eos(const char *s, const char *eos); +const char *eat_whitespace_no_nl(const char *s); +const char *eat_whitespace_eos_no_nl(const char *s, const char *eos); +const char *find_whitespace(const char *s); +const char *find_whitespace_eos(const char *s, const char *eos); +const char *find_str_at_start_of_line(const char *haystack, + const char *needle); int string_is_C_identifier(const char *string); -int tor_mem_is_zero(const char *mem, size_t len) ATTR_PURE; -int tor_digest_is_zero(const char *digest) ATTR_PURE; -int tor_digest256_is_zero(const char *digest) ATTR_PURE; +int tor_mem_is_zero(const char *mem, size_t len); +int tor_digest_is_zero(const char *digest); +int tor_digest256_is_zero(const char *digest); char *esc_for_log(const char *string) ATTR_MALLOC; const char *escaped(const char *string); struct smartlist_t; @@ -349,7 +345,7 @@ const char *parse_config_line_from_str(const char *line, char **key_out, char **value_out); char *expand_filename(const char *filename); struct smartlist_t *tor_listdir(const char *dirname); -int path_is_relative(const char *filename) ATTR_PURE; +int path_is_relative(const char *filename); /* Process helpers */ void start_daemon(void); diff --git a/src/or/config.h b/src/or/config.h index 76f6841..1e4d567 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -29,7 +29,7 @@ setopt_err_t options_trial_assign(config_line_t *list, int use_defaults, int clear_first, char **msg); int resolve_my_address(int warn_severity, const or_options_t *options, uint32_t *addr, char **hostname_out); -int is_local_addr(const tor_addr_t *addr) ATTR_PURE; +int is_local_addr(const tor_addr_t *addr); void options_init(or_options_t *options); char *options_dump(const or_options_t *options, int minimal); int options_init_from_torrc(int argc, char **argv);

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 25 Nov '11

25 Nov '11

commit 84044d619d9192f94244fa4276edcbfb8d59e8ac Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 25 19:45:22 2011 +0000 Update translations for vidalia_help --- eu/index.po | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/eu/index.po b/eu/index.po index f51a7ce..19f64aa 100644 --- a/eu/index.po +++ b/eu/index.po @@ -1,12 +1,13 @@ # # Translators: +# <baldarra(a)euskalerria.org>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:59+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-25 19:42+0000\n" +"Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/index.html:16 msgid "Vidalia Help" -msgstr "" +msgstr "Laguntza" #. type: Content of: <html><body> #: en/index.html:20 @@ -25,6 +26,9 @@ msgid "" "Select a help topic from the tree on the left or click on the Search button " "above the list of topics to search through all available help topics." msgstr "" +"Aukeratu laguntza gai bat ezkerreko zuhaitzetik edo sakatu Bilatu gai " +"zerrendaren gaineko botoian eskuragarri dauden laguntza gai guztien artean " +"bilatzeko." #. type: Content of: <html><body> #: en/index.html:25 @@ -32,11 +36,13 @@ msgid "" "You can use the Find button on the toolbar above to search within a " "particular help topic." msgstr "" +"Aurkitu botoia erabili dezakezu gaineko tresna barran laguntza gai " +"zehatz bat bilatzeko." #. type: Content of: <html><body> #: en/index.html:30 msgid "The Home button above will bring you back to this home page." -msgstr "" +msgstr "Goiko Etxea botoia orri honetara ekarriko zaitu." #. type: Content of: <html><body> #: en/index.html:34 @@ -44,5 +50,7 @@ msgid "" "See the <a href=\"links.html\">Helpful Links</a> topic for some places you " "can visit to find additional help and information about Vidalia and Tor." msgstr "" +" Ikusi <a href=\"links.html\">Lotura Lagungarriak</a> gaia laguntza gehiago " +"edo Vidalia eta Tor-ri buruzko informazio gahiago aurkitzeko. "

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 25 Nov '11

25 Nov '11

commit 3196e53dedf9be48b7de356e88a510c899df45f3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 25 19:45:01 2011 +0000 Update translations for bridgedb --- eu/bridgedb.po | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/eu/bridgedb.po b/eu/bridgedb.po index 4ce8446..fc6d736 100644 --- a/eu/bridgedb.po +++ b/eu/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2011-11-14 14:42+0000\n" +"PO-Revision-Date: 2011-11-25 19:33+0000\n" "Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -29,6 +29,11 @@ msgid "" "even if your ISP is filtering connections to all the known Tor relays,\n" "they probably won't be able to block all the bridges." msgstr "" +"Zubi erreleak (edo \"zubiak\" laburrago) direktorio nagusian\n" +"zerrendatuta ez dauden Tor erreleak dira. Zerrenda publiko oso\n" +"bat ez dagoenez, naiz eta zure Internet Zerbitzu Hornitzaileak\n" +"konexioak Tor errele ezagun guztietara filtratzen egon,\n" +"zihurrenik ez dira zubi guztiak blokeatzeko gai izango." #: lib/bridgedb/I18n.py:28 msgid "" @@ -56,6 +61,11 @@ msgid "" "lots of bridge addresses, you must send this request from an email address at\n" "one of the following domains:" msgstr "" +"Zubi publikoen helbideak aurkitzeko beste modu bat\n" +"bridges(a)torproject.org-era mezu bat bidaltzea da, mezuaren\n" +"gorputzean \"get bridges\" esaldiarekin. Hala ere, erasotzaileei\n" +"gauzak zail diezaiegun, hurrengo domeinuetako email\n" +"helbideetatik bidali behar dituzu mezuak:" #: lib/bridgedb/I18n.py:41 msgid "[This is an automated message; please do not reply.]" @@ -68,6 +78,10 @@ msgid "" "will change every few days, so check back periodically if you need more\n" "bridge addresses." msgstr "" +"Zubi publikoen helbideak aurkitzeko beste modu bat\n" +"https://bridges.torproject.org/ bisitatzea da. Orrialde horretatik \n" +"jasoko dituzun erantzunak egun gutxiro aldatuko dira, beraz\n" +"itzuli nohizean behin zubi helbide gehiago behar badituzu." #: lib/bridgedb/I18n.py:48 msgid "(no bridges currently available)"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 25 Nov '11

25 Nov '11

commit 7975118b09fb00b4cc00cd36823ba09478319f68 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 25 17:45:24 2011 +0000 Update translations for vidalia --- ar/vidalia_ar.po | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ar/vidalia_ar.po b/ar/vidalia_ar.po index 71d51fb..9a07a44 100644 --- a/ar/vidalia_ar.po +++ b/ar/vidalia_ar.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: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-11-25 16:35+0000\n" +"PO-Revision-Date: 2011-11-25 17:38+0000\n" "Last-Translator: Moazo <moazbaghdadi(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -191,7 +191,7 @@ msgstr "غيرت مسار torrc، أتريد إعادة تشغيل تور؟" msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "" +msgstr "ملف إعدادات Tor (torrc) ;; كل الملفات (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" @@ -2085,6 +2085,8 @@ msgid "" "application's configuration and use only encrypted protocols, such as SSL, " "if possible." msgstr "" +"كل شيء يتم إرساله عن طريق هذا الاتصال تمكن مراقبته، الرجاء التحقق من إعدادات" +" التطبيق واستخدام بروتوكولات مشفرة فقط، مثل SSL، إن كان هذا ممكناً" msgctxt "MainWindow" msgid "failed (%1)" @@ -3146,7 +3148,7 @@ msgstr "<a href=\"#bridgeUsage\">من استخدم جسري؟</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">ما هذا؟</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" @@ -3270,6 +3272,9 @@ msgid "" "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." msgstr "" +"اضغط زر \"ابدأ Tor\" في لوحة تحكم Vialia لإعادة تشغيل برنامج Tor. إن تم " +"إغلاق Tor بشكل غير متوقع، انتقل إلى تبويب \"الخيارات المتقدمة\" في الأعلى " +"لمعرفة تفاصيل عن الخطأ الحاصل." msgctxt "StatusEventWidget" msgid "" @@ -3278,6 +3283,9 @@ msgid "" "software, which may contain important security, reliability and performance " "fixes." msgstr "" +"أنت الآن تستخدم النسخة \"%1\" من برنامج Tor وهي نسخة لم يعد استخدامها " +"مستحسناً. الرجاء التحديث لآخر نسخة من البرنامج فقد توجد فيها إصلاحات أمنية " +"هامة وإصلاحات لضمان الوثوقية وإصلاحات في الإداء." msgctxt "StatusEventWidget" msgid ""

1 0

(no subject)
by FLAVIO 25 Nov '11

25 Nov '11

aceito a subscrição

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 25 Nov '11

25 Nov '11

commit 63bc1da9048cb20bec5726593ed4c057c634a29b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 25 16:45:23 2011 +0000 Update translations for vidalia --- ar/vidalia_ar.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ar/vidalia_ar.po b/ar/vidalia_ar.po index acf4da0..71d51fb 100644 --- a/ar/vidalia_ar.po +++ b/ar/vidalia_ar.po @@ -1,6 +1,7 @@ # # Translators: # IBRAHIM <mradonadiego(a)hotmail.fr>, 2011. +# <moazbaghdadi(a)gmail.com>, 2011. # mohammad Alhargan <malham1(a)gmail.com>, 2011. # OsamaK <osamak(a)gnu.org>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. @@ -9,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: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-10-01 10:56+0000\n" -"Last-Translator: diegol <mradonadiego(a)hotmail.fr>\n" +"PO-Revision-Date: 2011-11-25 16:35+0000\n" +"Last-Translator: Moazo <moazbaghdadi(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -146,7 +147,7 @@ msgstr "التحكم بتور" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "" +msgstr "استخدام اتصال TCP (ControlPort)" msgctxt "AdvancedPage" msgid "Path:" @@ -154,7 +155,7 @@ msgstr "المسار:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" -msgstr "" +msgstr "استعمل مقبس نطاق يونِكس (ControlSocket)" msgctxt "AdvancedPage" msgid "Edit current torrc"

1 0