- tor-commits - lists.torproject.org

[stem/master] Preserve structure of config file while saving
by atagar＠torproject.org 09 Feb '12

09 Feb '12

commit dd29415f27eb509ca496bc2159258a3a6b5d7774 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Thu Feb 9 01:16:51 2012 +0530 Preserve structure of config file while saving Previously the single line config entries were converted to a multi line structure and then saved. Now, the structure of the config file is preserved. Fixed by atagar --- stem/util/conf.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index b88dd10..6eac9a1 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -268,7 +268,9 @@ class Config(): with open(self._path, 'w') as output_file: for entry_key in sorted(self.keys()): for entry_value in self.get_value(entry_key, multiple = True): - output_file.write('%s\n|%s\n' % (entry_key, entry_value.replace("\n", "\n|"))) + # check for multi line entries + if "\n" in entry_value: entry_value = "\n|" + entry_value.replace("\n", "\n|") + output_file.write('%s %s\n' % (entry_key, entry_value)) self._contents_lock.release()

1 0

[stem/master] Helper constructors for BaseController instances
by atagar＠torproject.org 09 Feb '12

09 Feb '12

commit 398cbfb93a4982961e1ce27fc05d82265408e78a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 6 08:16:59 2012 -0800 Helper constructors for BaseController instances A controller is a wrapper around a ControlSocket instance so adding convenience methods to construct both the socket and controller at the same time. These will belong to the Controller class later. --- stem/control.py | 47 +++++++++++++++++++++++++++++++++ test/integ/control/base_controller.py | 23 ++++++++++++++++ 2 files changed, 70 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index d1f30ee..c485cb9 100644 --- a/stem/control.py +++ b/stem/control.py @@ -4,6 +4,11 @@ Classes for interacting with the tor control socket. Controllers are a wrapper around a ControlSocket, retaining its low-level connection methods (send, recv, is_alive, etc) in addition to providing methods for interacting at a higher level. + +from_port - Provides a Controller based on a port connection. +from_socket_file - Provides a Controller based on a socket file connection. + +BaseController - ControlSocket subclass providing asynchronous message handling. """ import stem.socket @@ -18,6 +23,48 @@ class BaseController(stem.socket.ControlSocket): socket - ControlSocket from which this was constructed """ + # TODO: Convenience methods for the BaseController are pointless since + # callers generally won't want to make instances of this directly. Move + # these to the Controller class once we have one. + + def from_port(control_addr = "127.0.0.1", control_port = 9051): + """ + Constructs a ControlPort based Controller. + + Arguments: + control_addr (str) - ip address of the controller + control_port (int) - port number of the controller + + Returns: + stem.control.Controller attached to the given port + + Raises: + stem.socket.SocketError if we're unable to establish a connection + """ + + control_port = stem.socket.ControlPort(control_addr, control_port) + return BaseController(control_port) + + def from_socket_file(socket_path = "/var/run/tor/control"): + """ + Constructs a ControlSocketFile based Controller. + + Arguments: + socket_path (str) - path where the control socket is located + + Returns: + stem.control.Controller attached to the given socket file + + Raises: + stem.socket.SocketError if we're unable to establish a connection + """ + + control_socket = stem.socket.ControlSocketFile(socket_path) + return BaseController(control_socket) + + from_port = staticmethod(from_port) + from_socket_file = staticmethod(from_socket_file) + def __init__(self, control_socket): self.socket = control_socket diff --git a/test/integ/control/base_controller.py b/test/integ/control/base_controller.py index 467c057..e30964c 100644 --- a/test/integ/control/base_controller.py +++ b/test/integ/control/base_controller.py @@ -5,6 +5,7 @@ Integration tests for the stem.control.BaseController class. import unittest import stem.control +import stem.socket import test.runner import test.mocking as mocking import test.integ.socket.control_socket @@ -16,6 +17,28 @@ class TestBaseController(unittest.TestCase): def tearDown(self): mocking.revert_mocking() + def test_from_port(self): + """ + Basic sanity check for the from_port constructor. + """ + + if test.runner.Torrc.PORT in test.runner.get_runner().get_options(): + controller = stem.control.BaseController.from_port(control_port = test.runner.CONTROL_PORT) + self.assertTrue(isinstance(controller, stem.control.BaseController)) + else: + self.assertRaises(stem.socket.SocketError, stem.control.BaseController.from_port, "127.0.0.1", test.runner.CONTROL_PORT) + + def test_from_socket_file(self): + """ + Basic sanity check for the from_socket_file constructor. + """ + + if test.runner.Torrc.SOCKET in test.runner.get_runner().get_options(): + controller = stem.control.BaseController.from_socket_file(test.runner.CONTROL_SOCKET_PATH) + self.assertTrue(isinstance(controller, stem.control.BaseController)) + else: + self.assertRaises(stem.socket.SocketError, stem.control.BaseController.from_socket_file, test.runner.CONTROL_SOCKET_PATH) + def test_socket_passthrough(self): """ The BaseController is a passthrough for the socket it is built from, so

1 0

[stem/master] Merging gsathya's stem.util.conf save() improvements
by atagar＠torproject.org 09 Feb '12

09 Feb '12

commit 81fc285ff9c6e257313115d9b1e489966e172fc8 Merge: a3cddb0 e3b78e8 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 8 19:17:32 2012 -0800 Merging gsathya's stem.util.conf save() improvements Work is being tracked in... https://trac.torproject.org/projects/tor/ticket/4913 stem/util/conf.py | 50 +++++++++++++++++++++++++++++++---------------- test/integ/util/conf.py | 30 +++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 18 deletions(-)

1 0

[stem/master] Cleanup for stem.util.conf's save() method
by atagar＠torproject.org 09 Feb '12

09 Feb '12

commit e3b78e898dcfd4d33356c7e791fb92e6c7128484 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 8 19:15:05 2012 -0800 Cleanup for stem.util.conf's save() method Minor changes including: - fixing a 'self.path' assignment to be 'self._path' - making the path optional for load() as well - raising a ValueError for both load() and save() if we use an undefined path - whitespace fixes - added argument to save() pydoc - replacing integ test with one that explicitely tests the three types of values it might handle --- stem/util/conf.py | 41 +++++++++++++++++++------------ test/integ/util/conf.py | 61 +++++++++++++++++----------------------------- 2 files changed, 48 insertions(+), 54 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 6eac9a1..7d086f4 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -194,7 +194,7 @@ class Config(): # keys that have been requested (used to provide unused config contents) self._requested_keys = set() - def load(self, path): + def load(self, path = None): """ Reads in the contents of the given path, adding its configuration values to our current contents. @@ -204,10 +204,16 @@ class Config(): Raises: IOError if we fail to read the file (it doesn't exist, insufficient - permissions, etc) + permissions, etc) + ValueError if we don't have a default path and none was provided """ - with open(path, "r") as config_file: + if path: + self._path = path + elif not self._path: + raise ValueError("Unable to load configuration: no path provided") + + with open(self._path, "r") as config_file: read_contents = config_file.readlines() self._contents_lock.acquire() @@ -246,32 +252,36 @@ class Config(): self.set(key, value, False) - self._path = path self._contents_lock.release() - # TODO: pending improvements... - # - integ testing def save(self, path = None): """ Saves configuration contents to the config file or to the path - specified. - - If path is not None, then the default path for this config handler - updated to the argument passed. + specified. If a path is provided then it replaces the configuration + location that we track. + + Arguments: + path (str) - location to be saved to + + Raises: + ValueError if we don't have a default path and none was provided """ - self._contents_lock.acquire() - if path: - self.path = path - + self._path = path + elif not self._path: + raise ValueError("Unable to save configuration: no path provided") + + self._contents_lock.acquire() + with open(self._path, 'w') as output_file: for entry_key in sorted(self.keys()): for entry_value in self.get_value(entry_key, multiple = True): # check for multi line entries if "\n" in entry_value: entry_value = "\n|" + entry_value.replace("\n", "\n|") + output_file.write('%s %s\n' % (entry_key, entry_value)) - + self._contents_lock.release() def clear(self): @@ -281,7 +291,6 @@ class Config(): """ self._contents_lock.acquire() - self._path = None self._contents.clear() self._raw_contents = [] self._requested_keys = set() diff --git a/test/integ/util/conf.py b/test/integ/util/conf.py index 314fa80..12d31b8 100644 --- a/test/integ/util/conf.py +++ b/test/integ/util/conf.py @@ -39,6 +39,12 @@ multiline.entry.squashed_bottom |and a ho hum """ +HERALD_POEM = """ +What a beautiful morning, +what a beautiful day. +Why are those arrows", +coming my way?!?""" + def _get_test_config_path(): return os.path.join(test.runner.get_runner().get_test_dir(), "integ_test_cfg") @@ -104,47 +110,26 @@ class TestConf(unittest.TestCase): self.assertEquals("la de da\nand a ho hum", test_config.get("multiline.entry.%s" % entry)) self.assertEquals("", test_config.get("multiline.entry.empty")) - - def test_save_multiline(self): + + def test_save(self): """ - Tests the save method with multi-line configuration files. + Saves then reloads a configuration with several types of values. """ - - test_config_path = _make_config(MULTILINE_CONF) - test_config = stem.util.conf.get_config("integ_testing") - test_config.load(test_config_path) - - test_config.save() - test_config.clear() - + + # makes a configuration with a variety of types test_config = stem.util.conf.get_config("integ_testing") - test_config.load(test_config_path) - - for entry in ("simple", "leading_whitespace", "squashed_top", "squashed_bottom"): - self.assertEquals("la de da\nand a ho hum", test_config.get("multiline.entry.%s" % entry)) - self.assertEquals("", test_config.get("multiline.entry.empty")) - - def test_save_singleline(self): - """ - Tests the save method with mingle-line configuration files. - """ - ssh_config = {"login.user": "atagar", - "login.password": "pepperjack_is_awesome!", - "destination.ip": "127.0.0.1", - "destination.port": 22, - "startup.run": []} + test_config.set("single_value", "yup, I'm there") + test_config.set("multiple_values", "a", False) + test_config.set("multiple_values", "b", False) + test_config.set("multiple_values", "c", False) + test_config.set("multiline_value", HERALD_POEM) - test_config_path = _make_config(EXAMPLE_CONF) - user_config = stem.util.conf.get_config("integ_testing") - user_config.load(test_config_path) - - user_config.set("destination.port", '22') - user_config.set("destination.ip", "127.0.0.1") - - user_config.save() - user_config.clear() - user_config.load(test_config_path) + test_config.save(_get_test_config_path()) + test_config.clear() + test_config.load() + + self.assertEquals("yup, I'm there", test_config.get_value("single_value")) + self.assertEquals(["a", "b", "c"], test_config.get_value("multiple_values", multiple = True)) + self.assertEquals(HERALD_POEM, test_config.get_value("multiline_value")) - self.assertEquals('22', user_config.get("destination.port")) - self.assertEquals("127.0.0.1", user_config.get("destination.ip"))

1 0

[stem/master] Updated config.save()
by atagar＠torproject.org 09 Feb '12

09 Feb '12

commit d48aadd31678e6a4dd670a4e23832a3d563c4072 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Thu Feb 9 00:05:19 2012 +0530 Updated config.save() - Added Pydocs - Added handling of multi-line entries - Added path argument - Changed single letter variable 'f' to 'output_file' - Instead of calling sort() on config.keys() and iterate over it, we pass config.keys() to sorted(). --- stem/util/conf.py | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index fe8ab68..b88dd10 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -250,21 +250,26 @@ class Config(): self._contents_lock.release() # TODO: pending improvements... - # - missing pydocs - # - integ testing - # - does not yet handle multi-line entries - # - should have an optional path argument - def save(self): - self._contents_lock.acquire() - - config_keys = self.keys() - config_keys.sort() + # - integ testing + def save(self, path = None): + """ + Saves configuration contents to the config file or to the path + specified. + + If path is not None, then the default path for this config handler + updated to the argument passed. + """ - with open(path, 'w') as f: - for entry_key in config_keys: + self._contents_lock.acquire() + + if path: + self.path = path + + with open(self._path, 'w') as output_file: + for entry_key in sorted(self.keys()): for entry_value in self.get_value(entry_key, multiple = True): - f.write('%s %s\n' % (entry_key, entry_value)) - + output_file.write('%s\n|%s\n' % (entry_key, entry_value.replace("\n", "\n|"))) + self._contents_lock.release() def clear(self):

1 0

[stem/master] Added integ tests for config.save()
by atagar＠torproject.org 09 Feb '12

09 Feb '12

commit 3f51e6920c1dc6dc28d7f70115cd30ed8c020b29 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Thu Feb 9 00:20:58 2012 +0530 Added integ tests for config.save() Tests check save() with single and multi line configuration files. --- test/integ/util/conf.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/test/integ/util/conf.py b/test/integ/util/conf.py index 9eca724..314fa80 100644 --- a/test/integ/util/conf.py +++ b/test/integ/util/conf.py @@ -99,9 +99,52 @@ class TestConf(unittest.TestCase): test_config_path = _make_config(MULTILINE_CONF) test_config = stem.util.conf.get_config("integ_testing") test_config.load(test_config_path) + + for entry in ("simple", "leading_whitespace", "squashed_top", "squashed_bottom"): + self.assertEquals("la de da\nand a ho hum", test_config.get("multiline.entry.%s" % entry)) + self.assertEquals("", test_config.get("multiline.entry.empty")) + + def test_save_multiline(self): + """ + Tests the save method with multi-line configuration files. + """ + + test_config_path = _make_config(MULTILINE_CONF) + test_config = stem.util.conf.get_config("integ_testing") + test_config.load(test_config_path) + + test_config.save() + test_config.clear() + + test_config = stem.util.conf.get_config("integ_testing") + test_config.load(test_config_path) + for entry in ("simple", "leading_whitespace", "squashed_top", "squashed_bottom"): self.assertEquals("la de da\nand a ho hum", test_config.get("multiline.entry.%s" % entry)) self.assertEquals("", test_config.get("multiline.entry.empty")) + def test_save_singleline(self): + """ + Tests the save method with mingle-line configuration files. + """ + ssh_config = {"login.user": "atagar", + "login.password": "pepperjack_is_awesome!", + "destination.ip": "127.0.0.1", + "destination.port": 22, + "startup.run": []} + + test_config_path = _make_config(EXAMPLE_CONF) + user_config = stem.util.conf.get_config("integ_testing") + user_config.load(test_config_path) + + user_config.set("destination.port", '22') + user_config.set("destination.ip", "127.0.0.1") + + user_config.save() + user_config.clear() + user_config.load(test_config_path) + + self.assertEquals('22', user_config.get("destination.port")) + self.assertEquals("127.0.0.1", user_config.get("destination.ip"))

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 08 Feb '12

08 Feb '12

commit d59a3ddad87637915da00b87d5ecbb9174b45bc0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 8 21:45:04 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 58 ++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 8574c91..01a6a12 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -143,41 +143,41 @@ <string name="bridge_requires_ip">لتستخدم ميزة جسور الاتصال، يجب عليك ادخال عنوان انترنت لجسر واحد عالأقل.</string> <string name="send_email_for_bridges">أرسل رسالة بريد الكتروني إلى bridges(a)torproject.org مع عبارة get bridges بداخل الرسالة من حساب بريد جيميل gmail.</string> <string name="error">خطأ</string> - <string name="your_reachableaddresses_settings_caused_an_exception_"></string> - <string name="your_relay_settings_caused_an_exception_"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_">اعدادات العنوان القابل للاتصال لديك تسببت بخطأ!</string> + <string name="your_relay_settings_caused_an_exception_">اعدادات نقاط التحويل لديك تسببت بخطأ!</string> <string name="exit_nodes">نقاط الخروج</string> - <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">البصمات، الاسماء المستعارة، البلدان و العناوين لآخر نقطة اتصال</string> <string name="enter_exit_nodes">أدخل نقاط الخروج</string> <string name="exclude_nodes">استثني النقاط</string> <string name="fingerprints_nicks_countries_and_addresses_to_exclude">بصمات، الأسماء المستعارة، البلدان و العناوين ليتم استثنائها</string> <string name="enter_exclude_nodes">أدخل النقاط المستثناه</string> <string name="strict_nodes">النقاط المشددة</string> - <string name="use_only_these_specified_nodes"></string> - <string name="bridges"></string> - <string name="use_bridges"></string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> - <string name="ip_address_and_port_of_bridges"></string> - <string name="enter_bridge_addresses"></string> - <string name="relays"></string> - <string name="relaying"></string> - <string name="enable_your_device_to_be_a_non_exit_relay"></string> - <string name="relay_port"></string> - <string name="listening_port_for_your_tor_relay"></string> - <string name="enter_or_port"></string> - <string name="relay_nickname"></string> - <string name="the_nickname_for_your_tor_relay"></string> - <string name="enter_a_custom_relay_nickname"></string> - <string name="reachable_addresses"></string> - <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> - <string name="reachable_ports"></string> - <string name="ports_reachable_behind_a_restrictive_firewall"></string> - <string name="enter_ports"></string> - <string name="enable_hidden_services"></string> - <string name="run_servers_accessible_via_the_tor_network"></string> - <string name="enter_localhost_ports_for_hidden_services"></string> - <string name="hidden_service_ports"></string> - <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> - <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="use_only_these_specified_nodes">فقط استخدم هذه النقاط المحددة</string> + <string name="bridges">الجسور</string> + <string name="use_bridges">استخدم الجسور</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">اسمح باستخدام نقاط دخول بديلة على شبكة تور</string> + <string name="ip_address_and_port_of_bridges">عناوين الانترنت و منافذ الجسور</string> + <string name="enter_bridge_addresses">أدخل عنوان الجسر</string> + <string name="relays">نقاط التحويل</string> + <string name="relaying">يتم التحويل</string> + <string name="enable_your_device_to_be_a_non_exit_relay">اسمح لجهازك ليكون منفذ تحويل غير نهائي</string> + <string name="relay_port">منافذ تحويل الاتصال</string> + <string name="listening_port_for_your_tor_relay">المنفذ المصغي لمنفذ تحويل تور الخاص بك</string> + <string name="enter_or_port">أدخل منفذ OR</string> + <string name="relay_nickname">الاسم المستعار لمنفذ التحويل</string> + <string name="the_nickname_for_your_tor_relay">الاسم المستعار لمنفذ تحويل تور الخاص بك</string> + <string name="enter_a_custom_relay_nickname">أدخل اسم مستعار لنقطة تحويل</string> + <string name="reachable_addresses">العناوين التي يمكن الوصول إليها</string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">قم بالتشغيل كخدمة من وراء جدار ناري</string> + <string name="reachable_ports">المنافذ القابلة للاتصال</string> + <string name="ports_reachable_behind_a_restrictive_firewall">المنافذ القابلة للاتصال عبر الجدار الناري</string> + <string name="enter_ports">أدخل المنافذ</string> + <string name="enable_hidden_services">تشغيل الخدمات المخفية</string> + <string name="run_servers_accessible_via_the_tor_network">شغل خوادم قابلة للاتصال من داخل شبكة تور</string> + <string name="enter_localhost_ports_for_hidden_services">أدخل منافذ localhost للخدمات المخفية</string> + <string name="hidden_service_ports">منافذ الخدمات المخفية</string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">اسم العنوان لخدمتك المخفية (يتم انشائه تلقائياً)</string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">شغل سجل المعالجة debug</string> <string name="project_home">الموقع الرسمي للمشروع:</string> <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> <string name="the_tor_license">رخصة استخدام تور</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 08 Feb '12

08 Feb '12

commit 52cf576a363bfc4e38f5ac7d985db7cd5f66534c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 8 21:15:04 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 96 ++++++++++++++++++++++++------------------------ 1 files changed, 48 insertions(+), 48 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 8b5a918..8574c91 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -119,39 +119,39 @@ <string name="pref_entrance_node_summary">بصمات، اسماء مستعارة، البلدان و العناوين لأول نقطة اتصال</string> <string name="pref_entrance_node_dialog">أدخل نقاط الدخول</string> <string name="pref_use_whispercore">استخدم WhisperCore</string> - <string name="pref_use_whispercore_summary"></string> + <string name="pref_use_whispercore_summary">استخدم مكتبة NetFilter مغلقة المصدر و المقدمة من WhisperSystems (تحتاج لتنزيل WhisperCore)</string> <string name="pref_proxy_type_title">نوع البروكسي</string> - <string name="pref_proxy_type_summary"></string> - <string name="pref_proxy_type_dialog"></string> - <string name="pref_proxy_host_title"></string> - <string name="pref_proxy_host_summary"></string> - <string name="pref_proxy_host_dialog"></string> - <string name="pref_proxy_port_title"></string> - <string name="pref_proxy_port_summary"></string> - <string name="pref_proxy_port_dialog"></string> + <string name="pref_proxy_type_summary">البروتوكول ليستخدم مع خادم البروكسي: HTTP, HTTPS, Socks4, Socks5</string> + <string name="pref_proxy_type_dialog">أدخل نوع البروكسي</string> + <string name="pref_proxy_host_title">عنوان البروكسي</string> + <string name="pref_proxy_host_summary">عنوان خادم البروكسي</string> + <string name="pref_proxy_host_dialog">أدخل عنوان البروكسي</string> + <string name="pref_proxy_port_title">منفذ البروكسي</string> + <string name="pref_proxy_port_summary">منفذ خادم البروكسي</string> + <string name="pref_proxy_port_dialog">أدخل منفذ البروكسي</string> <string name="status">الحالة</string> - <string name="setting_up_full_transparent_proxying_"></string> - <string name="setting_up_app_based_transparent_proxying_"></string> - <string name="transparent_proxying_enabled"></string> - <string name="transproxy_enabled_for_tethering_"></string> - <string name="warning_error_starting_transparent_proxying_"></string> - <string name="transproxy_rules_cleared"></string> - <string name="couldn_t_start_tor_process_"></string> - <string name="privoxy_is_running_on_port_"></string> - <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="setting_up_full_transparent_proxying_">يتم اعداد البروكسي كامل الشفافية</string> + <string name="setting_up_app_based_transparent_proxying_">يتم اعداد البروكسي الشفاف الخاص بالبرامج</string> + <string name="transparent_proxying_enabled">البروكسي الشفاف مفعل</string> + <string name="transproxy_enabled_for_tethering_">البروكسي الشفاف جاهز للربط!</string> + <string name="warning_error_starting_transparent_proxying_">تحذير: حصل خطأ بتشغيل البروكسي الشفاف</string> + <string name="transproxy_rules_cleared">تم مسح قواعد البروكسي الشفاف</string> + <string name="couldn_t_start_tor_process_">تعذر تشغيل تور</string> + <string name="privoxy_is_running_on_port_">Privoxy يشتغل على منفذ:</string> + <string name="setting_up_port_based_transparent_proxying_">يتم اعداد البروكسي الشفاف حسب المنفذ</string> <string name="bridge_error">خطأ بجسر الاتصال</string> - <string name="bridge_requires_ip"></string> - <string name="send_email_for_bridges"></string> - <string name="error"></string> + <string name="bridge_requires_ip">لتستخدم ميزة جسور الاتصال، يجب عليك ادخال عنوان انترنت لجسر واحد عالأقل.</string> + <string name="send_email_for_bridges">أرسل رسالة بريد الكتروني إلى bridges(a)torproject.org مع عبارة get bridges بداخل الرسالة من حساب بريد جيميل gmail.</string> + <string name="error">خطأ</string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> - <string name="exit_nodes"></string> + <string name="exit_nodes">نقاط الخروج</string> <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> - <string name="enter_exit_nodes"></string> - <string name="exclude_nodes"></string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> - <string name="enter_exclude_nodes"></string> - <string name="strict_nodes"></string> + <string name="enter_exit_nodes">أدخل نقاط الخروج</string> + <string name="exclude_nodes">استثني النقاط</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">بصمات، الأسماء المستعارة، البلدان و العناوين ليتم استثنائها</string> + <string name="enter_exclude_nodes">أدخل النقاط المستثناه</string> + <string name="strict_nodes">النقاط المشددة</string> <string name="use_only_these_specified_nodes"></string> <string name="bridges"></string> <string name="use_bridges"></string> @@ -178,25 +178,25 @@ <string name="hidden_service_ports"></string> <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> - <string name="project_home"></string> - <string name="project_urls"></string> - <string name="the_tor_license"></string> - <string name="https_torproject_org"></string> - <string name="third_party_software"></string> - <string name="tor_version"></string> - <string name="libevent_version"></string> - <string name="privoxy_version"></string> - <string name="iptables_version"></string> - <string name="openssl_version"></string> - <string name="hidden_service_request"></string> - <string name="found_existing_tor_process"></string> - <string name="something_bad_happened"></string> - <string name="hidden_service_on"></string> - <string name="unable_to_read_hidden_service_name"></string> - <string name="unable_to_start_tor"></string> - <string name="pref_use_sys_iptables_title"></string> - <string name="pref_use_sys_iptables_summary"></string> - <string name="error_installing_binares"></string> - <string name="pref_use_persistent_notifications"></string> - <string name="pref_use_persistent_notifications_title"></string> + <string name="project_home">الموقع الرسمي للمشروع:</string> + <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="the_tor_license">رخصة استخدام تور</string> + <string name="https_torproject_org">https://torproject.org</string> + <string name="third_party_software">برامج من جهات أخرى:</string> + <string name="tor_version">Tor v0.2.3.10: https://www.torproject.orgب</string> + <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> + <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> + <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> + <string name="hidden_service_request">أحد البرامج يحاول تشغيل خدمة مخفية بمنفذ %S على شبكة تور. هذه الميزة آمنة فقط اذا كنت تثق بالبرنامج</string> + <string name="found_existing_tor_process">تم العثور على برنامج تور </string> + <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string> + <string name="hidden_service_on">تشغيل الخدمات المخفية</string> + <string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string> + <string name="unable_to_start_tor">غير قادر على تشغيل تور</string> + <string name="pref_use_sys_iptables_title">استخدم iptables التلقائي</string> + <string name="pref_use_sys_iptables_summary">استخدم مكونات iptables الموجودة ضمناً بالجهاز بدل النسخة المربوطة مع أوربوت</string> + <string name="error_installing_binares">لم يتم تثبيت أو تحديث مكونات تور</string> + <string name="pref_use_persistent_notifications">ضع الأيقونة في شريط التنبيهات عندما يكون أوربوت متصلاً</string> + <string name="pref_use_persistent_notifications_title">تفعيل التنبيهات دائماً</string> </resources>

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 08 Feb '12

08 Feb '12

commit 99d73d8e1c8aeca1115c44719d67488b0074a503 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 8 20:45:20 2012 +0000 Update translations for vidalia --- ar/vidalia_ar.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ar/vidalia_ar.po b/ar/vidalia_ar.po index 4ac3fc4..47abd9f 100644 --- a/ar/vidalia_ar.po +++ b/ar/vidalia_ar.po @@ -5,6 +5,7 @@ # <manmacdeath(a)gmail.com>, 2011. # <moazbaghdadi(a)gmail.com>, 2011. # mohammad Alhargan <malham1(a)gmail.com>, 2011. +# Mohammed Al-Doub <voulnet(a)gmail.com>, 2012. # OsamaK <osamak(a)gnu.org>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" @@ -12,8 +13,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: 2012-01-20 21:04+0000\n" -"Last-Translator: Ahmad LuvSy <donotplay(a)hotmail.ca>\n" +"PO-Revision-Date: 2012-02-08 20:27+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" @@ -2113,7 +2114,7 @@ msgstr "" msgctxt "MainWindow" msgid "Bootstrapping torrc from %1 to %2" -msgstr "" +msgstr "يتم تشغيل torrc من %1 إلى %2" msgctxt "MainWindow" msgid ""

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 08 Feb '12

08 Feb '12

commit 6a42b2129291dbd842d0970ef653f3c28c575fd0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 8 20:45:03 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 9ba1fc3..8b5a918 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -94,31 +94,31 @@ <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> <string name="wizard_title_msg">أوربوت يجلب لك شبكة تور للأندرويد! تور يساعدك للتغلب على حجب المحتوى، فحص الاتصال، و الرقابة و التجسس على الشبكات، و التي تهدد الخصوصية و العلاقات الشخصية و المعلومات السرية. سنقوم الآن بمساعدتك لضبط أوربوت و تور على جهازك.</string> <string name="wizard_warning_title">تحذير</string> - <string name="wizard_warning_msg"></string> - <string name="wizard_permissions_title"></string> - <string name="wizard_permissions_root_msg1"></string> - <string name="wizard_permissions_root_msg2"></string> - <string name="wizard_permissions_no_root_msg"></string> - <string name="wizard_tips_title"></string> - <string name="wizard_tips_gibberbot"></string> - <string name="gibberbot_apk_url"></string> + <string name="wizard_warning_msg">مجرد تنزيل أوربوت لن يعطيك الخصوصية. يجب عليك أيضاً اعداد أوربوت و جهازك و البرامج المستفيدة من تور.</string> + <string name="wizard_permissions_title">الصلاحيات</string> + <string name="wizard_permissions_root_msg1">يمكنك اعطاء أوربوت صلاحية المستخدم السوبر لتشغيل المميزات المتقدمة مثل البروكسي الشفاف.</string> + <string name="wizard_permissions_root_msg2">إذا كنت تريد أن تقوم بهذا فعليك التأكد من استخدام برامج معدة لتشتغل مع أوربوت.</string> + <string name="wizard_permissions_no_root_msg">لا يوجد روت أو صلاحيات خارقة على جهازك و لذلك لتستفيد من من تور عليك استخدام برامج صممت لتعمل مع أوربوت أو التي تدعم بروكسي HTTP أو SOCKS .</string> + <string name="wizard_tips_title">برامج معدة لتشتغل مع أوربوت</string> + <string name="wizard_tips_gibberbot">جيبربوت: محادثات آمنة باستخدام التشفير خارج السجل.</string> + <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (أندرويد 1.x فقط) - متصفح مصمّم للخصوصية لأوربوت </string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> - <string name="wizard_transproxy_title"></string> - <string name="wizard_transproxy_msg"></string> - <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_title">بروكسي شفاف</string> + <string name="wizard_transproxy_msg">هذه ستسمح للبرامج بالاتصال بشبكة تور تلقائياً دون اعداد مسبق.</string> + <string name="wizard_transproxy_hint">اختر هذا المربع اذا كنت لا تعلم عما نتحدث عنه هنا</string> <string name="wizard_transproxy_none">و لا شيء</string> - <string name="pref_transparent_tethering_title"></string> - <string name="pref_transparent_tethering_summary"></string> - <string name="button_grant_superuser"></string> + <string name="pref_transparent_tethering_title">الربط بتور</string> + <string name="pref_transparent_tethering_summary">اسمح بالبروكسي الشفاف للواي فاي و اليو اس بي (تحتاج لإعادة تشغيل الجهاز)</string> + <string name="button_grant_superuser">اطلب صلاحيات المستخدم الخارق</string> <string name="pref_select_apps">اختر البرامج</string> - <string name="pref_select_apps_summary"></string> - <string name="pref_node_configuration"></string> - <string name="pref_node_configuration_summary"></string> + <string name="pref_select_apps_summary">اختر البرامح التي تريد اتصالها بشبكة تور</string> + <string name="pref_node_configuration">اعدادات نقطة الاتصال</string> + <string name="pref_node_configuration_summary">هذه الاعدادات متقدمة و قد تقلل من خصوصيتك و اخفاء هويتك.</string> <string name="pref_entrance_node">نقاط الدخول</string> - <string name="pref_entrance_node_summary"></string> - <string name="pref_entrance_node_dialog"></string> - <string name="pref_use_whispercore"></string> + <string name="pref_entrance_node_summary">بصمات، اسماء مستعارة، البلدان و العناوين لأول نقطة اتصال</string> + <string name="pref_entrance_node_dialog">أدخل نقاط الدخول</string> + <string name="pref_use_whispercore">استخدم WhisperCore</string> <string name="pref_use_whispercore_summary"></string> <string name="pref_proxy_type_title">نوع البروكسي</string> <string name="pref_proxy_type_summary"></string>

1 0