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

[nyx/master] Test _draw_right_column()
by atagar＠torproject.org 10 Jul '16

10 Jul '16

commit 681e5f8e4c1d514d656fada12ce47af2ac72fd60 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 10 10:36:35 2016 -0700 Test _draw_right_column() --- nyx/panel/connection.py | 43 ++++++++++++++++--------------- test/panel/connection.py | 67 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 68 insertions(+), 42 deletions(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index b5a3297..c189362 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -457,7 +457,7 @@ class ConnectionPanel(nyx.panel.DaemonPanel): self._draw_address_column(subwindow, x, y, line, attr) self._draw_line_details(subwindow, 57, y, line, width - 57 - 20, attr) - self._draw_right_column(subwindow, width - 18, y, line, current_time, attr) + _draw_right_column(subwindow, width - 18, y, line, current_time, attr) def _draw_address_column(self, subwindow, x, y, line, attr): src = tor_controller().get_info('address', line.connection.local_address) @@ -506,26 +506,6 @@ class ConnectionPanel(nyx.panel.DaemonPanel): else: return - def _draw_right_column(self, subwindow, x, y, line, current_time, attr): - if line.line_type == LineType.CIRCUIT: - circ_path = [fp for fp, _ in line.circuit.path] - circ_index = circ_path.index(line.fingerprint) - - if circ_index == len(circ_path) - 1: - placement_type = 'Exit' if line.circuit.status == 'BUILT' else 'Extending' - elif circ_index == 0: - placement_type = 'Guard' - else: - placement_type = 'Middle' - - subwindow.addstr(x + 4, y, '%i / %s' % (circ_index + 1, placement_type), *attr) - else: - x = subwindow.addstr(x, y, '+' if line.connection.is_legacy else ' ', *attr) - x = subwindow.addstr(x, y, '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1), *attr) - x = subwindow.addstr(x, y, ' (', *attr) - x = subwindow.addstr(x, y, line.entry.get_type().upper(), BOLD, *attr) - x = subwindow.addstr(x, y, ')', *attr) - def _update(self): """ Fetches the newest resolved connections. @@ -654,3 +634,24 @@ def _draw_details(subwindow, selected): break subwindow.box(0, 0, subwindow.width, DETAILS_HEIGHT + 2) + + +def _draw_right_column(subwindow, x, y, line, current_time, attr): + if line.line_type == LineType.CIRCUIT: + circ_path = [fp for fp, _ in line.circuit.path] + circ_index = circ_path.index(line.fingerprint) + + if circ_index == len(circ_path) - 1: + placement_type = 'Exit' if line.circuit.status == 'BUILT' else 'Extending' + elif circ_index == 0: + placement_type = 'Guard' + else: + placement_type = 'Middle' + + subwindow.addstr(x + 4, y, '%i / %s' % (circ_index + 1, placement_type), *attr) + else: + x = subwindow.addstr(x, y, '+' if line.connection.is_legacy else ' ', *attr) + x = subwindow.addstr(x, y, '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1), *attr) + x = subwindow.addstr(x, y, ' (', *attr) + x = subwindow.addstr(x, y, line.entry.get_type().upper(), BOLD, *attr) + x = subwindow.addstr(x, y, ')', *attr) diff --git a/test/panel/connection.py b/test/panel/connection.py index 31f00f3..d7f9d1c 100644 --- a/test/panel/connection.py +++ b/test/panel/connection.py @@ -10,11 +10,14 @@ import stem.version import nyx.panel.connection import test -from stem.util import connection +from nyx.tracker import Connection from nyx.panel.connection import Category, LineType, Line, Entry from test import require_curses from mock import Mock, patch +TIMESTAMP = 1468170303.7 +CONNECTION = Connection(TIMESTAMP, False, '127.0.0.1', 3531, '75.119.206.243', 22, 'tcp', False) + DETAILS_BUILDING_CIRCUIT = """ +------------------------------------------------------------------------------+ | Building Circuit... | @@ -92,44 +95,50 @@ class MockEntry(Entry): return self._is_private +class MockCircuit(object): + def __init__(self, status = 'BUILT', path = None): + self.status = status + + if path: + self.path = path + else: + self.path = [ + ('1F43EE37A0670301AD9CB555D94AFEC2C89FDE86', 'Unnamed'), + ('B6D83EC2D9E18B0A7A33428F8CFA9C536769E209', 'moria1'), + ('E0BD57A11F00041A9789577C53A1B784473669E4', 'caerSidi'), + ] + + +def line(entry = MockEntry(), line_type = LineType.CONNECTION, connection = CONNECTION, circ = MockCircuit(), fingerprint = '1F43EE37A0670301AD9CB555D94AFEC2C89FDE86', nickname = 'Unnamed', locale = 'de'): + return Line(entry, line_type, connection, circ, fingerprint, nickname, locale) + + class TestConnectionPanel(unittest.TestCase): @require_curses def test_draw_title(self): self.assertEqual('Connection Details:', test.render(nyx.panel.connection._draw_title, [], True).content) self.assertEqual('Connections:', test.render(nyx.panel.connection._draw_title, [], False).content) - entries = [ - MockEntry(entry_type = Category.INBOUND), - MockEntry(entry_type = Category.INBOUND), - MockEntry(entry_type = Category.OUTBOUND), - MockEntry(entry_type = Category.INBOUND), - MockEntry(entry_type = Category.CONTROL), - ] - + entries = [MockEntry(entry_type = category) for category in (Category.INBOUND, Category.INBOUND, Category.OUTBOUND, Category.INBOUND, Category.CONTROL)] self.assertEqual('Connections (3 inbound, 1 outbound, 1 control):', test.render(nyx.panel.connection._draw_title, entries, False).content) @require_curses def test_draw_details_incomplete_circuit(self): - circ = Mock() - circ.status = 'EXTENDING' - - selected = Line(MockEntry(), LineType.CIRCUIT_HEADER, None, circ, None, None, None) + selected = line(line_type = LineType.CIRCUIT_HEADER, circ = MockCircuit(status = 'EXTENDING')) self.assertEqual(DETAILS_BUILDING_CIRCUIT, test.render(nyx.panel.connection._draw_details, selected).content) @require_curses @patch('nyx.tracker.get_consensus_tracker') def test_draw_details_no_consensus_data(self, consensus_tracker_mock): consensus_tracker_mock().get_relay_fingerprints.return_value = None - - selected = Line(MockEntry(), LineType.CONNECTION, connection.Connection('127.0.0.1', 3531, '75.119.206.243', 22, 'tcp', False), None, None, None, 'de') - self.assertEqual(DETAILS_NO_CONSENSUS_DATA, test.render(nyx.panel.connection._draw_details, selected).content) + self.assertEqual(DETAILS_NO_CONSENSUS_DATA, test.render(nyx.panel.connection._draw_details, line()).content) @require_curses @patch('nyx.tracker.get_consensus_tracker') def test_draw_details_when_private(self, consensus_tracker_mock): consensus_tracker_mock().get_relay_fingerprints.return_value = None - selected = Line(MockEntry(is_private = True), LineType.CONNECTION, connection.Connection('127.0.0.1', 3531, '75.119.206.243', 22, 'tcp', False), None, None, None, 'de') + selected = line(entry = MockEntry(is_private = True)) self.assertEqual(DETAILS_WHEN_PRIVATE, test.render(nyx.panel.connection._draw_details, selected).content) @require_curses @@ -157,8 +166,7 @@ class TestConnectionPanel(unittest.TestCase): 22: 'B6D83EC2D9E18B0A7A33428F8CFA9C536769E209' } - selected = Line(MockEntry(), LineType.CONNECTION, connection.Connection('127.0.0.1', 3531, '75.119.206.243', 22, 'tcp', False), None, None, None, 'de') - self.assertEqual(DETAILS_FOR_RELAY, test.render(nyx.panel.connection._draw_details, selected).content) + self.assertEqual(DETAILS_FOR_RELAY, test.render(nyx.panel.connection._draw_details, line()).content) @require_curses @patch('nyx.tracker.get_consensus_tracker') @@ -169,5 +177,22 @@ class TestConnectionPanel(unittest.TestCase): 443: 'E0BD57A11F00041A9789577C53A1B784473669E4', } - selected = Line(MockEntry(), LineType.CONNECTION, connection.Connection('127.0.0.1', 3531, '75.119.206.243', 22, 'tcp', False), None, None, None, 'de') - self.assertEqual(DETAILS_FOR_MULTIPLE_MATCHES, test.render(nyx.panel.connection._draw_details, selected).content) + self.assertEqual(DETAILS_FOR_MULTIPLE_MATCHES, test.render(nyx.panel.connection._draw_details, line()).content) + + @require_curses + def test_draw_right_column(self): + self.assertEqual(' 1.0m (INBOUND)', test.render(nyx.panel.connection._draw_right_column, 0, 0, line(), TIMESTAMP + 62, ()).content) + + legacy_connection = Connection(TIMESTAMP, True, '127.0.0.1', 3531, '75.119.206.243', 22, 'tcp', False) + test_line = line(entry = MockEntry(entry_type = Category.CONTROL), connection = legacy_connection) + self.assertEqual('+ 1.1m (CONTROL)', test.render(nyx.panel.connection._draw_right_column, 0, 0, test_line, TIMESTAMP + 68, ()).content) + + test_data = { + '1F43EE37A0670301AD9CB555D94AFEC2C89FDE86': ' 1 / Guard', + 'B6D83EC2D9E18B0A7A33428F8CFA9C536769E209': ' 2 / Middle', + 'E0BD57A11F00041A9789577C53A1B784473669E4': ' 3 / Exit', + } + + for fp, expected in test_data.items(): + test_line = line(line_type = LineType.CIRCUIT, fingerprint = fp) + self.assertEqual(expected, test.render(nyx.panel.connection._draw_right_column, 0, 0, test_line, TIMESTAMP + 62, ()).content)

1 0

[nyx/master] Migrate and test connection panel
by atagar＠torproject.org 10 Jul '16

10 Jul '16

commit b2bee4bfef6809b8034a82d572c23684225e5447 Merge: 287e259 325763a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 10 12:50:05 2016 -0700 Migrate and test connection panel nyx/panel/__init__.py | 2 +- nyx/panel/connection.py | 348 ++++++++++++++++++++++++----------------------- test/panel/__init__.py | 1 + test/panel/connection.py | 263 +++++++++++++++++++++++++++++++++++ 4 files changed, 442 insertions(+), 172 deletions(-)

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 08 Jul '16

08 Jul '16

commit 1242d96d8ee95cf7e8700c8dd79a02895d7db809 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 8 20:45:39 2016 +0000 Update translations for liveusb-creator_completed --- sk_SK/sk_SK.po | 610 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 610 insertions(+) diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po new file mode 100644 index 0000000..59f72a9 --- /dev/null +++ b/sk_SK/sk_SK.po @@ -0,0 +1,610 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Dasa M <littlearchr8(a)gmail.com>, 2016 +# Marián Mižik <marian(a)mizik.sk>, 2015 +# once, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-11-02 21:23+0100\n" +"PO-Revision-Date: 2016-07-08 20:21+0000\n" +"Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" +"Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sk_SK\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: ../liveusb/gui.py:451 +msgid "\"Clone & Install\"" +msgstr "\"Klonovať & inštalovať\"" + +#: ../liveusb/gui.py:453 +msgid "\"Install from ISO\"" +msgstr "\"Inštalovať z ISO\"" + +#: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153 +#, python-format +msgid "%(distribution)s Installer" +msgstr "%(distribution)s Inštalátor" + +#: ../liveusb/gui.py:804 +#, python-format +msgid "%(filename)s selected" +msgstr "%(filename)s označených" + +#: ../liveusb/gui.py:424 +#, python-format +msgid "%(size)s %(label)s" +msgstr "%(size)s %(label)s" + +#: ../liveusb/gui.py:430 +#, python-format +msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" +msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" + +#: ../liveusb/creator.py:1097 +#, python-format +msgid "%s already bootable" +msgstr "%s je bootovateľné" + +#: ../liveusb/launcher_ui.py:160 +msgid "" +"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" +"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" +"p, li { white-space: pre-wrap; }\n" +"</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a>.</p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n\np, li { white-space: pre-wrap; }\n\n</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Potrebujete pomoc? Prečítajte si <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">dokumentácia</span></a>.</p></body></html>" + +#: ../liveusb/launcher_ui.py:155 +msgid "" +"<ul>\n" +"<li>Install Tails on another USB stick by copying the Tails system that you are currently using..</li>\n" +"\n" +"<li>The USB stick that you install on is formatted and all data is lost.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Pre inštaláciu Tails na iný USB kľúč skopírujte systém Tail, ktorý práve teraz používate</li>\n\n<li>USB kľúč, na ktorý inštalujete bude sformátovaný a všetky dáta budú stratené.</li>\n\n<li>Šifrovaný oddiel na USB kľúči, ktorý teraz používate, nebude skopírovaný.</li>\n\n</ul>" + +#: ../liveusb/launcher_ui.py:157 +msgid "" +"<ul>\n" +"<li>Upgrade another Tails USB stick to the same version of Tails that you are currently using.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Aktualizovať iný Tails na USB kľúči na na verziu, ktorú teraz používate.</li>\n\n<li>Šifrovaný stály oddiel na USB kľúči s obsahom Tails ostáva aj po aktualizácii nezmenený.</li>\n\n<li>Šifrovaný stály oddiel na USB kľúči s obsahom Tails nebude po aktualizácii skopírovaný.</li>\n\n\n</ul>" + +#: ../liveusb/launcher_ui.py:159 +msgid "" +"<ul>\n" +"<li>Upgrade another Tails USB stick to the version of an ISO image.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Aktualizovať iný USB kľúč so systémom Tails na verziu ISO obrazu.</li>\n\n<li>Šifrovaný stály oddiel na USB kľúči s obsahom Tails ostáva aj po aktualizácii nezmenený.</li>\n\n<li>Šifrovaný stály oddiel na USB kľúči s obsahom Tails nebude po aktualizácii skopírovaný.</li>\n\n</ul>" + +#: ../liveusb/dialog.py:161 +msgid "Alt+B" +msgstr "Alt+B" + +#: ../liveusb/dialog.py:160 +msgid "Browse" +msgstr "Prezerať" + +#: ../liveusb/dialog.py:167 +msgid "" +"By allocating extra space on your USB stick for a persistent overlay, you " +"will be able to store data and make permanent modifications to your live " +"operating system. Without it, you will not be able to save data that will " +"persist after a reboot." +msgstr "Vyčlenením špeciálneho miesta pre stálu pamäť na Vašom USB kľúči budete schopný ukladať dáta a robiť trvalé zmeny v operačnom systéme. Bez toho nebudete mať možnosť ukladať dáta, ktoré ostanú aj po opätovnom spustení systému." + +#: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459 +#, python-format +msgid "Calculating the SHA1 of %s" +msgstr "Prebieha výpočet SHA1 pre %s" + +#: ../liveusb/creator.py:1407 +msgid "Cannot find" +msgstr "Nie je možné nájsť" + +#: ../liveusb/creator.py:560 +#, python-format +msgid "Cannot find device %s" +msgstr "Nie je možné nájsť zariadenie %s" + +#: ../liveusb/creator.py:417 +#, python-format +msgid "Creating %sMB persistent overlay" +msgstr "Vytvára sa %sMB trvalej pamäte" + +#: ../liveusb/gui.py:582 +msgid "" +"Device is not yet mounted, so we cannot determine the amount of free space." +msgstr "Zariadenie ešte nebolo pripojené, takže nie je možné určiť veľkosť voľného miesta." + +#: ../liveusb/dialog.py:164 +#, python-format +msgid "Download %(distribution)s" +msgstr "Sťahujem %(distribution)s" + +#: ../liveusb/gui.py:778 +msgid "Download complete!" +msgstr "Preberanie kompletné!" + +#: ../liveusb/gui.py:782 +msgid "Download failed: " +msgstr "Preberanie zlyhalo:" + +#: ../liveusb/gui.py:89 +#, python-format +msgid "Downloading %s..." +msgstr "Preberanie %s..." + +#: ../liveusb/creator.py:1192 +msgid "Drive is a loopback, skipping MBR reset" +msgstr "Zariadenie je loopback, preskakujem MBR reset" + +#: ../liveusb/creator.py:837 +#, python-format +msgid "Entering unmount_device for '%(device)s'" +msgstr "Spúšťa sa unmount_device pre '%(device)s'" + +#: ../liveusb/creator.py:1272 +msgid "Error probing device" +msgstr "Chyba pri skúšaní zariadenia" + +#: ../liveusb/gui.py:213 +msgid "" +"Error: Cannot set the label or obtain the UUID of your device. Unable to " +"continue." +msgstr "Chyba: nie je možné nastaviť menovku alebo získať UUID Vašeho zariadenia. Nie je možné pokračovať." + +#: ../liveusb/creator.py:393 +msgid "" +"Error: The SHA1 of your Live CD is invalid. You can run this program with " +"the --noverify argument to bypass this verification check." +msgstr "Chyba: SHA1 Vašeho Live CD je neplatné. Možete spustiť tento program s parametrom --noverify, aby ste túto kontrolu obišli." + +#: ../liveusb/creator.py:155 +msgid "Extracting live image to the target device..." +msgstr "Rozbaľujem live obraz do cieľového zariadenia..." + +#: ../liveusb/creator.py:1140 +#, python-format +msgid "Formatting %(device)s as FAT32" +msgstr "Formátovanie %(device)s ako FAT32" + +#: ../liveusb/creator.py:150 +msgid "ISO MD5 checksum passed" +msgstr "ISO MD5 checksum prešiel" + +#: ../liveusb/creator.py:148 +msgid "ISO MD5 checksum verification failed" +msgstr "Verifikácia ISO MD5 checksum zlyhala" + +#: ../liveusb/dialog.py:163 +msgid "" +"If you do not select an existing Live ISO, the selected release will be " +"downloaded for you." +msgstr "Ak nezvolíte existujúce Live ISO, zvolená verzia bude stiahnutá automaticky." + +#: ../liveusb/launcher_ui.py:154 +msgid "" +"Install\n" +"by cloning" +msgstr "Inštalácia\nklonovaním" + +#: ../liveusb/dialog.py:172 +msgid "Install Tails" +msgstr "Inštalácia Tails" + +#: ../liveusb/gui.py:645 +msgid "Installation complete!" +msgstr "Inštalácia kompletná!" + +#: ../liveusb/gui.py:265 +#, python-format +msgid "Installation complete! (%s)" +msgstr "Inštalácia kompletná! (%s)" + +#: ../liveusb/gui.py:646 +msgid "Installation was completed. Press OK to close this program." +msgstr "Inštalácia prebehla úspešne. Pre zavretie programu stlačte OK." + +#: ../liveusb/creator.py:990 ../liveusb/creator.py:1313 +msgid "Installing bootloader..." +msgstr "Inštalujem bootloader..." + +#: ../liveusb/gui.py:454 +#, python-format +msgid "" +"It is impossible to upgrade the device %(pretty_name)s because it was not " +"created using Tails Installer. You should instead use %(action)s to upgrade " +"Tails on this device." +msgstr "Nie je možné aktualizovať zariadenie %(pretty_name)s, pretože nebolo vytvorené použitím inštalátora Tails. Použite %(action)s pre aktualizáciu Tials na tomto zariadení." + +#: ../liveusb/gui.py:270 +msgid "LiveUSB creation failed!" +msgstr "Vytvorenie Live USB zlyhalo!" + +#: ../liveusb/creator.py:1408 +msgid "" +"Make sure to extract the entire liveusb-creator zip file before running this" +" program." +msgstr "Uistite sa, že ste rozbalili celý súbor liveusb-creator zip predtým, než spustíte tento program." + +#: ../liveusb/creator.py:1284 +msgid "" +"Make sure your USB key is plugged in and formatted with the FAT filesystem" +msgstr "Uistite sa, že Váš USB kľúč je pripojený a naformátovaný na systém FAT." + +#: ../liveusb/creator.py:859 +#, python-format +msgid "Mount %s exists after unmounting" +msgstr "Pripojenie %s existuje po odpojení" + +#: ../liveusb/gui.py:588 +#, python-format +msgid "No free space on device %(device)s" +msgstr "Na zariadení %(device)s nie je voľné miesto" + +#: ../liveusb/creator.py:826 +msgid "No mount points found" +msgstr "Neboli nájdené žiadne body pripojenia" + +#: ../liveusb/creator.py:410 +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "Na zariadení nie je dostatok voľného miesta.\n%dMB ISO + %dMB pamäť > %dMB voľné miesto" + +#: ../liveusb/gui.py:569 +msgid "Partition is FAT16; Restricting overlay size to 2G" +msgstr "Oddiel je formátovaný na FAT16; veľkosť pamäte je obmedzená na 2 G" + +#: ../liveusb/gui.py:565 +msgid "Partition is FAT32; Restricting overlay size to 4G" +msgstr "Oddiel je formátovaný na FAT32; veľkosť pamäte je obmedzená na 4 G" + +#: ../liveusb/creator.py:236 ../liveusb/creator.py:866 +#, python-format +msgid "Partitioning device %(device)s" +msgstr "Vytváranie oddielov na zariadení %(device)s" + +#: ../liveusb/gui.py:636 +msgid "Persistent Storage" +msgstr "Trvalé úložisko" + +#: ../liveusb/dialog.py:168 +msgid "Persistent Storage (0 MB)" +msgstr "Trvalé úložisko (0 MB)" + +#: ../liveusb/gui.py:698 ../liveusb/gui.py:727 +msgid "Please confirm your device selection" +msgstr "Prosím potvrďte výber Vašeho zariadenia" + +#: ../liveusb/gui.py:481 +msgid "Refreshing releases..." +msgstr "Obnovovanie verzií..." + +#: ../liveusb/gui.py:486 +msgid "Releases updated!" +msgstr "Verzie obnovené!" + +#: ../liveusb/creator.py:997 ../liveusb/creator.py:1331 +#, python-format +msgid "Removing %(file)s" +msgstr "Odstraňovanie %(file)s" + +#: ../liveusb/creator.py:492 +msgid "Removing existing Live OS" +msgstr "Odstraňovanie existujúceho Live OS" + +#: ../liveusb/creator.py:1186 +#, python-format +msgid "Resetting Master Boot Record of %s" +msgstr "Resetujem hlavný bootovací záznam %s" + +#: ../liveusb/gui.py:789 +msgid "Select Live ISO" +msgstr "Vyberte Live ISO" + +#: ../liveusb/creator.py:192 +msgid "Setting up OLPC boot file..." +msgstr "Nastavujem štartovací súbor OLPC..." + +#: ../liveusb/creator.py:742 +#, python-format +msgid "" +"Some partitions of the target device %(device)s are mounted. They will be " +"unmounted before starting the installation process." +msgstr "Niektoré oddiely, pripojené na cieľovom zariadení %(device)s sú pripojené. Pred začatím inštalačného procesu budú odpojené." + +#: ../liveusb/creator.py:141 +msgid "" +"Source type does not support verification of ISO MD5 checksum, skipping" +msgstr "Typ zdrojového súboru nepodporuje verifikáciu ISO MD5 checksum, preskakujem" + +#: ../liveusb/creator.py:1220 +msgid "Synchronizing data on disk..." +msgstr "Synchronizujem dáta na disku..." + +#: ../liveusb/dialog.py:166 +msgid "Target Device" +msgstr "Cieľové zariadenie" + +#: ../liveusb/gui.py:438 +#, python-format +msgid "" +"The device \"%(pretty_name)s\" is too small to install Tails (at least " +"%(size)s GB is required)." +msgstr "Zariadenie \"%(pretty_name)s\" je príliš malé na inštaláciu Tails (je vyžadovaných minimálne %(size)s GB)" + +#: ../liveusb/gui.py:792 +msgid "" +"The selected file is unreadable. Please fix its permissions or select " +"another file." +msgstr "Vybraný súbor je nečitaťeľný. Prosím upravte oprávnenia alebo vyberte iný súbor." + +#: ../liveusb/creator.py:354 +#, python-format +msgid "" +"There was a problem executing the following command: `%(command)s`.\n" +"A more detailed error log has been written to '%(filename)s'." +msgstr "Pri vykonávaní nasledovného príkazu: `%(command)s` nastala chyba.\nPodrobnosti o tejto chybe boli zapísané do súboru '%(filename)s'." + +#: ../liveusb/dialog.py:158 +msgid "" +"This button allows you to browse for an existing Live system ISO that you " +"have previously downloaded. If you do not select one, a release will be " +"downloaded for you automatically." +msgstr "Toto tlačítko Vám umožní nájsť existujúci Live ISO, ktorý ste stiahli. Ak žiaden nevyberiete, bude stiahnutý automaticky." + +#: ../liveusb/dialog.py:171 +msgid "" +"This button will begin the LiveUSB creation process. This entails " +"optionally downloading a release (if an existing one wasn't selected), " +"extracting the ISO to the USB device, creating the persistent overlay, and " +"installing the bootloader." +msgstr "Toto tlačítko spustí proces vytvárania Live USB. To znamená prípadne stiahnutie (ak žiadna verzia nebola vybraná) a rozbalenie ISO obrazu na USB kľúč, vytvorenie trvalej pamäte a inštalácia zavádzača." + +#: ../liveusb/dialog.py:165 +msgid "" +"This is the USB stick that you want to install your Live system on. This " +"device must be formatted with the FAT filesystem." +msgstr "Toto je USB kľúč, na ktorý chcete inštalovať Váš Live systém. Toto zariadenie musí byť naformátované systémom FAT." + +#: ../liveusb/dialog.py:170 +msgid "" +"This is the progress bar that will indicate how far along in the LiveUSB " +"creation process you are" +msgstr "Toto je ukazovateľ postupu, ktorý ukazuje postup vytvárania LiveUSB." + +#: ../liveusb/dialog.py:169 +msgid "This is the status console, where all messages get written to." +msgstr "Toto je informačná konzola, ktorá vypisuje všetky správy." + +#: ../liveusb/creator.py:952 +msgid "Trying to continue anyway." +msgstr "Pokušam sa napriek tomu pokračovať." + +#: ../liveusb/gui.py:464 +msgid "USB drive found" +msgstr "USB disk nájdený" + +#: ../liveusb/creator.py:985 +#, python-format +msgid "Unable to change volume label: %(message)s" +msgstr "Nie je možné zmeniť menovku %(message)s" + +#: ../liveusb/creator.py:501 ../liveusb/creator.py:512 +#, python-format +msgid "Unable to chmod %(file)s: %(message)s" +msgstr "Nie je možné zmeniť oprávnenie %(file)s: %(message)s" + +#: ../liveusb/creator.py:478 +#, python-format +msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" +msgstr "Nie je možné skopírovať %(infile)s do %(outfile)s: %(message)s" + +#: ../liveusb/gui.py:403 +msgid "Unable to find any USB drive" +msgstr "Nemôžem nájsť žiadny USB disk" + +#: ../liveusb/creator.py:1274 +msgid "Unable to find any supported device" +msgstr "Nemôžem nájsť žiadne podporované zariadenie" + +#: ../liveusb/creator.py:1117 +msgid "Unable to find partition" +msgstr "Nie je možné nájsť oddiel" + +#: ../liveusb/creator.py:1354 +msgid "" +"Unable to get Win32_LogicalDisk; win32com query did not return any results" +msgstr "Nemôžem získať Win32_LogicalDisk; win32com nevrátil žiadne výsledky" + +#: ../liveusb/gui.py:691 +msgid "Unable to mount device" +msgstr "Nemôžem pripojiť zariadenie" + +#: ../liveusb/creator.py:814 +#, python-format +msgid "Unable to mount device: %(message)s" +msgstr "Nemôžem pripojiť zariadenie: %(message)s" + +#: ../liveusb/creator.py:517 +#, python-format +msgid "Unable to remove directory from previous LiveOS: %(message)s" +msgstr "Nemôžem ostrániť priečinok z predchádzajúceho LiveOS: %(message)s" + +#: ../liveusb/creator.py:505 +#, python-format +msgid "Unable to remove file from previous LiveOS: %(message)s" +msgstr "Nemôžem ostrániť súbor z predchádzajúceho LiveOS: %(message)s" + +#: ../liveusb/creator.py:1189 +msgid "" +"Unable to reset MBR. You may not have the `syslinux` package installed." +msgstr "Nemôžem resetovať MBR. Je možné, že nemáte nainštalovaný balík `syslinux`." + +#: ../liveusb/gui.py:798 +msgid "" +"Unable to use the selected file. You may have better luck if you move your " +"ISO to the root of your drive (ie: C:\\)" +msgstr "Nie je možné použiť zvolený súbor. Možno pomôže, ak presuniete Váš ISO súbor do koreňového disku (napr. C:\\)" + +#: ../liveusb/creator.py:723 +#, python-format +msgid "Unable to write on %(device)s, skipping." +msgstr "Nie je možné uskutočniť zápis na %(device)s, preskakujem." + +#: ../liveusb/creator.py:399 +msgid "Unknown ISO, skipping checksum verification" +msgstr "Neznáme ISO, preskakujem checksum verifikáciu" + +#: ../liveusb/creator.py:810 +#, python-format +msgid "Unknown dbus exception while trying to mount device: %(message)s" +msgstr "Neznáma výnimka dbus pri snahe o pripojenie zariadenia: %(message)s" + +#: ../liveusb/creator.py:791 ../liveusb/creator.py:964 +msgid "Unknown filesystem. Your device may need to be reformatted." +msgstr "Neznámy súborový systém. Vaše zariadenie bude nutné opäť sformátovať." + +#: ../liveusb/gui.py:85 +#, python-format +msgid "Unknown release: %s" +msgstr "Neznáma verzia: %s" + +#: ../liveusb/creator.py:851 +#, python-format +msgid "Unmounting '%(udi)s' on '%(device)s'" +msgstr "Odpája sa '%(udi)s' na '%(device)s'" + +#: ../liveusb/creator.py:847 +#, python-format +msgid "Unmounting mounted filesystems on '%(device)s'" +msgstr "Odpája sa pripojený súborový systém '%(device)s'" + +#: ../liveusb/creator.py:949 +#, python-format +msgid "Unsupported device '%(device)s', please report a bug." +msgstr "Nepodorované zariadenie '%(device)s', prosím nahláste chybu." + +#: ../liveusb/creator.py:794 ../liveusb/creator.py:967 +#, python-format +msgid "Unsupported filesystem: %s" +msgstr "Nepodporovaný súborový systém: %s" + +#: ../liveusb/creator.py:1287 +#, python-format +msgid "" +"Unsupported filesystem: %s\n" +"Please backup and format your USB key with the FAT filesystem." +msgstr "Nepodporovaný súborový systém: %s\nProsím zálohujte a sformátujte Váš USB kľúč súborovým systémom FAT" + +#: ../liveusb/creator.py:892 +#, python-format +msgid "Updating properties of system partition %(system_partition)s" +msgstr "Aktualizujem vlastnosti systémového oddielu %(system_partition)s" + +#: ../liveusb/launcher_ui.py:156 +msgid "" +"Upgrade\n" +"by cloning" +msgstr "Aktualizujem\nklonovaním" + +#: ../liveusb/launcher_ui.py:158 +msgid "" +"Upgrade\n" +"from ISO" +msgstr "Aktualizujem\nz ISO" + +#: ../liveusb/dialog.py:159 +msgid "Use existing Live system ISO" +msgstr "Použiť existujúci Live ISO systém" + +#: ../liveusb/creator.py:143 +msgid "Verifying ISO MD5 checksum" +msgstr "Overiť ISO MD5 checksum" + +#: ../liveusb/creator.py:373 +msgid "Verifying SHA1 checksum of LiveCD image..." +msgstr "Overujem SHA1 checksum obrazu LiveCD..." + +#: ../liveusb/creator.py:377 +msgid "Verifying SHA256 checksum of LiveCD image..." +msgstr "Overujem SHA256 checksum obrazu LiveCD..." + +#: ../liveusb/creator.py:961 ../liveusb/creator.py:1280 +msgid "Verifying filesystem..." +msgstr "Overujem súborový systém..." + +#: ../liveusb/gui.py:725 +msgid "" +"Warning: Creating a new persistent overlay will delete your existing one." +msgstr "Varovanie: Vytvorenie nového trvalého úložiska vymaže existujúci." + +#: ../liveusb/gui.py:377 +msgid "" +"Warning: This tool needs to be run as an Administrator. To do this, right " +"click on the icon and open the Properties. Under the Compatibility tab, " +"check the \"Run this program as an administrator\" box." +msgstr "Varovanie: Tento nástroj je nutné spustiť ako Administrátor. Kliknite pravým tlačidlom na ikonu a otvorte Vlastnosti. Pod záložkou kompatibilita zaškrtnite položku \"Program spustiť ako administrátor\"." + +#: ../liveusb/creator.py:162 +#, python-format +msgid "Wrote to device at %(speed)d MB/sec" +msgstr "Zapísané na zariadenie rýchlosťou %(speed)d MB/sec" + +#: ../liveusb/gui.py:699 +#, python-format +msgid "" +"You are going to install Tails on the %(size)s %(vendor)s %(model)s device " +"(%(device)s). All data on the selected device will be lost. Continue?" +msgstr "Chystáte sa inštalovať Tails na %(size)s %(vendor)s %(model)s zariadenie (%(device)s). Všetky dáta na vybranom zariadení budú zmazané. Pokračovať?" + +#: ../liveusb/gui.py:715 +#, python-format +msgid "" +"You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " +"device (%(device)s). Any persistent volume on this device will remain " +"unchanged. Continue?" +msgstr "Chystáte sa aktualizovať Tail na %(parent_size)s %(vendor)s %(model)s zariadení (%(device)s). Všetky trvalé odiely na zariadení ostanú nezmenené. Pokračovať?" + +#: ../liveusb/creator.py:622 +msgid "" +"You are using an old version of syslinux-extlinux that does not support the " +"ext4 filesystem" +msgstr "Používate zastaralú verziu syslinux-extlinux, ktorá nepodporuje súborový systém ext4" + +#: ../liveusb/gui.py:783 +msgid "You can try again to resume your download" +msgstr "Môžete sa pokúsiť o pokračovanie sťahovania" + +#: ../liveusb/creator.py:95 +msgid "You must run this application as root" +msgstr "Túto aplikáciu je potrebné spustiť ako administrátor" + +#: ../liveusb/dialog.py:162 +msgid "or" +msgstr "alebo"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 08 Jul '16

08 Jul '16

commit 67d972be8d81cf6efff2b268ce9ad4cbddea954f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 8 20:45:35 2016 +0000 Update translations for liveusb-creator --- sk_SK/sk_SK.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po index c06f455..59f72a9 100644 --- a/sk_SK/sk_SK.po +++ b/sk_SK/sk_SK.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-07-08 20:14+0000\n" +"PO-Revision-Date: 2016-07-08 20:21+0000\n" "Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -581,7 +581,7 @@ msgstr "Zapísané na zariadenie rýchlosťou %(speed)d MB/sec" msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "" +msgstr "Chystáte sa inštalovať Tails na %(size)s %(vendor)s %(model)s zariadenie (%(device)s). Všetky dáta na vybranom zariadení budú zmazané. Pokračovať?" #: ../liveusb/gui.py:715 #, python-format @@ -589,17 +589,17 @@ msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " "device (%(device)s). Any persistent volume on this device will remain " "unchanged. Continue?" -msgstr "" +msgstr "Chystáte sa aktualizovať Tail na %(parent_size)s %(vendor)s %(model)s zariadení (%(device)s). Všetky trvalé odiely na zariadení ostanú nezmenené. Pokračovať?" #: ../liveusb/creator.py:622 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" -msgstr "" +msgstr "Používate zastaralú verziu syslinux-extlinux, ktorá nepodporuje súborový systém ext4" #: ../liveusb/gui.py:783 msgid "You can try again to resume your download" -msgstr "" +msgstr "Môžete sa pokúsiť o pokračovanie sťahovania" #: ../liveusb/creator.py:95 msgid "You must run this application as root"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 08 Jul '16

08 Jul '16

commit b646bf2055e17c60f90b5949c1b2431f19fb9a4d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 8 20:15:37 2016 +0000 Update translations for liveusb-creator --- sk_SK/sk_SK.po | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po index ac451ca..c06f455 100644 --- a/sk_SK/sk_SK.po +++ b/sk_SK/sk_SK.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-07-08 19:18+0000\n" +"PO-Revision-Date: 2016-07-08 20:14+0000\n" "Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -470,111 +470,111 @@ msgstr "Nemôžem resetovať MBR. Je možné, že nemáte nainštalovaný balík msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "" +msgstr "Nie je možné použiť zvolený súbor. Možno pomôže, ak presuniete Váš ISO súbor do koreňového disku (napr. C:\\)" #: ../liveusb/creator.py:723 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "" +msgstr "Nie je možné uskutočniť zápis na %(device)s, preskakujem." #: ../liveusb/creator.py:399 msgid "Unknown ISO, skipping checksum verification" -msgstr "" +msgstr "Neznáme ISO, preskakujem checksum verifikáciu" #: ../liveusb/creator.py:810 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" -msgstr "" +msgstr "Neznáma výnimka dbus pri snahe o pripojenie zariadenia: %(message)s" #: ../liveusb/creator.py:791 ../liveusb/creator.py:964 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "" +msgstr "Neznámy súborový systém. Vaše zariadenie bude nutné opäť sformátovať." #: ../liveusb/gui.py:85 #, python-format msgid "Unknown release: %s" -msgstr "" +msgstr "Neznáma verzia: %s" #: ../liveusb/creator.py:851 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" -msgstr "" +msgstr "Odpája sa '%(udi)s' na '%(device)s'" #: ../liveusb/creator.py:847 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" -msgstr "" +msgstr "Odpája sa pripojený súborový systém '%(device)s'" #: ../liveusb/creator.py:949 #, python-format msgid "Unsupported device '%(device)s', please report a bug." -msgstr "" +msgstr "Nepodorované zariadenie '%(device)s', prosím nahláste chybu." #: ../liveusb/creator.py:794 ../liveusb/creator.py:967 #, python-format msgid "Unsupported filesystem: %s" -msgstr "" +msgstr "Nepodporovaný súborový systém: %s" #: ../liveusb/creator.py:1287 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." -msgstr "" +msgstr "Nepodporovaný súborový systém: %s\nProsím zálohujte a sformátujte Váš USB kľúč súborovým systémom FAT" #: ../liveusb/creator.py:892 #, python-format msgid "Updating properties of system partition %(system_partition)s" -msgstr "" +msgstr "Aktualizujem vlastnosti systémového oddielu %(system_partition)s" #: ../liveusb/launcher_ui.py:156 msgid "" "Upgrade\n" "by cloning" -msgstr "" +msgstr "Aktualizujem\nklonovaním" #: ../liveusb/launcher_ui.py:158 msgid "" "Upgrade\n" "from ISO" -msgstr "" +msgstr "Aktualizujem\nz ISO" #: ../liveusb/dialog.py:159 msgid "Use existing Live system ISO" -msgstr "" +msgstr "Použiť existujúci Live ISO systém" #: ../liveusb/creator.py:143 msgid "Verifying ISO MD5 checksum" -msgstr "" +msgstr "Overiť ISO MD5 checksum" #: ../liveusb/creator.py:373 msgid "Verifying SHA1 checksum of LiveCD image..." -msgstr "" +msgstr "Overujem SHA1 checksum obrazu LiveCD..." #: ../liveusb/creator.py:377 msgid "Verifying SHA256 checksum of LiveCD image..." -msgstr "" +msgstr "Overujem SHA256 checksum obrazu LiveCD..." #: ../liveusb/creator.py:961 ../liveusb/creator.py:1280 msgid "Verifying filesystem..." -msgstr "" +msgstr "Overujem súborový systém..." #: ../liveusb/gui.py:725 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." -msgstr "" +msgstr "Varovanie: Vytvorenie nového trvalého úložiska vymaže existujúci." #: ../liveusb/gui.py:377 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "" +msgstr "Varovanie: Tento nástroj je nutné spustiť ako Administrátor. Kliknite pravým tlačidlom na ikonu a otvorte Vlastnosti. Pod záložkou kompatibilita zaškrtnite položku \"Program spustiť ako administrátor\"." #: ../liveusb/creator.py:162 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "" +msgstr "Zapísané na zariadenie rýchlosťou %(speed)d MB/sec" #: ../liveusb/gui.py:699 #, python-format

1 0

[tor-messenger-build/master] Revert Tor (Browser|Launcher) version bumps
by arlo＠torproject.org 08 Jul '16

08 Jul '16

commit eed3308e39c63f6f679b1f9dd85a40fc755562d5 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Jul 8 13:00:18 2016 -0700 Revert Tor (Browser|Launcher) version bumps * They break the build and will be part of the updater branch. --- projects/tor-browser/config | 2 +- projects/tor-launcher/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3933680..e0fa0f7 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 6.0.1 +version: 5.5.4 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files: diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 971e530..25c26b5 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.8.5 +version: 0.2.7.7 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: gk.gpg

1 0

[tor-messenger-build/master] Bump ctypes-otr to 5c0f5818
by arlo＠torproject.org 08 Jul '16

08 Jul '16

commit f983130dd98fec8cedb9d66be1689908bb684ee7 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Jul 8 12:52:51 2016 -0700 Bump ctypes-otr to 5c0f5818 * Includes a few fixes --- projects/ctypes-otr/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index c82fe98..b30c53b 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/arlolra/ctypes-otr -git_hash: 07fe340068356a79343092be9aa1c7485e572bbe +git_hash: 5c0f581852c50d913009d24aa48d863631f6096d filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: lib_glob: 'lib/*.so*'

1 0

[tor-messenger-build/master] Bump tags to THUNDERBIRD_45_2_0_RELEASE
by arlo＠torproject.org 08 Jul '16

08 Jul '16

commit e398eb49976e27765e660fb0565a6e0a9e3f12d5 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Jul 8 12:44:17 2016 -0700 Bump tags to THUNDERBIRD_45_2_0_RELEASE * Remove upstreamed patches --- ChangeLog | 4 +- projects/instantbird/bug-1263653.mozpatch | 115 ------------------------------ projects/instantbird/config | 5 +- projects/instantbird/trac-19053.patch | 30 -------- projects/mozilla/config | 2 +- 5 files changed, 4 insertions(+), 152 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2505d5a..dc7841f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ Tor Messenger 0.1.0b7 -- * All Platforms - * Use the THUNDERBIRD_45_1_1_RELEASE tag on mozilla-esr45 - * Use the THUNDERBIRD_45_1_1_RELEASE tag on comm-esr45 + * Use the THUNDERBIRD_45_2_0_RELEASE tag on mozilla-esr45 + * Use the THUNDERBIRD_45_2_0_RELEASE tag on comm-esr45 * Bug 19053: Display plaintext in notifications * ctypes-otr * GH 66: Provide functionality for adding verified fingerprints (patch by Vu Quoc Huy) diff --git a/projects/instantbird/bug-1263653.mozpatch b/projects/instantbird/bug-1263653.mozpatch deleted file mode 100644 index 8c54a55..0000000 --- a/projects/instantbird/bug-1263653.mozpatch +++ /dev/null @@ -1,115 +0,0 @@ - -# HG changeset patch -# User Jacek Caban <jacek(a)codeweavers.com> -# Date 1460457438 -7200 -# Node ID a2d94f934b2a733fa09e8f1097ee6fe07d7a2ad1 -# Parent 474f2f3c105915264882ba0f9733e7d1ee986c95 -Bug 1263653 - Fixed TSFTextStore.h compilation with mingw. r=masayuki - -diff --git a/widget/windows/TSFTextStore.cpp b/widget/windows/TSFTextStore.cpp ---- a/widget/windows/TSFTextStore.cpp -+++ b/widget/windows/TSFTextStore.cpp -@@ -5299,17 +5299,17 @@ TSFTextStore::SetInputContext(nsWindowBa - aWidget, GetIMEEnabledName(aContext.mIMEState.mEnabled), - GetFocusChangeName(aAction.mFocusChange), sEnabledTextStore.get(), - GetBoolName(ThinksHavingFocus()))); - - NS_ENSURE_TRUE_VOID(IsInTSFMode()); - - if (aAction.mFocusChange != InputContextAction::FOCUS_NOT_CHANGED) { - if (sEnabledTextStore) { -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - textStore->SetInputScope(aContext.mHTMLInputType, - aContext.mHTMLInputInputmode); - } - return; - } - - // If focus isn't actually changed but the enabled state is changed, - // emulate the focus move. -diff --git a/widget/windows/TSFTextStore.h b/widget/windows/TSFTextStore.h ---- a/widget/windows/TSFTextStore.h -+++ b/widget/windows/TSFTextStore.h -@@ -114,74 +114,74 @@ public: - static bool GetIMEOpenState(void); - - static void CommitComposition(bool aDiscard) - { - NS_ASSERTION(IsInTSFMode(), "Not in TSF mode, shouldn't be called"); - if (!sEnabledTextStore) { - return; - } -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - textStore->CommitCompositionInternal(aDiscard); - } - - static void SetInputContext(nsWindowBase* aWidget, - const InputContext& aContext, - const InputContextAction& aAction); - - static nsresult OnFocusChange(bool aGotFocus, - nsWindowBase* aFocusedWidget, - const InputContext& aContext); - static nsresult OnTextChange(const IMENotification& aIMENotification) - { - NS_ASSERTION(IsInTSFMode(), "Not in TSF mode, shouldn't be called"); - if (!sEnabledTextStore) { - return NS_OK; - } -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - return textStore->OnTextChangeInternal(aIMENotification); - } - - static nsresult OnSelectionChange(const IMENotification& aIMENotification) - { - NS_ASSERTION(IsInTSFMode(), "Not in TSF mode, shouldn't be called"); - if (!sEnabledTextStore) { - return NS_OK; - } -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - return textStore->OnSelectionChangeInternal(aIMENotification); - } - - static nsresult OnLayoutChange() - { - NS_ASSERTION(IsInTSFMode(), "Not in TSF mode, shouldn't be called"); - if (!sEnabledTextStore) { - return NS_OK; - } -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - return textStore->OnLayoutChangeInternal(); - } - - static nsresult OnUpdateComposition() - { - NS_ASSERTION(IsInTSFMode(), "Not in TSF mode, shouldn't be called"); - if (!sEnabledTextStore) { - return NS_OK; - } -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - return textStore->OnUpdateCompositionInternal(); - } - - static nsresult OnMouseButtonEvent(const IMENotification& aIMENotification) - { - NS_ASSERTION(IsInTSFMode(), "Not in TSF mode, shouldn't be called"); - if (!sEnabledTextStore) { - return NS_OK; - } -- RefPtr<TSFTextStore> textStore = sEnabledTextStore; -+ RefPtr<TSFTextStore> textStore(sEnabledTextStore); - return textStore->OnMouseButtonEventInternal(aIMENotification); - } - - static nsIMEUpdatePreference GetIMEUpdatePreference(); - - // Returns the address of the pointer so that the TSF automatic test can - // replace the system object with a custom implementation for testing. - // XXX TSF doesn't work now. Should we remove it? - diff --git a/projects/instantbird/config b/projects/instantbird/config index d6c3a2b..bd8b4f1 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr45/ -hg_hash: THUNDERBIRD_45_1_1_RELEASE +hg_hash: THUNDERBIRD_45_2_0_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]" remote_docker: 1 var: @@ -73,7 +73,6 @@ input_files: - filename: trac-17896.patch - filename: trac-17494.patch - filename: trac-13312.patch - - filename: trac-19053.patch - filename: version.patch - filename: search-context-menu.patch - filename: search-preferences-xul.patch @@ -110,8 +109,6 @@ input_files: enable: '[% c("var/windows") %]' - filename: bug-1167248.mozpatch enable: '[% c("var/windows") %]' - - filename: bug-1263653.mozpatch - enable: '[% c("var/windows") %]' - filename: trac-18331.mozpatch enable: '[% c("var/osx") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch diff --git a/projects/instantbird/trac-19053.patch b/projects/instantbird/trac-19053.patch deleted file mode 100644 index e4267da..0000000 --- a/projects/instantbird/trac-19053.patch +++ /dev/null @@ -1,30 +0,0 @@ -# HG changeset patch -# User Arlo Breault <arlolra(a)gmail.com> -# Date 1464281776 25200 -# Thu May 26 09:56:16 2016 -0700 -# Node ID f7624aac9022c38cfec6b2bc4f73ad69a5cf2a04 -# Parent 664eff8ea96f4bb2c15aa3ff01fd7c33e5cc3480 -Notification should use message prepared for dislaying - -diff --git a/im/modules/ibNotifications.jsm b/im/modules/ibNotifications.jsm ---- a/im/modules/ibNotifications.jsm -+++ b/im/modules/ibNotifications.jsm -@@ -20,17 +20,17 @@ var Notifications = { - } catch (e) { } - return ellipsis; - }, - - _showMessageNotification: function (aMessage) { - // Put the message content into a div node of the hidden HTML window. - let doc = getHiddenHTMLWindow().document; - let xhtmlElement = doc.createElementNS("http://www.w3.org/1999/xhtml", "div"); -- xhtmlElement.innerHTML = aMessage.message.replace(/<br>/gi, "<br/>"); -+ xhtmlElement.innerHTML = aMessage.displayMessage.replace(/<br>/gi, "<br/>"); - - // Convert the div node content to plain text. - let encoder = - Components.classes["@mozilla.org/layout/documentEncoder;1?type=text/plain"] - .createInstance(Components.interfaces.nsIDocumentEncoder); - encoder.init(doc, "text/plain", 0); - encoder.setNode(xhtmlElement); - let messageText = encoder.encodeToString().replace(/\s+/g, " "); diff --git a/projects/mozilla/config b/projects/mozilla/config index 653fb7a..c2b2e4d 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/mozilla-esr45/ -hg_hash: THUNDERBIRD_45_1_1_RELEASE +hg_hash: THUNDERBIRD_45_2_0_RELEASE src: | #!/bin/sh set -e

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 08 Jul '16

08 Jul '16

commit be96b69705d93991e6b903df44a2c8211cead36a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 8 19:45:33 2016 +0000 Update translations for liveusb-creator --- sk_SK/sk_SK.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po index 4e787fe..ac451ca 100644 --- a/sk_SK/sk_SK.po +++ b/sk_SK/sk_SK.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-07-08 19:15+0000\n" +"PO-Revision-Date: 2016-07-08 19:18+0000\n" "Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -444,27 +444,27 @@ msgstr "Nemôžem získať Win32_LogicalDisk; win32com nevrátil žiadne výsled #: ../liveusb/gui.py:691 msgid "Unable to mount device" -msgstr "" +msgstr "Nemôžem pripojiť zariadenie" #: ../liveusb/creator.py:814 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "" +msgstr "Nemôžem pripojiť zariadenie: %(message)s" #: ../liveusb/creator.py:517 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "" +msgstr "Nemôžem ostrániť priečinok z predchádzajúceho LiveOS: %(message)s" #: ../liveusb/creator.py:505 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "" +msgstr "Nemôžem ostrániť súbor z predchádzajúceho LiveOS: %(message)s" #: ../liveusb/creator.py:1189 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." -msgstr "" +msgstr "Nemôžem resetovať MBR. Je možné, že nemáte nainštalovaný balík `syslinux`." #: ../liveusb/gui.py:798 msgid ""

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 08 Jul '16

08 Jul '16

commit 6466cd8187d8b5175492a1233851663c1d7aad9e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 8 19:15:34 2016 +0000 Update translations for liveusb-creator --- sk_SK/sk_SK.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po index 85cde12..4e787fe 100644 --- a/sk_SK/sk_SK.po +++ b/sk_SK/sk_SK.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-07-08 18:36+0000\n" +"PO-Revision-Date: 2016-07-08 19:15+0000\n" "Last-Translator: Dasa M <littlearchr8(a)gmail.com>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -376,7 +376,7 @@ msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." -msgstr "" +msgstr "Toto tlačítko Vám umožní nájsť existujúci Live ISO, ktorý ste stiahli. Ak žiaden nevyberiete, bude stiahnutý automaticky." #: ../liveusb/dialog.py:171 msgid "" @@ -384,63 +384,63 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "" +msgstr "Toto tlačítko spustí proces vytvárania Live USB. To znamená prípadne stiahnutie (ak žiadna verzia nebola vybraná) a rozbalenie ISO obrazu na USB kľúč, vytvorenie trvalej pamäte a inštalácia zavádzača." #: ../liveusb/dialog.py:165 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." -msgstr "" +msgstr "Toto je USB kľúč, na ktorý chcete inštalovať Váš Live systém. Toto zariadenie musí byť naformátované systémom FAT." #: ../liveusb/dialog.py:170 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" -msgstr "" +msgstr "Toto je ukazovateľ postupu, ktorý ukazuje postup vytvárania LiveUSB." #: ../liveusb/dialog.py:169 msgid "This is the status console, where all messages get written to." -msgstr "" +msgstr "Toto je informačná konzola, ktorá vypisuje všetky správy." #: ../liveusb/creator.py:952 msgid "Trying to continue anyway." -msgstr "" +msgstr "Pokušam sa napriek tomu pokračovať." #: ../liveusb/gui.py:464 msgid "USB drive found" -msgstr "" +msgstr "USB disk nájdený" #: ../liveusb/creator.py:985 #, python-format msgid "Unable to change volume label: %(message)s" -msgstr "" +msgstr "Nie je možné zmeniť menovku %(message)s" #: ../liveusb/creator.py:501 ../liveusb/creator.py:512 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "" +msgstr "Nie je možné zmeniť oprávnenie %(file)s: %(message)s" #: ../liveusb/creator.py:478 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "" +msgstr "Nie je možné skopírovať %(infile)s do %(outfile)s: %(message)s" #: ../liveusb/gui.py:403 msgid "Unable to find any USB drive" -msgstr "" +msgstr "Nemôžem nájsť žiadny USB disk" #: ../liveusb/creator.py:1274 msgid "Unable to find any supported device" -msgstr "" +msgstr "Nemôžem nájsť žiadne podporované zariadenie" #: ../liveusb/creator.py:1117 msgid "Unable to find partition" -msgstr "" +msgstr "Nie je možné nájsť oddiel" #: ../liveusb/creator.py:1354 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" -msgstr "" +msgstr "Nemôžem získať Win32_LogicalDisk; win32com nevrátil žiadne výsledky" #: ../liveusb/gui.py:691 msgid "Unable to mount device"

1 0