December 2011 - tor-commits - lists.torproject.org

[obfsproxy/master] Improve usage() instructions of obfsproxy.
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit 710d2c7b7ea3adee74e315fc0bfcf7bb1dacf210 Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Dec 19 13:52:46 2011 +0100 Improve usage() instructions of obfsproxy. --- src/main.c | 6 +++--- src/protocols/obfs2.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main.c b/src/main.c index c7515a2..c32d890 100644 --- a/src/main.c +++ b/src/main.c @@ -33,13 +33,13 @@ void ATTR_NORETURN usage(void) { int i; - fputs("Usage: obfsproxy protocol_name [protocol_args] protocol_options " - "protocol_name ...\n" + fputs("Usage: obfsproxy [obfsproxy_args] protocol_name [protocol_args] " + "protocol_options protocol_name ...\n" "* Available protocols:\n", stderr); /* this is awful. */ for (i=0;i<n_supported_protocols;i++) fprintf(stderr,"[%s] ", supported_protocols[i]->name); - fprintf(stderr, "\n* Available arguments:\n" + fprintf(stderr, "\n* obfsproxy_args:\n" "--log-file=<file> ~ set logfile\n" "--log-min-severity=warn|info|debug ~ set minimum logging severity\n" "--no-log ~ disable logging\n"); diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 6e241c3..9d65067 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -85,17 +85,17 @@ obfs2_config_create(int n_options, const char *const *options) obfs2_config_free(&cfg->super); log_warn("You failed at creating a correct obfs2 line.\n" - "obfs2 syntax:\n" - "\tobfs2 [obfs2_args] obfs2_opts\n" - "\t'obfs2_opts':\n" - "\t\tmode ~ server|client|socks\n" - "\t\tlisten address ~ host:port\n" - "\t'obfs2_args':\n" - "\t\tDestination Address ~ --dest=host:port\n" - "\t\tShared Secret ~ --shared-secret=<secret>\n" - "\tExample:\n" - "\tobfsproxy --dest=127.0.0.1:666 --shared-secret=himitsu " - "\tobfs2 server 127.0.0.1:1026"); + "obfs2 syntax:\n" + "\tobfs2 [obfs2_args] obfs2_opts\n" + "\t'obfs2_opts':\n" + "\t\tmode ~ server|client|socks\n" + "\t\tlisten address ~ host:port\n" + "\t'obfs2_args':\n" + "\t\tDestination Address ~ --dest=host:port\n" + "\t\tShared Secret ~ --shared-secret=<secret>\n" + "\tExample:\n" + "\tobfsproxy obfs2 --dest=127.0.0.1:666 --shared-secret=himitsu " + "server 127.0.0.1:1026"); return NULL; } @@ -174,7 +174,7 @@ parse_and_set_options(int n_options, const char *const *options, got_ss=1; } else { - log_warn("obfs2: Unknown argument."); + log_warn("obfs2: Unknown argument '%s'.", *options); return -1; } options++;

1 0

[tor/master] -lm should not be hardcoded.
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit f783a326b82518bf75b1d3952332b05aac7ffd9b Author: Martin Hebnes Pedersen <martin.h.pedersen(a)gmail.com> Date: Sat Dec 17 14:30:41 2011 +0100 -lm should not be hardcoded. On some platforms (Haiku/BeOS) libm lives in libcore. Also added 'network' to the list of libraries to search for connect(). --- configure.in | 16 +++++++++++++++- src/or/Makefile.am | 2 +- src/test/Makefile.am | 8 ++++---- src/tools/Makefile.am | 8 +++++--- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/configure.in b/configure.in index b05e935..d1b7c44 100644 --- a/configure.in +++ b/configure.in @@ -279,7 +279,7 @@ fi AC_C_BIGENDIAN -AC_SEARCH_LIBS(socket, [socket]) +AC_SEARCH_LIBS(socket, [socket network]) AC_SEARCH_LIBS(gethostbyname, [nsl]) AC_SEARCH_LIBS(dlopen, [dl]) AC_SEARCH_LIBS(inet_aton, [resolv]) @@ -483,6 +483,20 @@ fi AC_SUBST(TOR_LIBEVENT_LIBS) dnl ------------------------------------------------------ +dnl Where do you live, libm? + +dnl On some platforms (Haiku/BeOS) the math library is +dnl part of libroot. In which case don't link against lm +TOR_LIB_MATH="" +save_LIBS="$LIBS" +AC_SEARCH_LIBS(cos, [m], , AC_MSG_ERROR([Could not find libm and libcore does not provide the functions.])) +if test "$ac_cv_search_cos" != "none required"; then + TOR_LIB_MATH="$ac_cv_search_cos" +fi +LIBS="$save_LIBS" +AC_SUBST(TOR_LIB_MATH) + +dnl ------------------------------------------------------ dnl Where do you live, openssl? And how do we call you? tor_openssl_pkg_redhat="openssl" diff --git a/src/or/Makefile.am b/src/or/Makefile.am index a568208..57f5dd6 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -74,7 +74,7 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ tor_LDADD = ./libtor.a ../common/libor.a ../common/libor-crypto.a \ ../common/libor-event.a \ - @TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ noinst_HEADERS = \ diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 73de300..e766446 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -31,15 +31,15 @@ test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \ ../common/libor-event.a \ - @TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ bench_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \ ../common/libor-event.a \ - @TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ noinst_HEADERS = \ tinytest.h \ diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index a9a6197..35b0a41 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -3,17 +3,19 @@ noinst_PROGRAMS = tor-checkkey tor_resolve_SOURCES = tor-resolve.c tor_resolve_LDFLAGS = -tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIB_WS32@ +tor_resolve_LDADD = ../common/libor.a @TOR_LIB_MATH@ @TOR_LIB_WS32@ tor_gencert_SOURCES = tor-gencert.c tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a \ - -lm @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ tor_checkkey_SOURCES = tor-checkkey.c tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ tor_checkkey_LDADD = ../common/libor.a ../common/libor-crypto.a \ - -lm @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ SUBDIRS = tor-fw-helper DIST_SUBDIRS = tor-fw-helper

1 0

[tor/master] Explain why we are making gcc 3.3 work
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit 9cabedd3eb68313d0d6b079b489439bad7d26244 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 11:29:03 2011 -0500 Explain why we are making gcc 3.3 work --- changes/portability_01_haiku | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/portability_01_haiku b/changes/portability_01_haiku index ab58381..74887fe 100644 --- a/changes/portability_01_haiku +++ b/changes/portability_01_haiku @@ -6,6 +6,9 @@ analysis by Martin Hebnes Pedersen. - Preprocessor directives should not be put inside the arguments of a macro. This would break compilation with GCC releases prior - to version 3.3. Bugfix on 0.2.3.3-alpha, fixes the other part of - bug 4727. Patch and analysis by Martin Hebnes Pedersen. + to version 3.3. We would never recommend such an old GCC + version, but it is apparently required for binary compatibility + on some platforms (namely, certain builds of Haiku). Bugfix on + 0.2.3.3-alpha, fixes the other part of bug 4727. Patch and + analysis by Martin Hebnes Pedersen.

1 0

[tor/master] Tweak the haiku-support patches
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit e535c8a460fb3c1973ec46fe0910bbd21148b475 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 11:26:50 2011 -0500 Tweak the haiku-support patches --- configure.in | 6 +++--- src/test/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index d1b7c44..1f045f1 100644 --- a/configure.in +++ b/configure.in @@ -489,9 +489,9 @@ dnl On some platforms (Haiku/BeOS) the math library is dnl part of libroot. In which case don't link against lm TOR_LIB_MATH="" save_LIBS="$LIBS" -AC_SEARCH_LIBS(cos, [m], , AC_MSG_ERROR([Could not find libm and libcore does not provide the functions.])) -if test "$ac_cv_search_cos" != "none required"; then - TOR_LIB_MATH="$ac_cv_search_cos" +AC_SEARCH_LIBS(pow, [m], , AC_MSG_ERROR([Could not find pow in libm or libc.])) +if test "$ac_cv_search_pow" != "none required"; then + TOR_LIB_MATH="$ac_cv_search_pow" fi LIBS="$save_LIBS" AC_SUBST(TOR_LIB_MATH) diff --git a/src/test/Makefile.am b/src/test/Makefile.am index e766446..31a464e 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -31,7 +31,7 @@ test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \ ../common/libor-event.a \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ + @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \

1 0

[tor/master] Merge branch 'haiku_port_rebase'
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit ec18c8a06e4cb8b26c9af4f416135191e9c8cde9 Merge: 37504b5 9cabedd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 11:29:29 2011 -0500 Merge branch 'haiku_port_rebase' changes/portability_01_haiku | 14 ++++++++++++++ configure.in | 16 +++++++++++++++- src/or/Makefile.am | 2 +- src/or/main.c | 7 +++---- src/test/Makefile.am | 8 ++++---- src/tools/Makefile.am | 8 +++++--- 6 files changed, 42 insertions(+), 13 deletions(-)

1 0

[tor/master] Fixed build with GCC < 3.3
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit d5e964731c009589952be246d80d4114f65d5ee2 Author: Martin Hebnes Pedersen <martin.h.pedersen(a)gmail.com> Date: Sat Dec 17 17:51:07 2011 +0100 Fixed build with GCC < 3.3 Preprocessor directives should not be put inside the arguments of a macro. This is not supported on older GCC releases (< 3.3) thus broke compilation on Haiku (running gcc2). --- changes/portability_01_haiku | 11 +++++++++++ src/or/main.c | 7 +++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/changes/portability_01_haiku b/changes/portability_01_haiku new file mode 100644 index 0000000..ab58381 --- /dev/null +++ b/changes/portability_01_haiku @@ -0,0 +1,11 @@ + o Minor buxfixes: + - During configure, search for library containing cos function as + libm lives in libcore on some platforms (BeOS/Haiku). + Linking against libm was hard-coded before. Bugfix on + 0.2.2.2-alpha, fixes the first part of bug 4727. Patch and + analysis by Martin Hebnes Pedersen. + - Preprocessor directives should not be put inside the arguments + of a macro. This would break compilation with GCC releases prior + to version 3.3. Bugfix on 0.2.3.3-alpha, fixes the other part of + bug 4727. Patch and analysis by Martin Hebnes Pedersen. + diff --git a/src/or/main.c b/src/or/main.c index 74583b2..1ba3395 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2268,13 +2268,12 @@ tor_init(int argc, char *argv[]) { const char *version = get_version(); - log_notice(LD_GENERAL, "Tor v%s%s running on %s.", version, #ifdef USE_BUFFEREVENTS - " (with bufferevents)", + log_notice(LD_GENERAL, "Tor v%s (with bufferevents) running on %s.", + version, get_uname()); #else - "", + log_notice(LD_GENERAL, "Tor v%s running on %s.", version, get_uname()); #endif - get_uname()); log_notice(LD_GENERAL, "Tor can't help you if you use it wrong! " "Learn how to be safe at "

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Dec '11

19 Dec '11

commit eaa6be68551701dceb8eb3d4544a5d1d4ff0de85 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 19 15:15:30 2011 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 1e6c3e1..d12b33c 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,7 +8,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-12-19 14:36+0000\n" +"PO-Revision-Date: 2011-12-19 15:14+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3274,7 +3274,7 @@ msgstr "طراحي شده توسط تُر" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "کپی به کلیپ برد" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" @@ -3402,10 +3402,14 @@ msgid "" "ensure you configure your applications to use only SOCKS4a or SOCKS5 with " "remote hostname resolution." msgstr "" +"یکی از اپلیکیشن های شما از طریق تور و پروتکلی که ممکن است اطلاعاتی از مقصد " +"نهایی شما را فاش سازد به \"%1\" برقرار ساخته. لطفن مطمین شوید اپلیکیشن خود " +"را بنحوی تنظیم میکنید که فقط از SOCKS4a یا SOCKS5 بهمراه remote hostname " +"resolution استفاده کند." msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" -msgstr "" +msgstr "پروتوکل SOCKS ناشناخته" msgctxt "StatusEventWidget" msgid "" @@ -3413,10 +3417,14 @@ msgid "" " protocol that Tor does not understand. Please ensure you configure your " "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution." msgstr "" +"یکی از اپلیکیشن های شما تلاش کرده است که به توسط تور و از پروتکلی که تور آن " +"را نمیفهمد ارتباطی برقرار کند. لطفن مطمین شوید اپلیکیشن خود را بنحوی تنظیم " +"میکنید که فقط از SOCKS4a یا SOCKS5 بهمراه remote hostname resolution استفاده" +" کند." msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" -msgstr "" +msgstr "نام میزبان مقصد نامعتبر" msgctxt "StatusEventWidget" msgid "" @@ -3427,7 +3435,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "External IP Address Changed" -msgstr "" +msgstr "آی پی آدرس خارجی تغییر کرد" msgctxt "StatusEventWidget" msgid "" @@ -3606,7 +3614,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "کپی" msgctxt "TorrcDialog" msgid "Paste" @@ -3634,7 +3642,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Error connecting to Tor" -msgstr "" +msgstr "خطا در ارتباط با تور" msgctxt "TorrcDialog" msgid "Selection is empty. Please select some text, or check \"Apply all\"" @@ -3642,11 +3650,11 @@ msgstr "" msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\"" -msgstr "" +msgstr "خطا در خط %1: \"%2\"" msgctxt "TorrcDialog" msgid "Error" -msgstr "" +msgstr "خطا" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Dec '11

19 Dec '11

commit fa4b2fc06728a9b188a03ef0b8f898e31f9056cd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 19 14:45:20 2011 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index f670196..1e6c3e1 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,7 +8,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-12-19 14:10+0000\n" +"PO-Revision-Date: 2011-12-19 14:36+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3393,7 +3393,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!" -msgstr "" +msgstr "پتانسیل ارتباط خطرناک!" msgctxt "StatusEventWidget" msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Dec '11

19 Dec '11

commit f2efca71c055943a7209258c9f88bc0e4edbdc09 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 19 14:15:27 2011 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index f863aa8..f670196 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,7 +8,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-12-19 13:40+0000\n" +"PO-Revision-Date: 2011-12-19 14:10+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3351,7 +3351,8 @@ msgid "" "correct time." msgstr "" "تور مشخص کرد که ساعت کامپیوتر شما ممکن است در مقایسه با منبع \"%2\"، %1 " -"ثانیه در گذشته تنظیم شده باشد. اگر ساعت شما د" +"ثانیه در گذشته تنظیم شده باشد. اگر ساعت شما تنظیم نباشد تور کار نمی کند. " +"لطفن مطمین شوید کامپیوتر شما ساعت درست را نشان میدهد" msgctxt "StatusEventWidget" msgid "" @@ -3360,10 +3361,13 @@ msgid "" "will not be able to function. Please verify your computer displays the " "correct time." msgstr "" +"تور مشخص کرد که ساعت کامپیوتر شما ممکن است در مقایسه با منبع \"%2\"، %1 " +"ثانیه در آینده تنظیم شده باشد. اگر ساعت شما تنظیم نباشد تور کار نمی کند. " +"لطفن مطمین شوید کامپیوتر شما ساعت درست را نشان میدهد" msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" -msgstr "" +msgstr "ساعت کامپیوتر شما اشتباه است" msgctxt "StatusEventWidget" msgid "" @@ -3372,6 +3376,10 @@ msgid "" "information over the Tor network is dangerous and not recommended. For your " "protection, Tor has automatically closed this connection." msgstr "" +"ممکن است یکی از اپلیکیشن های کامپیوتر شما برای برقراری ارتباط رمزگذاری نشده " +"از درگاه %1 بتوسط تور تلاش کرده باشد. فرستادن اطلاعات رمزگذاری نشده از طریق " +"شبکه تور، خطرناک است و توصیه نمی شود. برای محافظت از شما، تور این ارتباط را " +"بصورت خودکار بست." msgctxt "StatusEventWidget" msgid "" @@ -3379,6 +3387,9 @@ msgid "" "unencrypted connection through Tor to port %1. Sending unencrypted " "information over the Tor network is dangerous and not recommended." msgstr "" +"ممکن است یکی از اپلیکیشن های کامپیوتر شما برای برقراری ارتباط رمزگذاری نشده " +"از درگاه %1 بتوسط تور تلاش کرده باشد. فرستادن اطلاعات رمزگذاری نشده از طریق " +"شبکه تور، خطرناک است و توصیه نمی شود." msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Dec '11

19 Dec '11

commit ad207c7042a94ffae39645ec3fa5570a7399887e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 19 13:45:20 2011 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 69fe4ec..f863aa8 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -8,7 +8,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-12-19 12:44+0000\n" +"PO-Revision-Date: 2011-12-19 13:40+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3302,6 +3302,9 @@ msgid "" "software, which may contain important security, reliability and performance " "fixes." msgstr "" +"شما هم اکنون در حال اجرای نسخه \"%1\" از نرم افزار تور هستید که دیگر توصیه " +"نمی شود. لطفن به آخرین نسخه از نرم افزار به روز کنید. این بروزرسانی ممکن است" +" شامل رفع ایرادات مهم امنیتی، عملکرد و کارایی باشد" msgctxt "StatusEventWidget" msgid "" @@ -3310,14 +3313,17 @@ msgid "" "version of the software, which may contain important security, reliability " "and performance fixes." msgstr "" +"شما هم اکنون در حال اجرای نسخه \"%1\" از نرم افزار تور هستید که ممکن است " +"دیگر با شبکه فعلی تور کار نکند. لطفن به آخرین نسخه از نرم افزار به روز کنید." +" این بروزرسانی ممکن است شامل رفع ایرادات مهم امنیتی، عملکرد و کارایی باشد" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "نرم افزار تور شما از رده خارج شده است" msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "به شبکه تور وصل شده است" msgctxt "StatusEventWidget" msgid "" @@ -3327,13 +3333,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "خطای نرم افزار تور" msgctxt "StatusEventWidget" msgid "" "The Tor software encountered an internal bug. Please report the following " "error message to the Tor developers at bugs.torproject.org: \"%1\"" msgstr "" +"نرم افزار تور با یک اشکال داخلی مواجه شد. لطفن پیام خطای زیر را برای سازندگان تور به آدرس زیر ارسال کنید:\n" +"bugs.torproject.org: \"%1\"" msgctxt "StatusEventWidget" msgid "" @@ -3342,6 +3350,8 @@ msgid "" "will not be able to function. Please verify your computer displays the " "correct time." msgstr "" +"تور مشخص کرد که ساعت کامپیوتر شما ممکن است در مقایسه با منبع \"%2\"، %1 " +"ثانیه در گذشته تنظیم شده باشد. اگر ساعت شما د" msgctxt "StatusEventWidget" msgid ""

1 0