May 2016 - tor-commits - lists.torproject.org

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 15 May '16

15 May '16

commit e21412f4fb79584e5fdfc03b198bdc943af4aefb Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 15 06:15:37 2016 +0000 Update translations for tor-launcher-progress --- fa/progress.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/progress.dtd b/fa/progress.dtd index 5efcd93..f7d9e02 100644 --- a/fa/progress.dtd +++ b/fa/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "وضعیت تور"> +<!ENTITY torprogress.dialog.title "وضعیت تٌر"> <!ENTITY torprogress.openSettings "تنظیمات‌را باز کنید"> <!ENTITY torprogress.heading "درحال اتصال به شبکه تُر"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "لطفا صبر کنید. در حال برقراری ارتباط با شبکه تٌر.&160; این پروسه ممکن است چند دقیقه به طول بینجامد.">

1 0

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 15 May '16

15 May '16

commit 6f56d5b2646524ff0a2af781e6e3f6e31dae9baa Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 15 05:46:49 2016 +0000 Update translations for tor-messenger-privproperties_completed --- fa/priv.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fa/priv.properties b/fa/priv.properties index 3265bab..5a8e389 100644 --- a/fa/priv.properties +++ b/fa/priv.properties @@ -1 +1,2 @@ -priv.account=تولید کلید خصوصی برای %S (%S) ... +priv.account=ساخت کلید خصوصی برای %S (%S) ... +priv.failed=ساخت کلید ناموفق: %S

1 0

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 15 May '16

15 May '16

commit d07987b7e51135e904b9e36b2c78f1779580a163 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 15 05:46:40 2016 +0000 Update translations for tor-messenger-ircproperties_completed --- fa/irc.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fa/irc.properties b/fa/irc.properties index 81c3b39..257e854 100644 --- a/fa/irc.properties +++ b/fa/irc.properties @@ -172,6 +172,9 @@ error.sendMessageFailed=یک خطا در زمان ارسال آخرین پیام # %1$S is the channel the user tried to join, %2$S is the channel # he was forwarded to. error.channelForward=شما نمی‌توانید با عنوان %1$S متصل شود و به صورت خودکار به %2$S تغییر کرده‌اید. +# %S is the mode that the user tried to set but was not recognized +# by the server as a valid mode. +error.unknownMode='%S' یک حالت معتبر کاربر روی این سرویس دهنده نیست. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 15 May '16

15 May '16

commit 064e979cf37b6c801c3d9516fe5f19d33a6f7b66 Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 15 05:46:37 2016 +0000 Update translations for tor-messenger-ircproperties --- fa/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/irc.properties b/fa/irc.properties index dfa586d..257e854 100644 --- a/fa/irc.properties +++ b/fa/irc.properties @@ -174,7 +174,7 @@ error.sendMessageFailed=یک خطا در زمان ارسال آخرین پیام error.channelForward=شما نمی‌توانید با عنوان %1$S متصل شود و به صورت خودکار به %2$S تغییر کرده‌اید. # %S is the mode that the user tried to set but was not recognized # by the server as a valid mode. -error.unknownMode='%S' is not a valid user mode on this server. +error.unknownMode='%S' یک حالت معتبر کاربر روی این سرویس دهنده نیست. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 15 May '16

15 May '16

commit 03e3c9e4c61278bc717deb546ffd83b8c8ad386c Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 15 05:46:02 2016 +0000 Update translations for tails-perl5lib_completed --- fa.po | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/fa.po b/fa.po index 44e852b..09966bf 100644 --- a/fa.po +++ b/fa.po @@ -3,22 +3,34 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# NoProfile, 2016 +# Sina Eghbal <s.eghbal(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-28 11:56+0100\n" -"PO-Revision-Date: 2013-12-30 04:50+0000\n" -"Last-Translator: Phoul <colin(a)torproject.org>\n" -"Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" +"POT-Creation-Date: 2016-04-24 16:36+0200\n" +"PO-Revision-Date: 2016-05-15 05:44+0000\n" +"Last-Translator: Sina Eghbal <s.eghbal(a)gmail.com>\n" +"Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../lib/Tails/RunningSystem.pm:139 +#: ../lib/Tails/RunningSystem.pm:159 +msgid "Error" +msgstr "خطا" + +#: ../lib/Tails/RunningSystem.pm:161 msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" msgstr "دستگاهى كه از آن تيلز اجرا مى‌شود يافت نشد. ممكن است از گزينه 'toram' استفاده كرديد؟" + +#: ../lib/Tails/RunningSystem.pm:192 +msgid "" +"The drive Tails is running from cannot be found. Maybe you used the `toram' " +"option?" +msgstr "درایوی که 'تیلز' از آن اجرا می شود یافت نشد. ممکن است شما از گزینه 'toram' استفاده کردید؟"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 15 May '16

15 May '16

commit b329e096070790d6004eb0d672a44ef871d9454a Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 15 05:45:59 2016 +0000 Update translations for tails-perl5lib --- fa.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fa.po b/fa.po index d5bb54d..09966bf 100644 --- a/fa.po +++ b/fa.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Gilberto, 2016 +# NoProfile, 2016 +# Sina Eghbal <s.eghbal(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-01-25 16:59+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Gilberto\n" +"POT-Creation-Date: 2016-04-24 16:36+0200\n" +"PO-Revision-Date: 2016-05-15 05:44+0000\n" +"Last-Translator: Sina Eghbal <s.eghbal(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,4 +33,4 @@ msgstr "دستگاهى كه از آن تيلز اجرا مى‌شود يافت msgid "" "The drive Tails is running from cannot be found. Maybe you used the `toram' " "option?" -msgstr "" +msgstr "درایوی که 'تیلز' از آن اجرا می شود یافت نشد. ممکن است شما از گزینه 'toram' استفاده کردید؟"

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 15 May '16

15 May '16

commit dc2621eab3dee8c6de2df91d59114ad94a5928bd Author: Translation commit bot <translation(a)torproject.org> Date: Sun May 15 05:45:52 2016 +0000 Update translations for torbutton-torbuttonproperties --- fa/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/torbutton.properties b/fa/torbutton.properties index 195b17b..a20daff 100644 --- a/fa/torbutton.properties +++ b/fa/torbutton.properties @@ -76,4 +76,4 @@ profileProblemTitle=%S مشکل پروفایل profileReadOnly=شما نمی توانید اجرا %S از یک فایل سیستم فقط خواندنی. لطفا کپی کنید %S به محل دیگری قبل از تلاش برای استفاده از آن. profileReadOnlyMac=شما نمی توانید اجرا %S از یک فایل سیستم فقط خواندنی. لطفا کپی کنید %S به دسکتاپ خودتان یا پوشه برنامه قبل از تلاش برای استفاده از آن. profileAccessDenied=٪ S اجازه دسترسی به مشخصات ندارد. لطفا مجوزهای سیستم فایل خود را تنظیم و دوباره سعی کنید. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=مهاجرت ناموفق از پروفایل %S.\nتنظیمات جدید استفاده خواهد شد.

1 0

[nyx/master] Added comments and indented code
by atagar＠torproject.org 15 May '16

15 May '16

commit 8634e3e23b1cfe334c88abaea4195d38b0bee5d3 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Mon May 9 00:13:03 2016 +0400 Added comments and indented code --- nyx/panel/log.py | 4 +++ nyx/popups.py | 85 ++++++++++++++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 39 deletions(-) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index b78314e..f2183a7 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -143,6 +143,10 @@ class LogPanel(nyx.panel.DaemonPanel): self.redraw(True) def new_show_event_selection_prompt(self): + """ + Prompts the user to select the events being listened for. + TODO: Replace show_event_selection_prompt() with this method. + """ event_types = nyx.popups.new_select_event_types() if event_types and event_types != self._event_types: diff --git a/nyx/popups.py b/nyx/popups.py index f4be35d..559f006 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -418,7 +418,21 @@ def select_event_types(): def new_select_event_types(): + """ + Presents a chart of event types Tor supports. The user can select a set of + events. + + TODO: Replace select_event_types() method with this method. + + :returns: **list** of event types the user has selected or **None** if dialog + is canceled + """ + events = nyx.tor_controller().get_info('events/names', None) + + if not events: + return + events = events.split() selection = 0 selected_events = [] @@ -426,50 +440,43 @@ def new_select_event_types(): subwindow.box() subwindow.addstr(0, 0, 'Event Types:', HIGHLIGHT) - events = nyx.tor_controller().get_info('events/names', None) - - if events: - events = events.split() - tor_events = [events[i:i + 3] for i in xrange(0, len(events), 3)] + tor_events = [events[i:i + 3] for i in xrange(0, len(events), 3)] - for i, line in enumerate(tor_events): - for j, in_line in enumerate(line): - x = subwindow.addstr(j * 30 + 1, i + 1, '[X]' if (i * 3 + j) in selected_events else '[]') - x = subwindow.addstr(x, i + 1, in_line, HIGHLIGHT if selection == (i * 3 + j) else NORMAL) + for i, line in enumerate(tor_events): + for j, in_line in enumerate(line): + x = subwindow.addstr(j * 30 + 1, i + 1, '[X]' if (i * 3 + j) in selected_events else '[ ]') + x = subwindow.addstr(x, i + 1, in_line, HIGHLIGHT if selection == (i * 3 + j) else NORMAL) - x = 30 - for i, line in enumerate(['Ok', 'Cancel']): - x = subwindow.addstr(x, len(tor_events) + 2, '[') - x = subwindow.addstr(x, len(tor_events) + 2, line, HIGHLIGHT if selection == (len(events) + i) else NORMAL) - x = subwindow.addstr(x, len(tor_events) + 2, ']') + x = 30 + for i, line in enumerate(['Ok', 'Cancel']): + x = subwindow.addstr(x, len(tor_events) + 2, '[') + x = subwindow.addstr(x, len(tor_events) + 2, line, HIGHLIGHT if selection == (len(events) + i) else NORMAL) + x = subwindow.addstr(x, len(tor_events) + 2, ']') with nyx.curses.CURSES_LOCK: - events = nyx.tor_controller().get_info('events/names', None) - if events: - events = events.split() - while True: - nyx.curses.draw(_render, top = _top(), width = 80, height = 16) - key = nyx.curses.key_input() - - if key.match('up'): - selection = max(0, selection - 3) - elif key.match('down'): - selection = min(len(events) + 1, selection + 3) - elif key.match('left'): - selection = max(0, selection - 1) - elif key.match('right'): - selection = min(len(events) + 1, selection + 1) - elif key.is_selection(): - if selection in selected_events: - selected_events.remove(selection) - elif selection == len(events): - return set([events[i] for i in selected_events]) - elif selection == (len(events) + 1): - return None - else: - selected_events.append(selection) - elif key.match('esc'): + while True: + nyx.curses.draw(_render, top = _top(), width = 80, height = 16) + key = nyx.curses.key_input() + + if key.match('up'): + selection = max(0, selection - 3) + elif key.match('down'): + selection = min(len(events) + 1, selection + 3) + elif key.match('left'): + selection = max(0, selection - 1) + elif key.match('right'): + selection = min(len(events) + 1, selection + 1) + elif key.is_selection(): + if selection in selected_events: + selected_events.remove(selection) + elif selection == len(events): + return set([events[i] for i in selected_events]) + elif selection == (len(events) + 1): return None + else: + selected_events.append(selection) + elif key.match('esc'): + return None def confirm_save_torrc(torrc):

1 0

[nyx/master] Added checkboxes for selected events
by atagar＠torproject.org 15 May '16

15 May '16

commit 25df46911d2ac5d09cc9d24feece38828a2ca48c Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sat May 7 01:43:03 2016 +0400 Added checkboxes for selected events --- nyx/popups.py | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/nyx/popups.py b/nyx/popups.py index f0d4050..a146d47 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -418,17 +418,49 @@ def select_event_types(): def new_select_event_types(): + + selection = 0 + selected_events = [] + def _render(subwindow): subwindow.box() subwindow.addstr(0, 0, 'Event Types:', HIGHLIGHT) events = nyx.tor_controller().get_info('events/names', None) - for i, line in enumerate(events.split()): - subwindow.addstr(1, i + 1, line) + + if events: + events = events.split() + events = [events[i:i + 3] for i in xrange(0, len(events), 3)] + + for i, line in enumerate(events): + for j, in_line in enumerate(line): + x = subwindow.addstr(j * 30 + 1, i + 1, '[X]' if (i * 3 + j) in selected_events else '[]') + x = subwindow.addstr(x, i + 1, in_line, HIGHLIGHT if selection == (i * 3 + j) else NORMAL) with nyx.curses.CURSES_LOCK: - nyx.curses.draw(_render, top = _top(), width = 80, height = 16) - return None + events = nyx.tor_controller().get_info('events/names', None) + if events: + events = events.split() + while True: + nyx.curses.draw(_render, top = _top(), width = 80, height = 16) + key = nyx.curses.key_input() + + if key.match('up'): + selection = max(0, selection - 3) + elif key.match('down'): + selection = min(len(events) - 1, selection + 3) + elif key.match('left'): + selection = max(0, selection - 1) + elif key.match('right'): + selection = min(len(events) - 1, selection + 1) + elif key.is_selection(): + if selection in selected_events: + selected_events.remove(selection) + else: + selected_events.append(selection) + elif key.match('esc'): + return None + def confirm_save_torrc(torrc): """

1 0

[nyx/master] Added Ok and Cancel for selecting events
by atagar＠torproject.org 15 May '16

15 May '16

commit aa0dfe24e0a60832940a02f0084f7eb340fd8ede Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sun May 8 01:32:54 2016 +0400 Added Ok and Cancel for selecting events --- nyx/popups.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/nyx/popups.py b/nyx/popups.py index a146d47..f4be35d 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -430,13 +430,19 @@ def new_select_event_types(): if events: events = events.split() - events = [events[i:i + 3] for i in xrange(0, len(events), 3)] + tor_events = [events[i:i + 3] for i in xrange(0, len(events), 3)] - for i, line in enumerate(events): + for i, line in enumerate(tor_events): for j, in_line in enumerate(line): x = subwindow.addstr(j * 30 + 1, i + 1, '[X]' if (i * 3 + j) in selected_events else '[]') x = subwindow.addstr(x, i + 1, in_line, HIGHLIGHT if selection == (i * 3 + j) else NORMAL) + x = 30 + for i, line in enumerate(['Ok', 'Cancel']): + x = subwindow.addstr(x, len(tor_events) + 2, '[') + x = subwindow.addstr(x, len(tor_events) + 2, line, HIGHLIGHT if selection == (len(events) + i) else NORMAL) + x = subwindow.addstr(x, len(tor_events) + 2, ']') + with nyx.curses.CURSES_LOCK: events = nyx.tor_controller().get_info('events/names', None) if events: @@ -448,14 +454,18 @@ def new_select_event_types(): if key.match('up'): selection = max(0, selection - 3) elif key.match('down'): - selection = min(len(events) - 1, selection + 3) + selection = min(len(events) + 1, selection + 3) elif key.match('left'): selection = max(0, selection - 1) elif key.match('right'): - selection = min(len(events) - 1, selection + 1) + selection = min(len(events) + 1, selection + 1) elif key.is_selection(): if selection in selected_events: selected_events.remove(selection) + elif selection == len(events): + return set([events[i] for i in selected_events]) + elif selection == (len(events) + 1): + return None else: selected_events.append(selection) elif key.match('esc'):

1 0