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

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit f8fe72512a37aa2de3deb45b5bacd109b4149bba Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 19:18:27 2016 +0000 Update translations for tor-browser-manual --- tr/tr.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 753f91f..9b71ccd 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -7,12 +7,13 @@ # Yasin Özel <iletisim(a)yasinozel.com.tr>, 2016 # runasand <inactive+runasand(a)transifex.com>, 2016 # Ercan Erden <ercerden(a)gmail.com>, 2016 +# alibildir <alibildir(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Ercan Erden <ercerden(a)gmail.com>, 2016\n" +"Last-Translator: alibildir <alibildir(a)gmail.com>, 2016\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1099,7 +1100,7 @@ msgstr "" #: security-slider.page:73 msgid "Low" -msgstr "" +msgstr "Düşük" #: security-slider.page:74 msgid "" @@ -1193,7 +1194,7 @@ msgstr "" #: troubleshooting.page:21 msgid "Quick fixes" -msgstr "" +msgstr "Hızlı düzeltmeler" #: troubleshooting.page:22 msgid "" @@ -1286,7 +1287,7 @@ msgstr "" #: uninstalling.page:35 msgid "Empty your Trash" -msgstr "" +msgstr "çöp kutunu boşalt" #: uninstalling.page:39 msgid "" @@ -1373,7 +1374,7 @@ msgstr "" #: updating.page:58 msgid "Updating Tor Browser manually" -msgstr "" +msgstr "Tor Tarayıcı manuel güncelleniyor" #: updating.page:61 msgid ""

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit 4e2c18a678770d2ca865333dc4e6a2a96ef9d102 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 19:18:18 2016 +0000 Update translations for tails-greeter-2_completed --- de/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/de/de.po b/de/de.po index b8289a4..500bc73 100644 --- a/de/de.po +++ b/de/de.po @@ -65,7 +65,7 @@ msgstr "" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:12 msgid "Microsoft Windows 10 camouflage" -msgstr "Microsoft Windows 10-Tarnung" +msgstr "Microsoft-Windows-10-Tarnung" #: ../data/greeter.ui.h:13 msgid "MAC Address Spoofing" @@ -193,7 +193,7 @@ msgstr "Direkt mit dem Tor-Netzwerk verbinden (Vorgabe)" #: ../data/greeter.ui.h:39 msgid "Configure a Tor bridge, firewall, or proxy settings" msgstr "" -"Eine Tor Brücke, Firewall der Vermittlungsservereinstellungen (Proxy) " +"Eine Tor-Brücke, Firewall der Vermittlungsservereinstellungen (Proxy) " "konfigurieren." #: ../data/greeter.ui.h:40 @@ -207,7 +207,7 @@ msgid "" msgstr "" "Die Standardeinstellungen sind in den meisten Situationen sicher. Um " "benutzerdefinierte Einstellungen vorzunehmen, drücken Sie unten auf die " -"Schaltfläche \"+\"." +"Schaltfläche »+«." #: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717 msgid "Off (default)" @@ -247,14 +247,14 @@ msgstr "Zurück" #: ../tailsgreeter/gui.py:652 msgid "Unlocking…" -msgstr "Wird entsperrt…" +msgstr "Wird entsperrt …" #: ../tailsgreeter/gui.py:680 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "" -"Die Tor Brücke und den lokalen Vermittlungsserver (Proxy) später nach dem " +"Die Tor-Brücke und den lokalen Vermittlungsserver (Proxy) später nach dem " "Verbinden mit dem Netzwerk konfigurieren." #: ../tailsgreeter/gui.py:720

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit 8a3354eab9346f6b10a34499478d4187a5d204c7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 19:18:15 2016 +0000 Update translations for tails-greeter-2 --- de/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/de/de.po b/de/de.po index b8289a4..500bc73 100644 --- a/de/de.po +++ b/de/de.po @@ -65,7 +65,7 @@ msgstr "" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:12 msgid "Microsoft Windows 10 camouflage" -msgstr "Microsoft Windows 10-Tarnung" +msgstr "Microsoft-Windows-10-Tarnung" #: ../data/greeter.ui.h:13 msgid "MAC Address Spoofing" @@ -193,7 +193,7 @@ msgstr "Direkt mit dem Tor-Netzwerk verbinden (Vorgabe)" #: ../data/greeter.ui.h:39 msgid "Configure a Tor bridge, firewall, or proxy settings" msgstr "" -"Eine Tor Brücke, Firewall der Vermittlungsservereinstellungen (Proxy) " +"Eine Tor-Brücke, Firewall der Vermittlungsservereinstellungen (Proxy) " "konfigurieren." #: ../data/greeter.ui.h:40 @@ -207,7 +207,7 @@ msgid "" msgstr "" "Die Standardeinstellungen sind in den meisten Situationen sicher. Um " "benutzerdefinierte Einstellungen vorzunehmen, drücken Sie unten auf die " -"Schaltfläche \"+\"." +"Schaltfläche »+«." #: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717 msgid "Off (default)" @@ -247,14 +247,14 @@ msgstr "Zurück" #: ../tailsgreeter/gui.py:652 msgid "Unlocking…" -msgstr "Wird entsperrt…" +msgstr "Wird entsperrt …" #: ../tailsgreeter/gui.py:680 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "" -"Die Tor Brücke und den lokalen Vermittlungsserver (Proxy) später nach dem " +"Die Tor-Brücke und den lokalen Vermittlungsserver (Proxy) später nach dem " "Verbinden mit dem Netzwerk konfigurieren." #: ../tailsgreeter/gui.py:720

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit 695ff419c37c791bd376d7fd5b377a464b8d294d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 19:17:13 2016 +0000 Update translations for torbutton-abouttorproperties_completed --- de/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/abouttor.properties b/de/abouttor.properties index b5b2fd3..3c47ca8 100644 --- a/de/abouttor.properties +++ b/de/abouttor.properties @@ -16,7 +16,7 @@ aboutTor.searchDC.search.link=https://search.disconnect.me/ aboutTor.donationBanner.donate=Bitte spenden Sie! aboutTor.donationBanner.heart=Tor ist am Herz der Internetfreiheit -aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Online-Sicherheit & Datenschutz +aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Sicherheit & Datenschutz im Netz aboutTor.donationBanner.tagline2=Ein Netzwerk von Menschen, die Menschen schützen aboutTor.donationBanner.tagline3=Überwachung = Unterdrückung aboutTor.donationBanner.tagline4=Schutz von Journalisten, Aktivisten und Hinweisgebern seit 2006

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 14 Dec '16

14 Dec '16

commit 3768a0e86f8be0253548adbc11cb4a4053be581f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 14 19:17:08 2016 +0000 Update translations for torbutton-abouttorproperties --- de/abouttor.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/abouttor.properties b/de/abouttor.properties index b5b2fd3..3c47ca8 100644 --- a/de/abouttor.properties +++ b/de/abouttor.properties @@ -16,7 +16,7 @@ aboutTor.searchDC.search.link=https://search.disconnect.me/ aboutTor.donationBanner.donate=Bitte spenden Sie! aboutTor.donationBanner.heart=Tor ist am Herz der Internetfreiheit -aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Online-Sicherheit & Datenschutz +aboutTor.donationBanner.tagline1=Millionen von Menschen verlassen sich auf Tor für Sicherheit & Datenschutz im Netz aboutTor.donationBanner.tagline2=Ein Netzwerk von Menschen, die Menschen schützen aboutTor.donationBanner.tagline3=Überwachung = Unterdrückung aboutTor.donationBanner.tagline4=Schutz von Journalisten, Aktivisten und Hinweisgebern seit 2006

1 0

[tor-ramdisk/master] Bumps for amd64 and x86
by blueness＠torproject.org 14 Dec '16

14 Dec '16

commit 81276b28eb5872ba318c628348d4dc1b416efc56 Author: Anthony G. Basile <blueness(a)gentoo.org> Date: Wed Dec 14 12:57:46 2016 -0500 Bumps for amd64 and x86 tor-0.2.8.11 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 52f593e..2aa48e0 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -TOR=tor-0.2.8.10 +TOR=tor-0.2.8.11 BUSYBOX=busybox-1.25.1 NTPD=openntpd-6.0p1 OPENSSH=openssh-7.3p1

1 0

[trac-email/master] Add quick fix to else case
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit ebce28f2f7bdaf3933550aed8d3852487034bef1 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 14 15:37:46 2016 +0100 Add quick fix to else case --- notify.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/notify.py b/notify.py index cf0bae0..0ae60b7 100755 --- a/notify.py +++ b/notify.py @@ -22,7 +22,9 @@ def verify_email_signature(message, user): k = row[0] u = row[1].strip() if k == verified.fingerprint and u == user: - return verified + return True + else: + return False def get_message_body(message): if message.is_multipart():

1 0

[trac-email/master] Polish script
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit d3ce4bca377b5f6a06173e1bbc8176752112f832 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 14 15:34:46 2016 +0100 Polish script --- notify.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/notify.py b/notify.py index 5d8f886..cf0bae0 100755 --- a/notify.py +++ b/notify.py @@ -14,14 +14,15 @@ def read_message(): def verify_email_signature(message, user): gpg = gnupg.GPG(gnupghome='/home/tracadm/.gnupg') verified = gpg.verify(message) - if verified.trust_level is not None and verified.trust_level >= verified.TRUST_UNDEFINED: + + if verified.trust_level is not None and verified.trust_level >= 0 and verified.key_status is None: with open('/home/tracadm/bin/map', 'rb') as csvfile: keysreader = csv.reader(csvfile, delimiter=' ') for row in keysreader: k = row[0] u = row[1].strip() if k == verified.fingerprint and u == user: - return True + return verified def get_message_body(message): if message.is_multipart(): @@ -86,13 +87,16 @@ with open('/home/tracadm/log/test.log', 'w') as f: user = msg['From'].split('@')[0] verified = verify_email_signature(msg.as_string(), user) + if verified: + f.write('GPG verified\n') + # Find or create ticket - f.write('GPG verified') tkt = find_or_create_ticket(msg, env) + if tkt: f.write(str(tkt)) else: - f.write('Could not create Ticket. I should send an email back I suppose') + f.write('Could not create Ticket. I should send an email back I suppose \n') else: - f.write('Could not verify GPG. I should send an email back I suppose') + f.write('Could not verify GPG. I should send an email back I suppose \n')

1 0

[trac-email/master] Cleaning up script and improving gnupg management
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit 853db909039a1c4851ebdaf78f89bf3e4ce2efa2 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Dec 13 18:22:48 2016 +0100 Cleaning up script and improving gnupg management --- notify.py | 79 +++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 30 deletions(-) diff --git a/notify.py b/notify.py index 189ca12..5d8f886 100755 --- a/notify.py +++ b/notify.py @@ -2,6 +2,7 @@ import sys import email import re import gnupg +import csv from trac.env import Environment from trac.ticket.model import Ticket from trac.perm import IPermissionRequestor, PermissionCache, PermissionSystem @@ -10,37 +11,50 @@ def read_message(): full_msg = sys.stdin.read() return email.message_from_string("".join(full_msg)) -def verify_email_signature(message): +def verify_email_signature(message, user): gpg = gnupg.GPG(gnupghome='/home/tracadm/.gnupg') - return gpg.verify(message) + verified = gpg.verify(message) + if verified.trust_level is not None and verified.trust_level >= verified.TRUST_UNDEFINED: + with open('/home/tracadm/bin/map', 'rb') as csvfile: + keysreader = csv.reader(csvfile, delimiter=' ') + for row in keysreader: + k = row[0] + u = row[1].strip() + if k == verified.fingerprint and u == user: + return True def get_message_body(message): - body = "" if message.is_multipart(): + body = '' for payload in message.get_payload(): - body.join(payload.get_payload()) - else: - body.join(message.get_payload()) + body = body.join(payload.get_payload()) + return body.split('-----BEGIN PGP SIGNATURE-----')[0] - return body + else: + return message.get_payload().split('-----BEGIN PGP SIGNATURE-----')[0] def verify_user_permissions(env, user, permission): ps = PermissionSystem(env) permissions_list = ps.get_user_permissions(user) return permissions_list[permission] -def find_or_create_ticket(message, body, env): +def find_or_create_ticket(message, env): # Find the ticket ID if exists summary = message['Subject'] ticket_id = re.search('#(.+?) ', summary) + # Get the message body + body = ''.join(get_message_body(message)) reporter = message['From'] if ticket_id: t_id = ticket_id.group(1) tkt = Ticket(env, int(t_id)) if verify_user_permissions(env, reporter, 'TICKET_MODIFY'): - tkt.save_changes(comment=body) + if tkt.save_changes(comment=body): + return tkt + else: + return False else: if verify_user_permissions(env, reporter, 'TICKET_CREATE'): summary = message['Subject'] @@ -54,26 +68,31 @@ def find_or_create_ticket(message, body, env): tkt['description'] = body tkt['status'] = 'new' tkt['priority'] = 'medium' - tkt.insert() + if tkt.insert(): + return tkt + else: + return False # Open logs file -f = open('/home/tracadm/log/test.log', 'w') - -# Define the current trac environment -env = Environment('/current') - -# Build email message -msg = read_message() - -# Get the message body -body = msg.get_payload() - -verified = verify_email_signature(body) - -if verified.trust_level is not None and verified.trust_level >= verified.TRUST_FULLY: - - # Find or create ticket - find_or_create_ticket(msg, body, env) - -# Close log file -f.close +with open('/home/tracadm/log/test.log', 'w') as f: + + # Define the current trac environment + env = Environment('/current') + + # Build email message + msg = read_message() + + # Read user from email + user = msg['From'].split('@')[0] + + verified = verify_email_signature(msg.as_string(), user) + if verified: + # Find or create ticket + f.write('GPG verified') + tkt = find_or_create_ticket(msg, env) + if tkt: + f.write(str(tkt)) + else: + f.write('Could not create Ticket. I should send an email back I suppose') + else: + f.write('Could not verify GPG. I should send an email back I suppose')

1 0

[trac-email/master] Merge branch 'master' of ssh://git-rw.torproject.org/admin/trac/trac-email
by hiro＠torproject.org 14 Dec '16

14 Dec '16

commit 0981c44b54f35ee673af698b02963b277493c096 Merge: 853db90 0e500de Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 14 15:30:49 2016 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/admin/trac/trac-email map | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)

1 0