October 2015 - tor-commits - lists.torproject.org

[doctor/master] Send fingerprint change notifications to bad-relays@
by atagar＠torproject.org 10 Oct '15

10 Oct '15

commit 31df96f2774dc7fb6759863f9fce743cef9defaa Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 10 10:44:06 2015 -0700 Send fingerprint change notifications to bad-relays@ Script's been happily chugging along for a week, time to send it to the list! --- fingerprint_change_checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fingerprint_change_checker.py b/fingerprint_change_checker.py index 71673ca..6a376be 100755 --- a/fingerprint_change_checker.py +++ b/fingerprint_change_checker.py @@ -90,7 +90,7 @@ def main(): body += "\n" try: - util.send(EMAIL_SUBJECT, body = body, to = ['atagar(a)torproject.org', 'dgoulet(a)torproject.org']) + util.send(EMAIL_SUBJECT, body = body, to = ['bad-relays(a)lists.torproject.org']) except Exception as exc: log.warn("Unable to send email: %s" % exc)

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 10 Oct '15

10 Oct '15

commit 323d0bf3944c8f7aa973541266b80e9331f4bf1e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 10 15:45:49 2015 +0000 Update translations for tails-misc_completed --- de.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/de.po b/de.po index 0461ee1..0cee242 100644 --- a/de.po +++ b/de.po @@ -10,6 +10,7 @@ # D P, 2015 # Ettore Atalan <atalanttore(a)googlemail.com>, 2014-2015 # gerhard <listmember(a)rinnberger.de>, 2013 +# konstibae, 2015 # Larson März <lmaerz(a)emailn.de>, 2013 # Mario Baier <mario.baier26(a)gmx.de>, 2013 # Mart3000, 2015 @@ -25,8 +26,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-21 15:11+0000\n" -"Last-Translator: Ettore Atalan <atalanttore(a)googlemail.com>\n" +"PO-Revision-Date: 2015-10-10 15:23+0000\n" +"Last-Translator: konstibae\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +58,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "</p>\n" -msgstr "<h1>Helfen uns Ihren Fehler zu beheben!</h1>\n<p>Lesen Sie <a href=\"%s\">unsere Fehlerberichtanleitung</a>.</p>\n<p><strong>Geben Sie nur soviele persönliche Informationen an,\nals unbedingt notwendig!</strong></p>\n<h2>Über die Angabe von Email-Adressen</h2>\n<p>\nDie Angabe einer Email-Adresse erlaubt uns, Sie zu kontaktieren um das Problem\nzu klären. Dies ist notwendig für die große Mehrheit der erhaltenen Berichte, da die\nmeisten Berichte ohne Kontaktinformationen nutzlos sind. Andererseits ist dies eine\nEinladung für böswillige Dritte, wie Ihr Email- oder Internetprovider, um herauszufinden,\ndass Sie Tails nutzen.</p>\n" +msgstr "<h1>Helfen uns Ihren Fehler zu beheben!</h1>\n<p>Lesen Sie <a href=\"%s\">unsere Fehlerberichtanleitung</a>.</p>\n<p><strong>Geben Sie nur soviele persönliche Informationen an,\nwie unbedingt notwendig!</strong></p>\n<h2>Über die Angabe von Email-Adressen</h2>\n<p>\nDie Angabe einer Email-Adresse erlaubt uns, Sie zu kontaktieren um das Problem\nzu klären. Dies ist notwendig für die große Mehrheit der erhaltenen Berichte, da die\nmeisten Berichte ohne Kontaktinformationen nutzlos sind. Andererseits ist dies eine\nEinladung für böswillige Dritte, wie Ihr Email- oder Internetprovider, um herauszufinden,\ndass Sie Tails nutzen.</p>\n" #: config/chroot_local-includes/usr/local/bin/electrum:14 msgid "Persistence is disabled for Electrum" @@ -496,7 +497,7 @@ msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." -msgstr "Der Eepsite-Tunnel wurde nicht innerhalb von sechs Minuten gebaut. Überprüfen Sie die Routerkonsole im I2P-Browser oder die Protokolle in /var/log/i2p für mehr Informationen. Verbinden Sie sich wieder mit dem Netzwerk, um es erneut zu versuchen." +msgstr "Der Eepsite-Tunnel wurde nicht innerhalb von sechs Minuten aufgebaut. Überprüfen Sie die Routerkonsole im I2P-Browser oder die Protokolle in /var/log/i2p für mehr Informationen. Verbinden Sie sich wieder mit dem Netzwerk, um es erneut zu versuchen." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 10 Oct '15

10 Oct '15

commit eefc0c2167c560d587aa9a0bc5ab75895bb2f8b7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 10 15:45:46 2015 +0000 Update translations for tails-misc --- de.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/de.po b/de.po index 0461ee1..0cee242 100644 --- a/de.po +++ b/de.po @@ -10,6 +10,7 @@ # D P, 2015 # Ettore Atalan <atalanttore(a)googlemail.com>, 2014-2015 # gerhard <listmember(a)rinnberger.de>, 2013 +# konstibae, 2015 # Larson März <lmaerz(a)emailn.de>, 2013 # Mario Baier <mario.baier26(a)gmx.de>, 2013 # Mart3000, 2015 @@ -25,8 +26,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-21 15:11+0000\n" -"Last-Translator: Ettore Atalan <atalanttore(a)googlemail.com>\n" +"PO-Revision-Date: 2015-10-10 15:23+0000\n" +"Last-Translator: konstibae\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +58,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "</p>\n" -msgstr "<h1>Helfen uns Ihren Fehler zu beheben!</h1>\n<p>Lesen Sie <a href=\"%s\">unsere Fehlerberichtanleitung</a>.</p>\n<p><strong>Geben Sie nur soviele persönliche Informationen an,\nals unbedingt notwendig!</strong></p>\n<h2>Über die Angabe von Email-Adressen</h2>\n<p>\nDie Angabe einer Email-Adresse erlaubt uns, Sie zu kontaktieren um das Problem\nzu klären. Dies ist notwendig für die große Mehrheit der erhaltenen Berichte, da die\nmeisten Berichte ohne Kontaktinformationen nutzlos sind. Andererseits ist dies eine\nEinladung für böswillige Dritte, wie Ihr Email- oder Internetprovider, um herauszufinden,\ndass Sie Tails nutzen.</p>\n" +msgstr "<h1>Helfen uns Ihren Fehler zu beheben!</h1>\n<p>Lesen Sie <a href=\"%s\">unsere Fehlerberichtanleitung</a>.</p>\n<p><strong>Geben Sie nur soviele persönliche Informationen an,\nwie unbedingt notwendig!</strong></p>\n<h2>Über die Angabe von Email-Adressen</h2>\n<p>\nDie Angabe einer Email-Adresse erlaubt uns, Sie zu kontaktieren um das Problem\nzu klären. Dies ist notwendig für die große Mehrheit der erhaltenen Berichte, da die\nmeisten Berichte ohne Kontaktinformationen nutzlos sind. Andererseits ist dies eine\nEinladung für böswillige Dritte, wie Ihr Email- oder Internetprovider, um herauszufinden,\ndass Sie Tails nutzen.</p>\n" #: config/chroot_local-includes/usr/local/bin/electrum:14 msgid "Persistence is disabled for Electrum" @@ -496,7 +497,7 @@ msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." -msgstr "Der Eepsite-Tunnel wurde nicht innerhalb von sechs Minuten gebaut. Überprüfen Sie die Routerkonsole im I2P-Browser oder die Protokolle in /var/log/i2p für mehr Informationen. Verbinden Sie sich wieder mit dem Netzwerk, um es erneut zu versuchen." +msgstr "Der Eepsite-Tunnel wurde nicht innerhalb von sechs Minuten aufgebaut. Überprüfen Sie die Routerkonsole im I2P-Browser oder die Protokolle in /var/log/i2p für mehr Informationen. Verbinden Sie sich wieder mit dem Netzwerk, um es erneut zu versuchen." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 10 Oct '15

10 Oct '15

commit 368f0d757c694d4c5b9191c7251f0da8ed14f1dc Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 10 15:45:25 2015 +0000 Update translations for liveusb-creator_completed --- de/de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/de.po b/de/de.po index ade01fc..3319ee3 100644 --- a/de/de.po +++ b/de/de.po @@ -11,6 +11,7 @@ # trantor <clucko3(a)gmail.com>, 2014 # tbull <tbull(a)fedoraproject.org>, 2009 # gerhard <listmember(a)rinnberger.de>, 2013 +# konstibae, 2015 # Marcus Nitzschke <marcusni(a)gmx.de>, 2008 # Mario Baier <mario.baier26(a)gmx.de>, 2013 # matsa <matsa(a)riseup.net>, 2012 @@ -32,8 +33,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-10 16:01+0200\n" -"PO-Revision-Date: 2015-08-30 16:00+0000\n" -"Last-Translator: try once <lh-account-a(a)use.startmail.com>\n" +"PO-Revision-Date: 2015-10-10 15:32+0000\n" +"Last-Translator: konstibae\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -318,7 +319,7 @@ msgstr "Beständiger Speicherbereich (0 MB)" #: ../liveusb/gui.py:698 ../liveusb/gui.py:727 msgid "Please confirm your device selection" -msgstr "Bitte bestätigen Sie Ihre Auswahl" +msgstr "Bitte bestätigen Sie Ihre Geräte Auswahl" #: ../liveusb/gui.py:481 msgid "Refreshing releases..."

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 10 Oct '15

10 Oct '15

commit 89b9f0f1cd3cafc68cb39b448436726694f994b4 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 10 15:45:19 2015 +0000 Update translations for liveusb-creator --- de/de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/de.po b/de/de.po index ade01fc..3319ee3 100644 --- a/de/de.po +++ b/de/de.po @@ -11,6 +11,7 @@ # trantor <clucko3(a)gmail.com>, 2014 # tbull <tbull(a)fedoraproject.org>, 2009 # gerhard <listmember(a)rinnberger.de>, 2013 +# konstibae, 2015 # Marcus Nitzschke <marcusni(a)gmx.de>, 2008 # Mario Baier <mario.baier26(a)gmx.de>, 2013 # matsa <matsa(a)riseup.net>, 2012 @@ -32,8 +33,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-10 16:01+0200\n" -"PO-Revision-Date: 2015-08-30 16:00+0000\n" -"Last-Translator: try once <lh-account-a(a)use.startmail.com>\n" +"PO-Revision-Date: 2015-10-10 15:32+0000\n" +"Last-Translator: konstibae\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -318,7 +319,7 @@ msgstr "Beständiger Speicherbereich (0 MB)" #: ../liveusb/gui.py:698 ../liveusb/gui.py:727 msgid "Please confirm your device selection" -msgstr "Bitte bestätigen Sie Ihre Auswahl" +msgstr "Bitte bestätigen Sie Ihre Geräte Auswahl" #: ../liveusb/gui.py:481 msgid "Refreshing releases..."

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 10 Oct '15

10 Oct '15

commit 38d6accc4e31dc57122378f9f29b3b762a0bcbf4 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 10 12:15:51 2015 +0000 Update translations for torbutton-torbuttondtd --- lb/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lb/torbutton.dtd b/lb/torbutton.dtd index 8f44034..357b9c0 100644 --- a/lb/torbutton.dtd +++ b/lb/torbutton.dtd @@ -36,7 +36,7 @@ <!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Sich no Tor Browser Aktualiséierungen"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Schutz"> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie Schutz…"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Kopie Tor URL"> <!ENTITY torbutton.context_menu.copyTor.key "p">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 10 Oct '15

10 Oct '15

commit 682db1b8f4aea0df10058c8cb2c0f05c3c3e11f7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 10 08:45:03 2015 +0000 Update translations for bridgedb --- mk/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po index af8ada6..aa81bcc 100644 --- a/mk/LC_MESSAGES/bridgedb.po +++ b/mk/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-10 08:15+0000\n" +"PO-Revision-Date: 2015-10-10 08:16+0000\n" "Last-Translator: Cacko Cackoas <cackothe(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" @@ -304,7 +304,7 @@ msgstr "" #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "Дали ви треба IPv6 IP адреса?" #: bridgedb/strings.py:135 #, python-format @@ -344,7 +344,7 @@ msgstr "" msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "Дали вапиот интернет провајдер (ISP) блокира или цензурира сообраќај кон Tor мрежата?" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:159

1 0

[tor-messenger-build/master] Use archive.ubuntu.com for utopic packages
by boklm＠torproject.org 10 Oct '15

10 Oct '15

commit 492c96382ae1afa28a536a222d27061edb18bad9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Oct 10 10:32:28 2015 +0200 Use archive.ubuntu.com for utopic packages Ubuntu Utopic has been removed from archive.ubuntu.com. --- projects/docker-image/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/docker-image/config b/projects/docker-image/config index af2bde6..d1fe261 100644 --- a/projects/docker-image/config +++ b/projects/docker-image/config @@ -25,6 +25,9 @@ pre: | #!/bin/sh # [% c('docker_image') %] set -e + [% IF c('lsb_release/codename') == 'utopic' -%] + sed -i 's/archive\.ubuntu\.com/old-releases.ubuntu.com/' /etc/apt/sources.list + [% END -%] [% IF pc(c('origin_project'), 'var/pre_pkginst') -%] [% pc(c('origin_project'), 'var/pre_pkginst') %] [% END -%]

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 10 Oct '15

10 Oct '15

commit 44684c8539229c1ddb27f6aa9139f3a5703101c7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 10 08:15:04 2015 +0000 Update translations for bridgedb --- mk/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++++---------------------- 1 file changed, 170 insertions(+), 168 deletions(-) diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po index eff3227..af8ada6 100644 --- a/mk/LC_MESSAGES/bridgedb.po +++ b/mk/LC_MESSAGES/bridgedb.po @@ -3,18 +3,20 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Cacko Cackoas <cackothe(a)gmail.com>, 2015 # Viktor Hristov <viktor.hr(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Macedonian (http://www.transifex.com/projects/p/torproject/language/mk/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2015-10-10 08:15+0000\n" +"Last-Translator: Cacko Cackoas <cackothe(a)gmail.com>\n" +"Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" @@ -29,57 +31,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." +msgstr "Извинете но има грешка во вашето барање" + +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Извештај за бубачка" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" msgstr "" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Контакт" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Селектирај се" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Покажи QR код" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Има грешка во добивањето на вашиот QR код" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Земи %s премостувања %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -90,7 +217,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: lib/bridgedb/strings.py:47 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -101,7 +228,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -113,7 +240,7 @@ msgstr "" #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:63 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -122,20 +249,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "Што се премостувања?" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "Ми треба алтернативен начин да добијам премостувања!" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -143,12 +270,12 @@ msgid "" "%s, %s or %s." msgstr "" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "Моите премостувања не функционираат! Ми треба помош!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" @@ -156,48 +283,48 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -206,21 +333,21 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -228,153 +355,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "Земи %s премостувања %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. (These are used to insert HTML5 underlining tags, to mark accesskeys -#. for disabled users.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:151 -#, python-format -msgid "%sG%set Bridges" -msgstr ""

1 0

[tor-messenger-build/master] Update patch for avoiding double definition of MFVideoFormat_VP80
by sukhbir＠torproject.org 09 Oct '15

09 Oct '15

commit 875954a7eb6668b40ae73ee4ad7e178ae766fa38 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Oct 9 16:55:26 2015 -0400 Update patch for avoiding double definition of MFVideoFormat_VP80 --- ...-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch b/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch index f2f6f47..1e094ac 100644 --- a/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch +++ b/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch @@ -8,21 +8,20 @@ Subject: [PATCH] Avoid double definition of MFVideoFormat_VP80 with mingw-w64 1 file changed, 2 insertions(+) diff --git a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp -index ba87a34bc6db..33ab0a4ad5a8 100644 --- a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp +++ b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp -@@ -31,6 +31,7 @@ using mozilla::layers::LayerManager; +@@ -30,6 +30,7 @@ + using mozilla::layers::LayerManager; using mozilla::layers::LayersBackend; - #if MOZ_WINSDK_MAXVER < 0x0A000000 +#if 0 - // Windows 10+ SDK has VP80 and VP90 defines const GUID MFVideoFormat_VP80 = { -@@ -48,6 +49,7 @@ const GUID MFVideoFormat_VP90 = + 0x30385056, +@@ -45,6 +46,7 @@ + 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} }; - #endif +#endif const CLSID CLSID_WebmMfVp8Dec =

1 0