April 2012 - tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 17 Apr '12

17 Apr '12

commit b50d61313b770c59d7a518039f21e31bd51b44ab Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 17 17:15:16 2012 +0000 Update translations for vidalia_alpha --- ar/vidalia_ar.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/vidalia_ar.po b/ar/vidalia_ar.po index 664f84c..27a5fd9 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: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-03-22 09:01+0000\n" +"PO-Revision-Date: 2012-04-17 16:56+0000\n" "Last-Translator: Mohammed Al-Doub <voulnet(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -209,12 +209,12 @@ msgstr "" msgctxt "AdvancedPage" msgid "Panic" -msgstr "" +msgstr "ذعر" msgctxt "AdvancedPage" msgid "" "<b>WARNING</b>: The panic button will erease the application if pressed" -msgstr "" +msgstr "<b>تحذير</b>:\nزر وضع الذعر سيمسح البرنامج" msgctxt "AdvancedPage" msgid "Enable panic button"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 17 Apr '12

17 Apr '12

commit b6f670de2b92bc7f2df185a7db23ae756ec7c2d8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 17 17:15:14 2012 +0000 Update translations for vidalia_completed --- ar/vidalia_ar.po | 111 +++++++++++++++++++++++++++++++++++------------------- 1 files changed, 72 insertions(+), 39 deletions(-) diff --git a/ar/vidalia_ar.po b/ar/vidalia_ar.po index 4cba210..6065c82 100644 --- a/ar/vidalia_ar.po +++ b/ar/vidalia_ar.po @@ -1,6 +1,7 @@ -# Translators: +# # Translators: # Ahmad LuvSy <donotplay(a)hotmail.ca>, 2012. +# Ahmad Mohammad <>, 2012. # IBRAHIM <mradonadiego(a)hotmail.fr>, 2011. # <manmacdeath(a)gmail.com>, 2011. # <moazbaghdadi(a)gmail.com>, 2011. @@ -8,12 +9,13 @@ # Mohammed Al-Doub <voulnet(a)gmail.com>, 2012. # OsamaK <osamak(a)gnu.org>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. +# Yehia Badawy <the1legend_2010(a)yahoo.com>, 2012. msgid "" 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: 2012-02-14 09:46+0000\n" +"POT-Creation-Date: 2012-03-21 17:52+0000\n" +"PO-Revision-Date: 2012-04-17 16:48+0000\n" "Last-Translator: Mohammed Al-Doub <voulnet(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -206,6 +208,13 @@ msgstr "جهز محطة التحكم آليًّا" msgctxt "AdvancedPage" msgid "" +"You've checked the autoconfiguration option for the ControlPort, but " +"provided no Data Directory. Please add one, or uncheck the \"Configure " +"ControlPort automatically\" option." +msgstr "لقد تفحصت خيار الإعداد الأوتوماتيكي لمنفذ التحكم, لكنه لم يتوصل لمعلومات, من فضلك أضف واحداً, أو أزل علامة الأختيار من على \" ضبط منفذ التحكم أوتوماتيكياً\"" + +msgctxt "AdvancedPage" +msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." @@ -231,6 +240,23 @@ msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." msgstr "ڤيداليا لم يتمكن من تحميل ملف ترجمة اللغة المحدد." +msgctxt "AppearancePage" +msgid "" +"System Icon Preferences (changes will take effect when you restart Vidalia)" +msgstr "ضع الأيكونه ضمن تفضيلات أيكونات النظام ( تحتاج لإعادة تشغيل فيداليا لتفعيل الإعداد ) " + +msgctxt "AppearancePage" +msgid "Show the Tray Icon and Dock Icon (default)" +msgstr " اظهار الايقونة بسلة و شريط البرامج" + +msgctxt "AppearancePage" +msgid "Hide the Tray Icon" +msgstr "اخفاء الايقونة من سلة البرامج" + +msgctxt "AppearancePage" +msgid "Hide the Dock Icon" +msgstr "اخفاء الايقونة من شريط البرامج" + msgctxt "BandwidthGraph" msgid "Since:" msgstr "منذ:" @@ -1756,10 +1782,6 @@ msgid "Connected to the Tor network!" msgstr "تم الاتصال بشبكة تور" msgctxt "MainWindow" -msgid "Unrecognized startup status" -msgstr "لم بتم التعرف على حالة بدء التشغيل" - -msgctxt "MainWindow" msgid "miscellaneous" msgstr "متفرقات" @@ -2071,6 +2093,24 @@ msgid "" msgstr "كل شيء يتم إرساله عن طريق هذا الاتصال تمكن مراقبته، الرجاء التحقق من إعدادات التطبيق واستخدام بروتوكولات مشفرة فقط، مثل SSL، إن كان هذا ممكناً" msgctxt "MainWindow" +msgid "Bootstrapping torrc from %1 to %2" +msgstr "يتم تشغيل torrc من %1 إلى %2" + +msgctxt "MainWindow" +msgid "(probably Telnet)" +msgstr "(عميل تلنت على ما يبدو)" + +msgctxt "MainWindow" +msgid "(probably an email client)" +msgstr "(عميل بريد إلكتروني على ما يبدو)" + +msgctxt "MainWindow" +msgid "" +"One of your applications %1 appears to be making a potentially unencrypted " +"and unsafe connection to port %2." +msgstr "يبدو أن أحد برامجك %1 يتصل بطريقة غير مشفرة ولا آمنة بالمحطة %2." + +msgctxt "MainWindow" msgid "failed (%1)" msgstr "فشل (%1)" @@ -2081,8 +2121,19 @@ msgid "" msgstr "جار إيقاف تحويلتك.\nيرجى النقر على \"إيقاف\" مرة أخرى لتوقف تحويلتك الآن." msgctxt "MainWindow" -msgid "Bootstrapping torrc from %1 to %2" -msgstr "يتم تشغيل torrc من %1 إلى %2" +msgid "" +"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n" +"\n" +"Here's the last error message:\n" +"%2" +msgstr "فيداليا غير قادر على التحدث الى شبكة تور لأنه غير قادر على الدخول لهذا الملف: %1\n\nهنا آخر شرح للخطأ:\n%2" + +msgctxt "MainWindow" +msgid "" +"It seems Tor has stopped running since Vidalia started it.\n" +"\n" +"See the Advanced Message Log for more information." +msgstr "إذا كان فيداليا غير قادر على إيقاف تور, سوف يقوم فيداليا بعرض رسالة خطأ تخبرك عن الخطأ الذي حدث. يمكنك أيضا إلقاء نظرة على <a href=\"log.html\">سجل الاحداث</a> لمعرفة ما إذا قام تور بإصدار المزيد من المعلومات حول ما الخطأ الذي حدث." msgctxt "MainWindow" msgid "" @@ -2098,20 +2149,6 @@ msgid "" "Please check the message log for recent warning or error messages." msgstr "وجد ڤيداليا أن برمجية تور توقفت عن العمل بشكل مفاجئ.\n\nيرجى التحقق من سجل الرسائل لتحذيرات أو رسائل خطأ حديثة." -msgctxt "MainWindow" -msgid "(probably Telnet)" -msgstr "(عميل تلنت على ما يبدو)" - -msgctxt "MainWindow" -msgid "(probably an email client)" -msgstr "(عميل بريد إلكتروني على ما يبدو)" - -msgctxt "MainWindow" -msgid "" -"One of your applications %1 appears to be making a potentially unencrypted " -"and unsafe connection to port %2." -msgstr "يبدو أن أحد برامجك %1 يتصل بطريقة غير مشفرة ولا آمنة بالمحطة %2." - msgctxt "MessageLog" msgid "Error Setting Filter" msgstr "عُطل في ضبط المُرشِّح" @@ -2524,14 +2561,6 @@ msgid "Ctrl+F" msgstr "Ctrl+F" msgctxt "NetworkPage" -msgid "Invalid Bridge" -msgstr "جسر عاطل" - -msgctxt "NetworkPage" -msgid "The specified bridge identifier is not valid." -msgstr "معرف الجسر المحدد عاطل" - -msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" msgstr "نسخ (Ctrl+C)" @@ -2664,13 +2693,13 @@ msgid "SOCKS 5" msgstr "SOCKS 5" msgctxt "NetworkPage" -msgid "HTTP" -msgstr "HTTP" - -msgctxt "NetworkPage" msgid "HTTP / HTTPS" msgstr "HTTP / HTTPS" +msgctxt "NetworkPage" +msgid "You must specify one or more bridges." +msgstr "يجب أن تحدد منفذًا واحدًا يسمح لك الجدار الناري بالاتصال به أو أكثر." + msgctxt "Policy" msgid "accept" msgstr "قبول" @@ -2848,10 +2877,6 @@ msgid "Run as a client only" msgstr "تشغيل كعميل فقط." msgctxt "ServerPage" -msgid "Relay traffic for the Tor network" -msgstr "تمرير تدفقات شبكة تور" - -msgctxt "ServerPage" msgid "Relay Port:" msgstr "مدخل التحويلة:" @@ -3096,6 +3121,14 @@ msgid "Automatically distribute my bridge address" msgstr "انشر عنوان الجسر الخاص بي تلقائيا" msgctxt "ServerPage" +msgid "Relay traffic for the Tor network (exit relay)" +msgstr "تمرير تدفقات شبكة تور" + +msgctxt "ServerPage" +msgid "Relay traffic inside the Tor network (non-exit relay)" +msgstr "تتابع حركة المرور داخل الشبكة تور (غير الخروج التتابع)" + +msgctxt "ServerPage" msgid "Mirror the Relay Directory" msgstr "عكس (mirror) دليل التحويلات"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 17 Apr '12

17 Apr '12

commit 71abeaea7f7f35019999304f950918f5f9f48dd6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 17 17:15:11 2012 +0000 Update translations for vidalia --- ar/vidalia_ar.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ar/vidalia_ar.po b/ar/vidalia_ar.po index bf5cedb..6065c82 100644 --- a/ar/vidalia_ar.po +++ b/ar/vidalia_ar.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-04-11 17:05+0000\n" -"Last-Translator: Yehia Badawy <the1legend_2010(a)yahoo.com>\n" +"PO-Revision-Date: 2012-04-17 16:48+0000\n" +"Last-Translator: Mohammed Al-Doub <voulnet(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" @@ -247,15 +247,15 @@ msgstr "ضع الأيكونه ضمن تفضيلات أيكونات النظام msgctxt "AppearancePage" msgid "Show the Tray Icon and Dock Icon (default)" -msgstr "" +msgstr " اظهار الايقونة بسلة و شريط البرامج" msgctxt "AppearancePage" msgid "Hide the Tray Icon" -msgstr "" +msgstr "اخفاء الايقونة من سلة البرامج" msgctxt "AppearancePage" msgid "Hide the Dock Icon" -msgstr "" +msgstr "اخفاء الايقونة من شريط البرامج" msgctxt "BandwidthGraph" msgid "Since:" @@ -2126,7 +2126,7 @@ msgid "" "\n" "Here's the last error message:\n" "%2" -msgstr "" +msgstr "فيداليا غير قادر على التحدث الى شبكة تور لأنه غير قادر على الدخول لهذا الملف: %1\n\nهنا آخر شرح للخطأ:\n%2" msgctxt "MainWindow" msgid ""

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 17 Apr '12

17 Apr '12

commit 51883162927603f542c6156d76054ec4d4cd3a8b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 17 17:15:07 2012 +0000 Update translations for orbot_completed --- values-ar/strings.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index fb9606a..0d6debe 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -31,7 +31,6 @@ <string name="button_clear_log">مسح السجل</string> <string name="menu_verify">فحص</string> <string name="menu_exit">خروج</string> - <string name="powered_by">بدعم من مشروع تور</string> <string name="press_to_start">- long press to start -</string> <string name="pref_trans_proxy_group">عملية توكيل غير مرئية أو ضمنية (يتطلب حقوق المسؤول- Root-)</string> <string name="pref_trans_proxy_title">عملية توكيل غير مرئية أو ضمنية</string> @@ -209,4 +208,6 @@ <string name="set_locale_summary">غير اللغة و الاعدادات الاقليمية لأوربوت</string> <string name="wizard_locale_title">اختيار اللغة</string> <string name="wizard_locale_msg">اختر اللغة الافتراضية</string> + <string name="powered_by">بدعم من مشروع تور</string> + <string name="btn_save_settings">حفظ الاعدادات</string> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 17 Apr '12

17 Apr '12

commit 80d11403f5255fe167afd97b3b5a58c69e686daf Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 17 17:15:05 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 46ac6c2..0d6debe 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -209,5 +209,5 @@ <string name="wizard_locale_title">اختيار اللغة</string> <string name="wizard_locale_msg">اختر اللغة الافتراضية</string> <string name="powered_by">بدعم من مشروع تور</string> - <string name="btn_save_settings">Save Settings</string> + <string name="btn_save_settings">حفظ الاعدادات</string> </resources>

1 0

[metrics-tasks/master] Tweak server descriptor verifier (#2768).
by karsten＠torproject.org 17 Apr '12

17 Apr '12

commit ed7759ff1afaa926b0823bd94c80330ede4e8f12 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 17 18:23:49 2012 +0200 Tweak server descriptor verifier (#2768). Now we learn when a descriptor file could not be parsed due to non-crypto-related issues, rather than silently ignoring it. --- task-2768/VerifyServerDescriptors.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/task-2768/VerifyServerDescriptors.java b/task-2768/VerifyServerDescriptors.java index c1cf766..e648d92 100644 --- a/task-2768/VerifyServerDescriptors.java +++ b/task-2768/VerifyServerDescriptors.java @@ -52,6 +52,12 @@ public class VerifyServerDescriptors { int processedDescriptors = 0, verifiedDescriptors = 0; while (descriptorFiles.hasNext()) { DescriptorFile descriptorFile = descriptorFiles.next(); + if (descriptorFile.getException() != null) { + System.err.println("Could not read/parse descriptor file " + + descriptorFile.getFileName() + ": " + + descriptorFile.getException().getMessage()); + continue; + } if (descriptorFile.getDescriptors() == null) { continue; }

1 0

[metrics-lib/master] Fix indentation.
by karsten＠torproject.org 17 Apr '12

17 Apr '12

commit f63d22baf3f04dd9227dd0ef98f3eef1b7012ddf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 17 16:11:23 2012 +0200 Fix indentation. --- .../descriptor/impl/DescriptorReaderImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java index ee45fa1..7db883b 100644 --- a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -248,8 +248,8 @@ public class DescriptorReaderImpl implements DescriptorReader { descriptorFile.setDescriptors(parsedDescriptors); } catch (DescriptorParseException e) { descriptorFile.setException(e); - } - this.descriptorQueue.add(descriptorFile); + } + this.descriptorQueue.add(descriptorFile); } } } catch (IOException e) {

1 0

[metrics-lib/master] Don't catch an exception that the caller should handle.
by karsten＠torproject.org 17 Apr '12

17 Apr '12

commit 48d9363c82dc13f757e5df86190c9ac9202d6591 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 17 16:10:37 2012 +0200 Don't catch an exception that the caller should handle. --- .../descriptor/impl/ServerDescriptorImpl.java | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 5fc6ca1..68b0e70 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -21,23 +21,18 @@ public class ServerDescriptorImpl extends DescriptorImpl implements ServerDescriptor { protected static List<ServerDescriptor> parseDescriptors( - byte[] descriptorsBytes, boolean failUnrecognizedDescriptorLines) { + byte[] descriptorsBytes, boolean failUnrecognizedDescriptorLines) + throws DescriptorParseException { List<ServerDescriptor> parsedDescriptors = new ArrayList<ServerDescriptor>(); List<byte[]> splitDescriptorsBytes = DescriptorImpl.splitRawDescriptorBytes(descriptorsBytes, "router "); - try { - for (byte[] descriptorBytes : splitDescriptorsBytes) { - ServerDescriptor parsedDescriptor = - new ServerDescriptorImpl(descriptorBytes, - failUnrecognizedDescriptorLines); - parsedDescriptors.add(parsedDescriptor); - } - } catch (DescriptorParseException e) { - /* TODO Handle this error somehow. */ - System.err.println("Failed to parse descriptor. Skipping."); - e.printStackTrace(); + for (byte[] descriptorBytes : splitDescriptorsBytes) { + ServerDescriptor parsedDescriptor = + new ServerDescriptorImpl(descriptorBytes, + failUnrecognizedDescriptorLines); + parsedDescriptors.add(parsedDescriptor); } return parsedDescriptors; }

1 0

[metrics-lib/master] Update test method names.
by karsten＠torproject.org 17 Apr '12

17 Apr '12

commit 4f499abaecdc24f3774ea1f86f914f42cfad982d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 17 16:29:04 2012 +0200 Update test method names. --- .../descriptor/impl/ServerDescriptorImplTest.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 72bec62..a96fa33 100644 --- a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -1034,21 +1034,21 @@ public class ServerDescriptorImplTest { } @Test() - public void testEventdnsTrue() throws DescriptorParseException { + public void testEventdns1() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder. createWithEventdnsLine("eventdns 1"); assertTrue(descriptor.getUsesEnhancedDnsLogic()); } @Test() - public void testEventdnsFalse() throws DescriptorParseException { + public void testEventdns0() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder. createWithEventdnsLine("eventdns 0"); assertFalse(descriptor.getUsesEnhancedDnsLogic()); } @Test(expected = DescriptorParseException.class) - public void testEventdns1() throws DescriptorParseException { + public void testEventdnsTrue() throws DescriptorParseException { DescriptorBuilder.createWithEventdnsLine("eventdns true"); }

1 0

[metrics-lib/master] Ignore Eclipse's project files.
by karsten＠torproject.org 17 Apr '12

17 Apr '12

commit f7a6de8041bb6704aa344c5e7cd1de6cd443373d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 17 17:33:09 2012 +0200 Ignore Eclipse's project files. --- .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index df73ae3..b57524b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ classes/ lib/ descriptor.jar +.classpath +.project

1 0