[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit a416fa06bdfe2916004abd784c3ccea17789a8e9 Author: Translation commit bot Date: Thu Oct 8 21:15:04 2015 + Update translations for bridgedb_completed --- el/LC_MESSAGES/bridgedb.po | 327 1 file changed, 177 insertions(+), 150 deletions(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index e92..0282ca8 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -1,28 +1,31 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: # Adrian Pappas , 2014 +# Aikaterini Katmada, 2015 # andromeas , 2014 # oahanx, 2014 -# isv31 , 2014 +# Ilias Giannaros , 2015 +# isv31 <36b04...@anon.leemail.me>, 2014 # kotkotkot , 2013 # kotkotkot , 2012 +# LOUKAS SKOUROLIAKOS, 2015 # mitzie , 2013 # Wasilis Mandratzis , 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2014-07-26 02:11+\n" -"PO-Revision-Date: 2014-10-15 17:11+\n" -"Last-Translator: oahanx\n" -"Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" +"POT-Creation-Date: 2015-07-25 03:40+\n" +"PO-Revision-Date: 2015-10-08 20:45+\n" +"Last-Translator: Ilias Giannaros \n" +"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\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: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -37,57 +40,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "Î£Ï Î³Î³Î½Ïμη! ÎάÏι Ïήγε ÏÏÏαβά με Ïο αίÏημα ÏαÏ." -#: lib/bridgedb/strings.py:18 +#: 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 "ÎÏÏείο καÏαγÏαÏÎ®Ï Î±Î»Î»Î±Î³Ïν" + +#: 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 "ÎμÏάνιÏη QRCode" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "QRCode για ÏÎ¹Ï Î³ÎÏÏ ÏÎµÏ ÏαÏ" + +#. 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 "ÎÏÏ ÏÏι ÏαίνεÏαι, Ï ÏήÏξε Îνα ÏÏÏβλημα καÏά Ïην ανάκÏηÏη ÏÎ¿Ï QRCode ÏαÏ. " + +#: 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 "ÎÏ ÏÏ Ïο QRCode ÏεÏιÎÏει ÏÎ¹Ï Î³ÏαμμÎÏ Î³ÎÏÏ ÏαÏ. ÎιαβάÏÏε Ïο με Îνα QRCode scanner για να ανÏιγÏάÏεÏε ÏÎ¹Ï Î³ÏαμμÎÏ Î³ÎÏÏ ÏÎ±Ï Ïε κινήÏη και άλλη ÏÏ ÏÎºÎµÏ Î®." + +#: 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 "ÎοκιμάÏÏε να %s ÏάÏε ÏίÏÏ %s και να εÏιλÎξεÏε διαÏοÏεÏÎ¹ÎºÏ ÏÏÏο γÎÏÏ ÏαÏ!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Îήμα %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "ÎαÏεβάÏÏε %s Tor Browser %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Îήμα %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr
[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed
commit 428583c2c8b780b735be7c83d11c4e86361402ce Author: Translation commit bot Date: Thu Oct 8 20:45:44 2015 + Update translations for tails-misc_completed --- el.po | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/el.po b/el.po index 7ece0c3..2db9c85 100644 --- a/el.po +++ b/el.po @@ -12,6 +12,7 @@ # Ellie El , 2014 # firespin , 2014 # Georgios Vasileiadis , 2014 +# Ilias Giannaros , 2015 # kotkotkot , 2013 # kotkotkot , 2013 # LOUKAS SKOUROLIAKOS, 2015 @@ -20,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-28 01:49+0200\n" -"PO-Revision-Date: 2015-09-19 23:21+\n" -"Last-Translator: Aikaterini Katmada\n" +"POT-Creation-Date: 2015-09-20 19:32+0200\n" +"PO-Revision-Date: 2015-10-08 20:37+\n" +"Last-Translator: Ilias Giannaros \n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -318,23 +319,23 @@ msgstr "ΦαίνεÏαι ÏÏÏ ÎÏεÏε αÏοκλειÏÏεί αÏÏ Ïο δ msgid "This version of Tails has known security issues:" msgstr "ÎÏ Ïή η ÎκδοÏη ÏÎ¿Ï Tails ÎÏει γνÏÏÏά ÏÏοβλήμαÏα αÏÏαλείαÏ:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45 #, sh-format msgid "Network card ${nic} disabled" msgstr "ÎάÏÏα δικÏÏÎ¿Ï ${nic} αÏενεÏγοÏοιημÎνη" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the documentation." msgstr "MAC ÏλαÏÏογÏάÏηÏη αÏÎÏÏ Ïε για Ïην κάÏÏα δικÏÏÎ¿Ï ${nic_name} (${nic}) εÏομÎνÏÏ ÎÏει αÏενεÏγοÏοιηθεί ÏÏοÏÏÏινά.\nÎÏÏÏ ÏÏοÏιμάÏε να κάνεÏε εÏανεκκίνηÏη Ïο Tails και να αÏενεÏγοÏοιήÏεÏε Ïην ÏλαÏÏογÏάÏηÏη MAC. ÎείÏε Ïο ÏεκμηÏίÏÏη." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55 msgid "All networking disabled" msgstr "Îλη η δικÏÏÏÏη αÏενεÏγοÏοιημÎνη" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -480,8 +481,8 @@ msgid "I2P's router console is ready" msgstr "ΠκονÏÏλα ÏÎ¿Ï Î´ÏομολογηÏή I2P είναι ÎÏοιμη" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 -msgid "You can now access I2P's router console on http://127.0.0.1:7657."; -msgstr "ÎÏοÏείÏε ÏÏÏα να ÎÏεÏε ÏÏÏÏβαÏη ÏÏην κονÏÏλα ÏÎ¿Ï ÏοÏÏÎµÏ I2P μÎÏÏ ÏÎ·Ï Î´Î¹ÎµÏÎ¸Ï Î½ÏÎ·Ï http://127.0.0.1:7657."; +msgid "You can now access I2P's router console in the I2P Browser." +msgstr "ÎÏοÏείÏε ÏÏÏα να ÎÏεÏε ÏÏÏÏβαÏη ÏÏην κονÏÏλα ÏÎ¿Ï ÏοÏÏÎµÏ I2P μÎÏÏ ÏÎ¿Ï I2P Browser." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -489,9 +490,9 @@ msgstr "Î I2P δεν είναι ÎÏοιμοÏ" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" -"Eepsite tunnel not built within six minutes. Check the router console at " -"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." -" Reconnect to the network to try again." +"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 "Eepsite ÏήÏαγγα δεν ÏÏίÏÏηκε μÎÏα Ïε Îξι λεÏÏά. ÎλÎγξÏε Ïην κονÏÏλα router ÏÏο http://127.0.0.1:7657/logs ή Ïα αÏÏεία καÏαγÏαÏÎ®Ï ÏÏο Ïάκελο / var / log / i2p για ÏεÏιÏÏÏÏεÏÎµÏ ÏληÏοÏοÏίεÏ. ÎÏαναÏÏνδεÏη με Ïο δίκÏÏ Î¿ για να ÏÏοÏÏαθήÏεÏε ξανά." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit 9604ff79151049916082efcedf7795cfa032120d Author: Translation commit bot Date: Thu Oct 8 20:45:40 2015 + Update translations for tails-misc --- el.po |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/el.po b/el.po index 640c638..2db9c85 100644 --- a/el.po +++ b/el.po @@ -12,6 +12,7 @@ # Ellie El , 2014 # firespin , 2014 # Georgios Vasileiadis , 2014 +# Ilias Giannaros , 2015 # kotkotkot , 2013 # kotkotkot , 2013 # LOUKAS SKOUROLIAKOS, 2015 @@ -21,8 +22,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-10-06 08:33+\n" -"Last-Translator: carolyn \n" +"PO-Revision-Date: 2015-10-08 20:37+\n" +"Last-Translator: Ilias Giannaros \n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -481,7 +482,7 @@ msgstr "ΠκονÏÏλα ÏÎ¿Ï Î´ÏομολογηÏή I2P είναι ÎÏοι #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console in the I2P Browser." -msgstr "" +msgstr "ÎÏοÏείÏε ÏÏÏα να ÎÏεÏε ÏÏÏÏβαÏη ÏÏην κονÏÏλα ÏÎ¿Ï ÏοÏÏÎµÏ I2P μÎÏÏ ÏÎ¿Ï I2P Browser." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -492,7 +493,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 "" +msgstr "Eepsite ÏήÏαγγα δεν ÏÏίÏÏηκε μÎÏα Ïε Îξι λεÏÏά. ÎλÎγξÏε Ïην κονÏÏλα router ÏÏο http://127.0.0.1:7657/logs ή Ïα αÏÏεία καÏαγÏαÏÎ®Ï ÏÏο Ïάκελο / var / log / i2p για ÏεÏιÏÏÏÏεÏÎµÏ ÏληÏοÏοÏίεÏ. ÎÏαναÏÏνδεÏη με Ïο δίκÏÏ Î¿ για να ÏÏοÏÏαθήÏεÏε ξανά." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 6e8708e30376bf06643b9ad0081a5792156b875a Author: Translation commit bot Date: Thu Oct 8 20:45:02 2015 + Update translations for bridgedb --- el/LC_MESSAGES/bridgedb.po | 342 ++-- 1 file changed, 172 insertions(+), 170 deletions(-) diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index 6addb92..0452c47 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -4,9 +4,10 @@ # # Translators: # Adrian Pappas , 2014 -# Aikaterini Katmada , 2015 +# Aikaterini Katmada, 2015 # andromeas , 2014 # oahanx, 2014 +# Ilias Giannaros , 2015 # isv31 <36b04...@anon.leemail.me>, 2014 # kotkotkot , 2013 # kotkotkot , 2012 @@ -16,14 +17,15 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+\n" -"PO-Revision-Date: 2015-07-28 00:04+\n" -"Last-Translator: Aikaterini Katmada \n" -"Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" +"POT-Creation-Date: 2015-07-25 03:40+\n" +"PO-Revision-Date: 2015-10-08 20:44+\n" +"Last-Translator: Ilias Giannaros \n" +"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\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: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -38,57 +40,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 "Î£Ï Î³Î³Î½Ïμη! ÎάÏι Ïήγε ÏÏÏαβά με Ïο αίÏημα ÏαÏ." -#: lib/bridgedb/strings.py:18 +#: 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 "ÎÏÏείο καÏαγÏαÏÎ®Ï Î±Î»Î»Î±Î³Ïν" + +#: 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 "ÎμÏάνιÏη QRCode" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "QRCode για ÏÎ¹Ï Î³ÎÏÏ ÏÎµÏ ÏαÏ" + +#. 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 "ÎÏÏ ÏÏι ÏαίνεÏαι, Ï ÏήÏξε Îνα ÏÏÏβλημα καÏά Ïην ανάκÏηÏη ÏÎ¿Ï QRCode ÏαÏ. " + +#: 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 "ÎοκιμάÏÏε να %s ÏάÏε ÏίÏÏ %s και να εÏιλÎξεÏε διαÏοÏεÏÎ¹ÎºÏ ÏÏÏο γÎÏÏ ÏαÏ!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Îήμα %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "ÎαÏεβάÏÏε %s Tor Browser %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Îήμα %s2%s" + +#: 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 "Îήμα %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "ΤÏÏα %s ÏÏοÏθÎÏÏε ÏÎ¹Ï Î³ÎÏÏ ÏÎµÏ ÏÏο Tor Browse
[tor-commits] [tor-messenger-build/master] Fix patch formatting for last commit
commit d69e014b17392d293173135554886b6aade199ff Author: Sukhbir Singh Date: Thu Oct 8 15:36:21 2015 -0400 Fix patch formatting for last commit --- projects/instantbird/cert-installer.patch | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/instantbird/cert-installer.patch b/projects/instantbird/cert-installer.patch index caf93bd..96b87c3 100644 --- a/projects/instantbird/cert-installer.patch +++ b/projects/instantbird/cert-installer.patch @@ -4,11 +4,11 @@ diff --git a/im/app/profile/moz.build b/im/app/profile/moz.build @@ -7,3 +7,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'mac', 'cocoa'): - DEFINES['HAVE_SHELL_SERVICE'] = 1 - + - +FINAL_TARGET_FILES.defaults.profile += [ - +'cert_override.txt', - +] + DEFINES['HAVE_SHELL_SERVICE'] = 1 ++ ++FINAL_TARGET_FILES.defaults.profile += [ ++'cert_override.txt', ++] diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in index edf01b1..78db5e4 100644 --- a/im/installer/package-manifest.in ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Update patch for jabber.ccc.de cert installer on OS X
commit 92378d4bf8ed48ef4066b9a16988dba2b92bf5fe Author: Sukhbir Singh Date: Thu Oct 8 15:18:48 2015 -0400 Update patch for jabber.ccc.de cert installer on OS X --- projects/instantbird/cert-installer.patch | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/instantbird/cert-installer.patch b/projects/instantbird/cert-installer.patch index ea5f60e..caf93bd 100644 --- a/projects/instantbird/cert-installer.patch +++ b/projects/instantbird/cert-installer.patch @@ -1,14 +1,14 @@ diff --git a/im/app/profile/moz.build b/im/app/profile/moz.build --- a/im/app/profile/moz.build +++ b/im/app/profile/moz.build -@@ -9,6 +9,7 @@ - DEFINES['HAVE_SHELL_SERVICE'] = 1 - - FINAL_TARGET_FILES.defaults.profile += [ -+'cert_override.txt', - 'localstore.rdf', - 'mimeTypes.rdf', - ] +@@ -7,3 +7,7 @@ + + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'mac', 'cocoa'): + DEFINES['HAVE_SHELL_SERVICE'] = 1 + + + +FINAL_TARGET_FILES.defaults.profile += [ + +'cert_override.txt', + +] diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in index edf01b1..78db5e4 100644 --- a/im/installer/package-manifest.in ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add my draft (in-progress) guide to getting started on tor development
commit 9e461588a6c4bebe18e7172b37bbb9e482e1fc8d Author: Nick Mathewson Date: Thu Oct 8 11:52:27 2015 -0400 Add my draft (in-progress) guide to getting started on tor development --- doc/GettingStarted.txt | 207 doc/HACKING|5 +- doc/include.am |3 +- 3 files changed, 213 insertions(+), 2 deletions(-) diff --git a/doc/GettingStarted.txt b/doc/GettingStarted.txt new file mode 100644 index 000..1f4b434 --- /dev/null +++ b/doc/GettingStarted.txt @@ -0,0 +1,207 @@ + + +(DRAFT) + + + +Getting started in Tor development +== + +Congratulations! You've found this file, and you're reading it! This +means that you might be interested in getting started in developing Tor. + +(This guide is just about Tor itself--the small network program at the +heart of the Tor network--and not about all the other programs in the +whole Tor ecosystem.) + + +If you are looking for a more bare-bones, less user-friendly information +dump of important information, you might like reading doc/HACKING +instead. You should probably read it before you write your first patch. + + +Required background +--- + +First, I'm going to assume that you can build Tor from source, and that +you know enough of the C language to read and write it. (See the README +file that comes with the Tor source for more information on building it, +and any high-quality guide to C for information on programming.) + +I'm also going to assume that you know a little bit about how to use +Git, or that you're able to fillow one of the several excellent guides +at http://git-scm.org to learn. + +Most Tor developers develop using some Unix-based system, such as Linux, +BSD, or OSX. It's okay to develop on Windows if you want, but you're +going to have a more difficult time. + + +Getting your first patch into Tor +- + +Once you've reached this point, here's what you need to know. + + 1) Get the source. + + We keep our source under version control in Git. To get the latest + version, run + git clone https://git.torproject.org/git/tor + + This will give you a checkout of the master branch. If you're + going to fix a bug that appears in a stable version, check out the + appropriate "maint" branch, as in: + + git checkout maint-0.2.7 + + 2) Find your way around the source + + Our overall code structure is explained in the "torguts" documents, + currently at +git clone https://git.torproject.org/user/nickm/torguts.git + + Find a part of the code that looks interesting to you, and start + looking around it to see how it fits together! + + We do some unusual things in our codebase. Our testing-related + practices and kludges are explained in doc/WritingTests.txt. + + If you see something that doesn't make sense, we love to get + questions! + + 3) Find something cool to hack on. + + You may already have a good idea of what you'd like to work on, or + you might be looking for a way to contribute. + + Many people have gotten started by looking for an area where they + personally felt Tor was underperforming, and investigating ways to + fix it. If you're looking for ideas, you can head to our bug + tracker at trac.torproject.org and look for tickets that have + received the "easy" tag: these are ones that developers think would + be pretty simple for a new person to work on. For a bigger + challenge, you might want to look for tickets with the "lorax" + keyword: these are tickets that the developers think might be a + good idea to build, but which we have no time to work on any time + soon. + + Or you might find another open ticket that piques your + interest. It's all fine! + + For your first patch, it is probably NOT a good idea to make + something huge or invasive. In particular, you should probably + avoid: +* Major changes spread across many parts of the codebase. +* Major changes to programming practice or coding style. +* Huge new features or protocol changes. + + 4) Meet the developers! + + We discuss stuff on the tor-dev mailing list and on the #tor-dev + IRC channel on OFTC. We're generally friendly and approachable, + and we like to talk about how Tor fits together. If we have ideas + about how something should be implemented, we'll be happy to share + them. + + We currently have a patch workshop at least once a week, where + people share patches they've made and discuss how to make them + better. The time might change in the future, but generally, + there's no bad time to talk, and ask us about patch ideas. + + 5) Do you need to write a design proposal? + + If your idea is very large, or it will require a change to Tor's + protocols, there needs to be a written design proposal be
[tor-commits] [tor-messenger-build/master] Add patch to fix OSX build
commit 6f79eec63edb3bd7ca356bec4768a0c475275dd6 Author: Nicolas Vigier Date: Thu Oct 8 17:28:34 2015 +0200 Add patch to fix OSX build --- ...move-a-dead-iOS-related-conditional-fr.mozpatch | 31 projects/instantbird/config|2 ++ 2 files changed, 33 insertions(+) diff --git a/projects/instantbird/0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch b/projects/instantbird/0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch new file mode 100644 index 000..895626e --- /dev/null +++ b/projects/instantbird/0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch @@ -0,0 +1,31 @@ +From ee0ef02a1fa4e473201bfbdcee8cea9cf5bd3357 Mon Sep 17 00:00:00 2001 +From: Ted Mielczarek +Date: Mon, 13 Jul 2015 07:20:30 -0400 +Subject: [PATCH] bug 1183129 - Remove a dead iOS-related conditional from + configure.in. r=glandium + +--HG-- +extra : rebase_source : 59f06d0f9e6734dc005e5458a05da062367d71cb +--- + configure.in | 5 + + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index f76c761739d2..7f38650138c8 100644 +--- a/configure.in b/configure.in +@@ -4345,10 +4345,7 @@ cairo-cocoa) + CXXFLAGS="$CXXFLAGS $TK_CFLAGS" + MOZ_USER_DIR="Mozilla" + MOZ_FS_LAYOUT=bundle +-# skip event loop instrumentation on UIKit for now +-if test "$MOZ_WIDGET_TOOLKIT" == "cocoa"; then +- MOZ_INSTRUMENT_EVENT_LOOP=1 +-fi ++MOZ_INSTRUMENT_EVENT_LOOP=1 + ;; + + cairo-uikit) +-- +2.1.0 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 2674ba2..a385bd0 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -130,6 +130,8 @@ input_files: - filename: block-plugins.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch enable: '[% c("var/osx") %]' + - filename: 0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch +enable: '[% c("var/osx") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] finish up doc/WritingTests.txt
commit f3804a4d6f488e2cd35001ec856ebc79ed769bbb Author: Nick Mathewson Date: Thu Oct 8 10:55:31 2015 -0400 finish up doc/WritingTests.txt --- doc/WritingTests.txt | 144 +++--- 1 file changed, 136 insertions(+), 8 deletions(-) diff --git a/doc/WritingTests.txt b/doc/WritingTests.txt index 62a17e3..977b836 100644 --- a/doc/WritingTests.txt +++ b/doc/WritingTests.txt @@ -66,6 +66,8 @@ and stuff like that. === Finding test coverage +Test coverage is a measurement of which lines your tests actually visit. + When you configure Tor with the --enable-coverage option, it should build with support for coverage in the unit tests, and in a special "tor-cov" binary. @@ -245,29 +247,155 @@ And later, you can restore the original function with: For more information, see the definitions of this mocking logic in testsupport.h. +=== Okay but what should my tests actually do? + +We talk above about "test coverage" -- making sure that your tests visit +every line of code, or every branch of code. But visiting the code isn't +enough: we want to verify that it's correct. + +So when writing tests, try to make tests that should pass with any correct +implementation of the code, and that should fail if the code doesn't do what +it's supposed to do. + +You can write "black-box" tests or "glass-box" tests. A black-box test is +one that you write without looking at the structure of the function. A +glass-box one is one you implement while looking at how the function is +implemented. + +In either case, make sure to consider common cases *and* edge cases; success +cases and failure csaes. + +For example, consider testing this function: + + /** Remove all elements E from sl such that E==element. Preserve + * the order of any elements before E, but elements after E can be + * rearranged. + */ + void smartlist_remove(smartlist_t *sl, const void *element); + +In order to test it well, you should write tests for at least all of the +following cases. (These would be black-box tests, since we're only looking +at the declared behavior for the function: + + * Remove an element that is in the smartlist. + * Remove an element that is not in the smartlist. + * Remove an element that appears in the smartlist more than once. + +And your tests should verify that it behaves correct. At minimum, you should +test: + + * That other elements before E are in the same order after you call the + functions. + * That the target element is really removed. + * That _only_ the target element is removed. + +When you consider edge cases, you might try: + + * Remove an element from an empty list. + * Remove an element from a singleton list containing that element. + * Remove an element for a list containing several instances of that + element, and nothing else. + +Now let's look at the implementation: + + void + smartlist_remove(smartlist_t *sl, const void *element) + { +int i; +if (element == NULL) + return; +for (i=0; i < sl->num_used; i++) + if (sl->list[i] == element) { +sl->list[i] = sl->list[--sl->num_used]; /* swap with the end */ +i--; /* so we process the new i'th element */ +sl->list[sl->num_used] = NULL; + } + } + +Based on the implementation, we now see three more edge cases to test: + + * Removing NULL from the list. + * Removing an element from the end of the list + * Removing an element from a position other than the end of the list. + + +=== What should my tests NOT do? + +Tests shouldn't require a network connection. + +Whenever possible, tests shouldn't take more than a second. Put the test +into test/slow if it genuinely needs to be run. + +Tests should not alter global state unless they run with TT_FORK: Tests +should not require other tests to be run before or after them. + +Tests should not leak memory or other resources. + +When possible, tests should not be over-fit to the implementation. That is, +the test should verify that the documented behavior is implemented, but +should not break if other permissible behavior is later implemented. + === Advanced techniques: Namespaces - write this. danah boyd made us some really awesome stuff here. +Sometimes, when you're doing a lot of mocking at once, it's convenient to +isolate your identifiers within a single namespace. If this were C++, we'd +already have namespaces, but for C, we do the best we can with macros and +token-pasting. + +We have some macros defined for this purpose in src/test/test.h. To use +them, you define NS_MODULE to a prefix to be used for your identifiers, and +then use other macros in place of identifier names. See src/test/test.h for +more documentation. Integration tests: Calling Tor from the outside --- - WRITEME +Some tests need to invoke Tor from the outside, and shouldn't run from the +same process as the Tor test program. Reasons fo
[tor-commits] [doctor/master] Revert '[DocTor]' prefix
commit 35f8c2b222a17442d50804dc02c1cc2bfe03aad7 Author: Damian Johnson Date: Thu Oct 8 07:38:16 2015 -0700 Revert '[DocTor]' prefix Forgot email lists already add a '[my-list]' prefix. This is redundant, and only came up because David's getting these emails directly. In just a couple days they'll be going to bad-relays@ so better to drop this. This reverts commit ecaea9ab16bd371e9b2a66794eef01fd287bd2de. --- util.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util.py b/util.py index 7d5878f..9440d4c 100644 --- a/util.py +++ b/util.py @@ -89,7 +89,7 @@ def send(subject, body, to = TO_ADDRESSES, cc = None, bcc = None): """ msg = MIMEMultipart('alternative') - msg['Subject'] = '[DocTor] ' + subject + msg['Subject'] = subject msg['From'] = FROM_ADDRESS msg['To'] = ','.join(to) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits