[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 66e1131d451cef79ce43bea5dcfa08cc4ab0413c Author: Translation commit botDate: Wed Oct 7 20:15:04 2015 + Update translations for bridgedb --- es_MX/LC_MESSAGES/bridgedb.po | 338 + 1 file changed, 170 insertions(+), 168 deletions(-) diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po index 6c1079e..09acfc8 100644 --- a/es_MX/LC_MESSAGES/bridgedb.po +++ b/es_MX/LC_MESSAGES/bridgedb.po @@ -4,18 +4,20 @@ # # Translators: # manuelglz , 2014 +# Javier Flores Topete , 2015 # TheFreeman , 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'POT-Creation-Date: 2015-03-19 22:13+\n" -"PO-Revision-Date: 2015-04-19 08:23+\n" -"Last-Translator: runasand \n" -"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/torproject/language/es_MX/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" +"POT-Creation-Date: 2015-07-25 03:40+\n" +"PO-Revision-Date: 2015-10-07 20:02+\n" +"Last-Translator: Javier Flores Topete \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\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: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -30,57 +32,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 "Perdón!Algo salió mal con tu cuestionario" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: 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 "" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "No" + +#: 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."
[tor-commits] [translation/tor_animation] Update translations for tor_animation
commit 46324cc6936c59262bee20bb90e82fe6f89a25e7 Author: Translation commit botDate: Wed Oct 7 20:16:23 2015 + Update translations for tor_animation --- es_MX.srt | 54 +++--- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/es_MX.srt b/es_MX.srt index 78c998d..c32829c 100644 --- a/es_MX.srt +++ b/es_MX.srt @@ -9,7 +9,7 @@ about ourselves and our private lives: 3 00:00:08,000 --> 00:00:09,960 -food we eat, people we meet, +Nos hemos acostumbrado al internet 4 00:00:10,180 --> 00:00:12,480 @@ -40,126 +40,126 @@ and so much more information about you and your life 10 -00:00:29,620 --> 00:00:32,460 +00:00:29,200 --> 00:00:31,500 which you probably didn't mean to share with unknown strangers, 11 -00:00:32,920 --> 00:00:35,840 +00:00:31,700 --> 00:00:34,000 who could easily use this data to exploit you. 12 -00:00:36,220 --> 00:00:38,120 +00:00:34,500 --> 00:00:37,000 But not if you're using Tor! 13 -00:00:39,140 --> 00:00:42,840 +00:00:37,140 --> 00:00:40,840 Tor Browser protects our privacy and identity on the Internet. 14 -00:00:43,560 --> 00:00:46,760 +00:00:41,560 --> 00:00:44,760 Tor secures your connection with three layers of encryption 15 -00:00:46,940 --> 00:00:51,760 +00:00:44,940 --> 00:00:49,760 and passes it through three voluntarily operated servers around the world, 16 -00:00:52,280 --> 00:00:55,520 +00:00:50,280 --> 00:00:53,520 which enables us to communicate anonymously over the Internet. 17 -00:00:58,560 --> 00:01:00,280 +00:00:56,560 --> 00:00:58,280 Tor also protects our data 18 -00:01:00,400 --> 00:01:03,900 +00:00:58,400 --> 00:01:01,900 against corporate or government targeted and mass surveillance. 19 -00:01:04,880 --> 00:01:09,340 +00:01:02,880 --> 00:01:07,340 Perhaps you live in a repressive country which tries to control and surveil the Internet. 20 -00:01:09,900 --> 00:01:13,800 +00:01:07,900 --> 00:01:11,800 Or perhaps you don't want big corporations taking advantage of your personal information. 21 -00:01:14,880 --> 00:01:17,640 +00:01:12,880 --> 00:01:15,640 Tor makes all of its users to look the same 22 -00:01:17,920 --> 00:01:20,800 +00:01:15,920 --> 00:01:18,800 which confuses the observer and makes you anonymous. 23 -00:01:21,500 --> 00:01:24,980 +00:01:19,500 --> 00:01:22,980 So, the more people use the Tor network, the stronger it gets 24 -00:01:25,140 --> 00:01:29,800 +00:01:23,140 --> 00:01:27,800 as it's easier to hide in a crowd of people who look exactly the same. 25 -00:01:30,700 --> 00:01:33,240 +00:01:28,700 --> 00:01:31,240 You can bypass the censorship without being worried about 26 -00:01:33,400 --> 00:01:36,100 +00:01:31,400 --> 00:01:34,100 the censor knowing what you do on the Internet. 27 -00:01:38,540 --> 00:01:41,440 +00:01:36,540 --> 00:01:39,440 The ads won't follow you everywhere for months, 28 -00:01:41,640 --> 00:01:43,300 +00:01:39,640 --> 00:01:41,300 starting when you first clicked on a product. 29 -00:01:45,880 --> 00:01:49,380 +00:01:43,880 --> 00:01:47,380 By using Tor, the sites you visit won't even know who you are, 30 -00:01:49,540 --> 00:01:51,760 +00:01:47,540 --> 00:01:49,760 from what part of the world you're visiting them, 31 -00:01:51,920 --> 00:01:53,920 +00:01:49,920 --> 00:01:51,920 unless you login and tell them so. 32 -00:01:56,200 --> 00:01:57,840 +00:01:54,200 --> 00:01:55,840 By downloading and using Tor, 33 -00:01:58,200 --> 00:02:00,560 +00:01:56,200 --> 00:01:58,560 you can protect the people who need anonymity, 34 -00:02:00,880 --> 00:02:03,640 +00:01:58,880 --> 00:02:01,640 like activists, journalists and bloggers. 35 -00:02:04,000 --> 00:02:09,000 +00:02:02,000 --> 00:02:07,000 Download and use Tor! Or run a relay! ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
commit ec08950d5ff5e0cecc846a7f1fdf56836135746d Author: Translation commit botDate: Wed Oct 7 20:16:00 2015 + Update translations for torbutton-brandproperties --- es_MX/brand.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_MX/brand.properties b/es_MX/brand.properties index 5dbd181..88d5b57 100644 --- a/es_MX/brand.properties +++ b/es_MX/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShorterName=Tor Browser +brandShorterName=Explorador de Tor brandShortName=Navegador Tor brandFullName=Navegador Tor vendorShortName=Proyecto Tor ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/mat-gui] Update translations for mat-gui
commit ce24eda1c89efa44847c1c5458238cfd447989a9 Author: Translation commit botDate: Wed Oct 7 20:15:39 2015 + Update translations for mat-gui --- es_MX.po |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/es_MX.po b/es_MX.po index af4021b..bd3156d 100644 --- a/es_MX.po +++ b/es_MX.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Javier Flores Topete , 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-02-23 08:18+\n" -"Last-Translator: runasand \n" -"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/torproject/language/es_MX/)\n" +"PO-Revision-Date: 2015-10-07 19:59+\n" +"Last-Translator: Javier Flores Topete \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,7 +20,7 @@ msgstr "" #: mat-gui:62 mat-gui:407 mat-gui:430 msgid "Ready" -msgstr "" +msgstr "Listo" #: mat-gui:129 msgid "Choose files" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup
commit 349297715df2505656fa845b5dc4c948a8ed9a8e Author: Translation commit botDate: Wed Oct 7 20:15:27 2015 + Update translations for tails-persistence-setup --- es_MX/es_MX.po | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/es_MX/es_MX.po b/es_MX/es_MX.po index 28a1e99..2336622 100644 --- a/es_MX/es_MX.po +++ b/es_MX/es_MX.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Javier Flores Topete , 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" -"POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-02-24 10:24+\n" -"Last-Translator: runasand \n" -"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/torproject/language/es_MX/)\n" +"POT-Creation-Date: 2015-08-05 19:02+0200\n" +"PO-Revision-Date: 2015-10-07 19:59+\n" +"Last-Translator: Javier Flores Topete \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,7 +20,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:48 msgid "Personal Data" -msgstr "" +msgstr "Datos personales" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
commit 904e40e644af2671122907c40b68c6f41c4c8787 Author: Translation commit botDate: Wed Oct 7 20:15:48 2015 + Update translations for tor-launcher-network-settings --- es_MX/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_MX/network-settings.dtd b/es_MX/network-settings.dtd index 5112f08..dc981d1 100644 --- a/es_MX/network-settings.dtd +++ b/es_MX/network-settings.dtd @@ -1,4 +1,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fix some 64bit issues
commit 3780a6b4393b9a6faaa3d7af0674e5050ad9300b Author: Nick MathewsonDate: Wed Oct 7 16:54:29 2015 -0400 Fix some 64bit issues --- src/test/test_rendcache.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 01eeecb..e484858 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -1128,7 +1128,7 @@ test_rend_cache_entry_allocation(void *data) { (void)data; - int ret; + size_t ret; rend_cache_entry_t *e; // Handles a null argument ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
commit 5ac431fdca4c4d07d1e727ab595bfa7ca8db7d5a Author: Translation commit botDate: Wed Oct 7 20:16:04 2015 + Update translations for torbutton-brandproperties_completed --- es_MX/brand.properties |1 + 1 file changed, 1 insertion(+) diff --git a/es_MX/brand.properties b/es_MX/brand.properties index 5684797..88d5b57 100644 --- a/es_MX/brand.properties +++ b/es_MX/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Explorador de Tor brandShortName=Navegador Tor brandFullName=Navegador Tor vendorShortName=Proyecto Tor ___ 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 07013512902ef284a7d35e583797b9eae08c0a02 Author: Translation commit botDate: Wed Oct 7 20:15:53 2015 + Update translations for tails-misc --- es_MX.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es_MX.po b/es_MX.po index 3ee7964..63f8a04 100644 --- a/es_MX.po +++ b/es_MX.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Javier Flores Topete , 2015 msgid "" 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 09:20+\n" -"Last-Translator: carolyn \n" +"PO-Revision-Date: 2015-10-07 20:04+\n" +"Last-Translator: Javier Flores Topete \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43 msgid "Tor is ready" -msgstr "" +msgstr "Tor está listo" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44 msgid "You can now access the Internet." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] Update translations for https_everywhere
commit c089da9653084a292f627c20c0cfb57ac955cf75 Author: Translation commit botDate: Wed Oct 7 20:15:18 2015 + Update translations for https_everywhere --- es_MX/https-everywhere.dtd |4 ++-- es_MX/ssl-observatory.dtd |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es_MX/https-everywhere.dtd b/es_MX/https-everywhere.dtd index cd3154a..a5b5df1 100644 --- a/es_MX/https-everywhere.dtd +++ b/es_MX/https-everywhere.dtd @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/es_MX/ssl-observatory.dtd b/es_MX/ssl-observatory.dtd index d557f93..a5db5b5 100644 --- a/es_MX/ssl-observatory.dtd +++ b/es_MX/ssl-observatory.dtd @@ -1,5 +1,5 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] update codegen script to work with latest mozilla
commit a02f6e3d23c987977ea3ea20d93779b5ca562dbd Author: Nick MathewsonDate: Wed Oct 7 16:24:30 2015 -0400 update codegen script to work with latest mozilla --- scripts/codegen/get_mozilla_ciphers.py |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/codegen/get_mozilla_ciphers.py b/scripts/codegen/get_mozilla_ciphers.py index e0a662b..e673ec7 100644 --- a/scripts/codegen/get_mozilla_ciphers.py +++ b/scripts/codegen/get_mozilla_ciphers.py @@ -29,7 +29,7 @@ def ossl(s): # # Read the cpp file to understand what Ciphers map to what name : # Make "ciphers" a map from name used in the javascript to a cipher macro name -fileA = open(ff('security/manager/ssl/src/nsNSSComponent.cpp'),'r') +fileA = open(ff('security/manager/ssl/nsNSSComponent.cpp'),'r') # The input format is a file containing exactly one section of the form: # static CipherPref CipherPrefs[] = { @@ -71,7 +71,7 @@ for line in cipherLines: assert not key_pending key_pending = m.group(1) continue -m = re.search(r'^\s*(\S+)(?:,\s*(true|false))?\s*}', line) +m = re.search(r'^\s*(\S+)(?:,\s*(true|false))+\s*}', line) if m: assert key_pending key = key_pending @@ -107,7 +107,7 @@ fileC.close() # Build a map enabled_ciphers from javascript name to "true" or "false", # and an (unordered!) list of the macro names for those ciphers that are # enabled. -fileB = open(ff('netwerk/base/public/security-prefs.js'), 'r') +fileB = open(ff('netwerk/base/security-prefs.js'), 'r') enabled_ciphers = {} for line in fileB: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit 831b685b2623292b7fcd7fa1c2667eb83d6467c5 Author: Translation commit botDate: Thu Oct 8 00:15:48 2015 + Update translations for abouttor-homepage --- fr/aboutTor.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd index 576ca2f..67e55ef 100644 --- a/fr/aboutTor.dtd +++ b/fr/aboutTor.dtd @@ -8,7 +8,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed
commit 55e96cdcb46ff5edfcb0a102054d19bcccbc7d7e Author: Translation commit botDate: Thu Oct 8 00:15:33 2015 + Update translations for mat-gui_completed --- ar.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar.po b/ar.po index aef24ea..bb3c4c1 100644 --- a/ar.po +++ b/ar.po @@ -12,9 +12,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-02-23 08:18+\n" +"PO-Revision-Date: 2015-10-07 23:47+\n" "Last-Translator: runasand \n" -"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" +"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/mat-gui] Update translations for mat-gui
commit 663dcaaced7717d6496bfea857572ed771d6a191 Author: Translation commit botDate: Thu Oct 8 00:15:28 2015 + Update translations for mat-gui --- ar.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar.po b/ar.po index aef24ea..bb3c4c1 100644 --- a/ar.po +++ b/ar.po @@ -12,9 +12,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-02-23 08:18+\n" +"PO-Revision-Date: 2015-10-07 23:47+\n" "Last-Translator: runasand \n" -"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" +"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
commit eaaed94ea3c8b4b8190320f121a67ee8bdca5189 Author: Translation commit botDate: Thu Oct 8 00:15:52 2015 + Update translations for abouttor-homepage_completed --- fr/aboutTor.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/aboutTor.dtd b/fr/aboutTor.dtd index 576ca2f..67e55ef 100644 --- a/fr/aboutTor.dtd +++ b/fr/aboutTor.dtd @@ -8,7 +8,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
commit 315430f13589bfdfe773f0f5a4e63e62588d3735 Author: Translation commit botDate: Thu Oct 8 00:16:00 2015 + Update translations for torbutton-brandproperties_completed --- ar/brand.properties |1 + 1 file changed, 1 insertion(+) diff --git a/ar/brand.properties b/ar/brand.properties index b1b159d..75c5fd1 100644 --- a/ar/brand.properties +++ b/ar/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=٠تصÙØ Tor brandShortName=٠تصÙØ ØªÙر brandFullName=٠تصÙØ ØªÙر vendorShortName=٠شرÙع تÙر ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties
commit 6afeda2326a804f58d02e0b76581d0c284bded09 Author: Translation commit botDate: Thu Oct 8 00:16:35 2015 + Update translations for tor-messenger-conversationsproperties --- ar/conversations.properties |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/conversations.properties b/ar/conversations.properties index 1a5564a..9687c45 100644 --- a/ar/conversations.properties +++ b/ar/conversations.properties @@ -61,11 +61,11 @@ topicCleared=%1$S has cleared the topic. # nickname in a conversation. # %1$S is the old nick. # %2$S is the new nick. -nickSet=%1$S is now known as %2$S. +nickSet=%1$S ٠عرÙ٠اÙØ¢Ù ÙÙ %2$S. # LOCALIZATION NOTE (nickSet.you): # This is displayed as a system message when your nickname is changed. # %S is your new nick. -nickSet.you=You are now known as %S. +nickSet.you=Ø£Ùت اÙآ٠٠عرÙÙ ÙÙ %S # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
commit 23e6a2c7719c99c97a2dd9c61dc9125270d37470 Author: Translation commit botDate: Thu Oct 8 00:46:00 2015 + Update translations for torbutton-torbuttondtd --- fr/torbutton.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd index c7976bc..5308ece 100644 --- a/fr/torbutton.dtd +++ b/fr/torbutton.dtd @@ -34,7 +34,7 @@ - + ___ 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] Rebase patches for mozilla-release; Thunderbird 41 tag
commit 6577dd1b7657091c2c46719e10471fc677cb05ca Author: Sukhbir SinghDate: Wed Oct 7 21:58:35 2015 -0400 Rebase patches for mozilla-release; Thunderbird 41 tag --- ...e-the-default-Firefox-profile-director.mozpatch | 65 +--- projects/instantbird/search-preferences-xul.patch |8 +-- projects/instantbird/top-protocols.patch |3 +- 3 files changed, 35 insertions(+), 41 deletions(-) diff --git a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch index a3ca392..abdf109 100644 --- a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch +++ b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch @@ -25,7 +25,7 @@ index 7d09374ba773..417ebee773ba 100644 #include "mozilla/Services.h" #include "mozilla/Omnijar.h" #include "mozilla/Preferences.h" -@@ -200,9 +201,6 @@ nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult, +@@ -197,9 +198,6 @@ aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -35,7 +35,7 @@ index 7d09374ba773..417ebee773ba 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -225,9 +223,6 @@ nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult, +@@ -222,9 +220,6 @@ aProfileName, aAppName, aVendorName); if (NS_SUCCEEDED(rv)) { @@ -45,7 +45,7 @@ index 7d09374ba773..417ebee773ba 100644 // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { -@@ -1222,90 +1217,45 @@ nsresult +@@ -1219,82 +1214,44 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) @@ -84,42 +84,44 @@ index 7d09374ba773..417ebee773ba 100644 +rv = localDir->GetNativeLeafName(removedName); +NS_ENSURE_SUCCESS(rv, rv); +bool didRemove = !removedName.Equals("."); - -- rv = dirFileMac->InitWithFSRef(); -- NS_ENSURE_SUCCESS(rv, rv); +// Remove a directory component. +nsCOMPtr parentDir; +rv = localDir->GetParent(getter_AddRefs(parentDir)); +NS_ENSURE_SUCCESS(rv, rv); +localDir = parentDir; ++ ++if (didRemove) ++ --levelsToRemove; ++ } + +- rv = dirFileMac->InitWithFSRef(); ++ if (!localDir) ++return NS_ERROR_FAILURE; ++ ++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" ++ XPCOM_FILE_PATH_SEPARATOR "Data" ++ XPCOM_FILE_PATH_SEPARATOR "Browser")); + NS_ENSURE_SUCCESS(rv, rv); - localDir = do_QueryInterface(dirFileMac, ); --#elif defined(XP_IOS) -- nsAutoCString userDir; -- if (GetUIKitDirectory(aLocal, userDir)) { --rv = NS_NewNativeLocalFile(userDir, true, getter_AddRefs(localDir)); -- } else { --rv = NS_ERROR_FAILURE; -- } -- NS_ENSURE_SUCCESS(rv, rv); -#elif defined(XP_WIN) - nsString path; -- if (aLocal) { + if (aLocal) { -rv = GetShellFolderPath(CSIDL_LOCAL_APPDATA, path); -if (NS_FAILED(rv)) - rv = GetRegWindowsAppDataFolder(aLocal, path); -- } ++rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); ++NS_ENSURE_SUCCESS(rv, rv); + } - if (!aLocal || NS_FAILED(rv)) { -rv = GetShellFolderPath(CSIDL_APPDATA, path); -if (NS_FAILED(rv)) { - if (!aLocal) -rv = GetRegWindowsAppDataFolder(aLocal, path); -} -+if (didRemove) -+ --levelsToRemove; - } +- } - NS_ENSURE_SUCCESS(rv, rv); - +- - rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir)); -#elif defined(MOZ_WIDGET_GONK) - rv = NS_NewNativeLocalFile(NS_LITERAL_CSTRING("/data/b2g"), true, @@ -127,18 +129,13 @@ index 7d09374ba773..417ebee773ba 100644 -#elif defined(XP_UNIX) - const char* homeDir = getenv("HOME"); - if (!homeDir || !*homeDir) -+ if (!localDir) - return NS_ERROR_FAILURE; - +-return NS_ERROR_FAILURE; +- -#ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */ - aLocal = false; -#endif -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger" -+ XPCOM_FILE_PATH_SEPARATOR "Data" -+ XPCOM_FILE_PATH_SEPARATOR "Browser")); -+ NS_ENSURE_SUCCESS(rv, rv); - - if (aLocal) { +- +- if (aLocal) { -// If $XDG_CACHE_HOME is defined use it, otherwise use $HOME/.cache. -const char* cacheHome = getenv("XDG_CACHE_HOME"); -if (cacheHome && *cacheHome) { @@ -153,16 +150,14 @@ index 7d09374ba773..417ebee773ba 100644 - } else { -rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, -
[tor-commits] [translation/tor-messenger-loggerproperties] Update translations for tor-messenger-loggerproperties
commit d3ba0aec0b157ebe19585459ca41f2c8fea1430f Author: Translation commit botDate: Thu Oct 8 01:16:50 2015 + Update translations for tor-messenger-loggerproperties --- zh_TW/logger.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/logger.properties b/zh_TW/logger.properties index 2228c50..8b270ac 100644 --- a/zh_TW/logger.properties +++ b/zh_TW/logger.properties @@ -4,4 +4,4 @@ # LOCALIZATION NOTE (badLogfile): # %S is the filename of the log file. -badLogfile=Empty or corrupt log file: %S +badLogfile=空ç½ææå£çæ¥èªæ件ï¼%S ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
commit a35269eaf651bd72cce44e0aeeb5af8a73306bc3 Author: Translation commit botDate: Thu Oct 8 04:15:50 2015 + Update translations for torbutton-torbuttonproperties --- zh_TW/torbutton.properties | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/zh_TW/torbutton.properties b/zh_TW/torbutton.properties index 7da4acf..5a10135 100644 --- a/zh_TW/torbutton.properties +++ b/zh_TW/torbutton.properties @@ -1,12 +1,12 @@ torbutton.button.tooltip.disabled = åç¨ Tor torbutton.button.tooltip.enabled = åç¨ Tor -torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown -torbutton.circuit_display.onion_site = Onion site -torbutton.circuit_display.this_browser = This browser -torbutton.circuit_display.relay = relay -torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.internet = 網é網路 +torbutton.circuit_display.ip_unknown = æªç¥IP +torbutton.circuit_display.onion_site = æ´è¥ç¶²ç« +torbutton.circuit_display.this_browser = æ¤çè¦½å¨ +torbutton.circuit_display.relay = ä¸ç¹¼ç« +torbutton.circuit_display.tor_bridge = æ©æ¥å¨ +torbutton.circuit_display.unknown_country = æªç¥å家 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. torbutton.panel.tooltip.disabled = æä¸ä¸ä»¥åç¨ Tor torbutton.panel.tooltip.enabled = æä¸ä¸ä»¥åç¨ Tor @@ -54,10 +54,10 @@ torbutton.popup.short_torbrowser = éè¦ç Torbutton è³è¨!\n\nTorbutton ç¾ torbutton.popup.confirm_plugins = å¦ Flash çå¤æç¨å¼å¯è½æå±å®³æ¨çé±ç§åå¿åæ§ã\n\nå®åéå¯ä»¥ç¹é Torï¼æ示æ¨ç®åæå¨çä½ç½®å IP ä½åã\n\næ¨ç¢ºå®è¦åç¨å¤æç¨å¼å?\n torbutton.popup.never_ask_again = ä¸è¦ååæ -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = Torç覽å¨å°ééææè¦çªååé ãææ網ç«çæ話é½å°ä¸å¤±ã\n\nç¾å¨éæ°ååTorç覽å¨ä¾éæ°è¨ç½®æ¨ç身份ï¼\n\n torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification_button = æéå®å ¨æ§è¨ç½® torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. @@ -72,7 +72,7 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem +profileProblemTitle=%S é ç½®åé¡ profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
commit 081417113b102c01e793b7664eaf4135ab6af512 Author: Translation commit botDate: Thu Oct 8 04:16:28 2015 + Update translations for tor-messenger-fingerdtd --- zh_TW/finger.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/finger.dtd b/zh_TW/finger.dtd index f40e1a4..0053433 100644 --- a/zh_TW/finger.dtd +++ b/zh_TW/finger.dtd @@ -5,6 +5,6 @@ - + \ No newline at end of file ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
commit e62ea46eadbd8ce6d0fede4c110de13a751f1159 Author: Translation commit botDate: Thu Oct 8 04:16:12 2015 + Update translations for tor-messenger-authdtd --- zh_TW/auth.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/auth.dtd b/zh_TW/auth.dtd index dae80fa..d8b5450 100644 --- a/zh_TW/auth.dtd +++ b/zh_TW/auth.dtd @@ -1,5 +1,5 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [doctor/master] Suppressions were indefinite, blocking further notices
commit bd1f80683e3d028da25214c82cece0eb1455c204 Author: Damian JohnsonDate: Wed Oct 7 18:25:17 2015 -0700 Suppressions were indefinite, blocking further notices Oops, when checking for suppressions we updated the 'last notified' timestamp, so we were perpetually suppressed. *facepalm* --- fingerprint_change_checker.py | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/fingerprint_change_checker.py b/fingerprint_change_checker.py index c1d2474..71673ca 100755 --- a/fingerprint_change_checker.py +++ b/fingerprint_change_checker.py @@ -94,6 +94,15 @@ def main(): except Exception as exc: log.warn("Unable to send email: %s" % exc) +# register that we've notified for these + +current_time = str(int(time.time())) + +for address, or_port in alarm_for: + last_notified_config.set('%s:%s' % (address, or_port), current_time) + +last_notified_config.save() + save_fingerprint_changes(fingerprint_changes) @@ -153,8 +162,7 @@ def is_notification_suppressed(fingerprint_changes): for address, or_port in fingerprint_changes: key = '%s:%s' % (address, or_port) -current_time = int(time.time()) -suppression_time = ONE_DAY - (current_time - last_notified_config.get(key, 0)) +suppression_time = ONE_DAY - (int(time.time()) - last_notified_config.get(key, 0)) if suppression_time < 0: log.debug("* notification for %s isn't suppressed" % key) @@ -162,9 +170,6 @@ def is_notification_suppressed(fingerprint_changes): else: log.debug("* we already notified for %s recently, suppressed for %i hours" % (key, suppression_time / 3600)) -last_notified_config.set(key, str(current_time), overwrite = True) - - last_notified_config.save() return is_all_suppressed ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
commit 06b0c4c494a7ec0a6ddba22b72be9464e579bb7c Author: Translation commit botDate: Thu Oct 8 04:16:41 2015 + Update translations for tor-messenger-prefsdtd --- zh_TW/prefs.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/prefs.dtd b/zh_TW/prefs.dtd index f37fdd3..88ae04c 100644 --- a/zh_TW/prefs.dtd +++ b/zh_TW/prefs.dtd @@ -1,4 +1,4 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
commit f2afa4a4dc87a41dd22f939b1567689e8113e4e3 Author: Translation commit botDate: Thu Oct 8 04:45:54 2015 + Update translations for torbutton-torbuttonproperties --- zh_TW/torbutton.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/torbutton.properties b/zh_TW/torbutton.properties index 5a10135..23caf54 100644 --- a/zh_TW/torbutton.properties +++ b/zh_TW/torbutton.properties @@ -56,7 +56,7 @@ torbutton.popup.confirm_plugins = å¦ Flash çå¤æç¨å¼å¯è½æå±å®³æ¨ç torbutton.popup.never_ask_again = ä¸è¦ååæ torbutton.popup.confirm_newnym = Torç覽å¨å°ééææè¦çªååé ãææ網ç«çæ話é½å°ä¸å¤±ã\n\nç¾å¨éæ°ååTorç覽å¨ä¾éæ°è¨ç½®æ¨ç身份ï¼\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = ç¾å¨ç¶ è²æ´è¥é¸å®æä¸åå®å ¨æ»åå¨ï¼å¯è®æ¨èª¿æ´æ¨çå®å ¨ç´å¥ãå¿«ä¾ççå§ï¼ torbutton.slider_notification_button = æéå®å ¨æ§è¨ç½® torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. ___ 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 32e193aa829a18daf10d6d3727579a4b082b49c6 Author: Translation commit botDate: Thu Oct 8 04:45:02 2015 + Update translations for bridgedb --- id/LC_MESSAGES/bridgedb.po | 340 ++-- 1 file changed, 171 insertions(+), 169 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index 936011e..86e66b3 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -10,19 +10,21 @@ # Dwi Cahyono, 2015 # MasIs , 2013 # L1Nus , 2014 +# Ngalim Siregar , 2015 # km242saya , 2014 -# Zamani Karmana , 2015 +# zk , 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'POT-Creation-Date: 2015-03-19 22:13+\n" -"PO-Revision-Date: 2015-09-10 13:04+\n" -"Last-Translator: Zamani Karmana \n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" +"POT-Creation-Date: 2015-07-25 03:40+\n" +"PO-Revision-Date: 2015-10-08 04:32+\n" +"Last-Translator: Ngalim Siregar \n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\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: id\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -37,68 +39,193 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "Maaf! Telah terjadi masalah dengan permintaan Anda." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Laporkan Bug" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Kode Sumber" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Catatan Perubahan" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Kontak" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Pilih Semua" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Tampilkan QRCode" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "QRCode untuk alamat jembatan Anda" + +#. 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 "Uh oh, berantakan deh!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Sepertinya terjadi galat saat mendapatkan QRCode Anda." + +#: 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 ini memuat alamat jembatan Anda. Pindai dengan pembaca QRCode untuk menyalin alamat jembatan ke perangkat seluler dan atau perangkat lain." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "Saat ini belum ada jembatan yang tersedia..." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Mungkin Anda perlu mencoba %s kembali %s dan memilih tipe jembatan yang berbeda!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Langkah %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Unduh %s Peramban Tor %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Langkah %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Dapatkan %s jembatan %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Langkah %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Sekarang %s tambahkan jembatan ke Tor Browser %s" + +#. 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
[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit 8f988f5bc24005388920b38edd2adc9f45293a79 Author: Translation commit botDate: Thu Oct 8 04:45:07 2015 + Update translations for bridgedb_completed --- id/LC_MESSAGES/bridgedb.po | 340 ++-- 1 file changed, 171 insertions(+), 169 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index 936011e..86e66b3 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -10,19 +10,21 @@ # Dwi Cahyono, 2015 # MasIs , 2013 # L1Nus , 2014 +# Ngalim Siregar , 2015 # km242saya , 2014 -# Zamani Karmana , 2015 +# zk , 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'POT-Creation-Date: 2015-03-19 22:13+\n" -"PO-Revision-Date: 2015-09-10 13:04+\n" -"Last-Translator: Zamani Karmana \n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" +"POT-Creation-Date: 2015-07-25 03:40+\n" +"PO-Revision-Date: 2015-10-08 04:32+\n" +"Last-Translator: Ngalim Siregar \n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\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: id\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -37,68 +39,193 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "Maaf! Telah terjadi masalah dengan permintaan Anda." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Laporkan Bug" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Kode Sumber" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Catatan Perubahan" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Kontak" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Pilih Semua" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Tampilkan QRCode" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "QRCode untuk alamat jembatan Anda" + +#. 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 "Uh oh, berantakan deh!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Sepertinya terjadi galat saat mendapatkan QRCode Anda." + +#: 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 ini memuat alamat jembatan Anda. Pindai dengan pembaca QRCode untuk menyalin alamat jembatan ke perangkat seluler dan atau perangkat lain." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "Saat ini belum ada jembatan yang tersedia..." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Mungkin Anda perlu mencoba %s kembali %s dan memilih tipe jembatan yang berbeda!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Langkah %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Unduh %s Peramban Tor %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Langkah %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Dapatkan %s jembatan %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Langkah %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Sekarang %s tambahkan jembatan ke Tor Browser %s" + +#. 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
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit 946b8d90be33f24d0d35489337c222a26a6eb63d Author: Translation commit botDate: Thu Oct 8 00:15:44 2015 + Update translations for tails-misc --- ar.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar.po b/ar.po index ab59e48..93d52a3 100644 --- a/ar.po +++ b/ar.po @@ -23,7 +23,7 @@ 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-03 21:44+\n" +"PO-Revision-Date: 2015-10-08 00:04+\n" "Last-Translator: AbdAlnour Sami \n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
commit f9a8a80d3196059f93202abcc27445d247e5b8cc Author: Translation commit botDate: Thu Oct 8 00:16:48 2015 + Update translations for tor-messenger-ircproperties --- ar/irc.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/irc.properties b/ar/irc.properties index 7f1e43c..942be7a 100644 --- a/ar/irc.properties +++ b/ar/irc.properties @@ -80,7 +80,7 @@ command.whois2=%S [nick]: Get information on a user. #These are shown as system messages in the conversation. #%1$S is the nick and %2$S is the nick and host of the user who joined. message.join=%1$S [%2$S] entered the room. -message.rejoined=You have rejoined the room. +message.rejoined=ÙÙد Ø¥ÙتØÙت باÙغرÙØ©. #%1$S is the nick of who kicked you. #%2$S is message.kicked.reason, if a kick message was given. message.kicked.you=You have been kicked by %1$S%2$S. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
commit fd5e32af394880c039b0f793b4de459118d8da24 Author: Translation commit botDate: Thu Oct 8 00:15:56 2015 + Update translations for torbutton-brandproperties --- ar/brand.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/brand.properties b/ar/brand.properties index 3cbd6f2..75c5fd1 100644 --- a/ar/brand.properties +++ b/ar/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShorterName=Tor Browser +brandShorterName=٠تصÙØ Tor brandShortName=٠تصÙØ ØªÙر brandFullName=٠تصÙØ ØªÙر vendorShortName=٠شرÙع تÙر ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-imtooltipproperties] Update translations for tor-messenger-imtooltipproperties
commit e794ea553794fc5df808bfffde0218f4304860bf Author: Translation commit botDate: Thu Oct 8 00:16:44 2015 + Update translations for tor-messenger-imtooltipproperties --- ar/imtooltip.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/imtooltip.properties b/ar/imtooltip.properties index ee45473..d795281 100644 --- a/ar/imtooltip.properties +++ b/ar/imtooltip.properties @@ -2,6 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -buddy.username=Username +buddy.username=إس٠اÙ٠ستخد٠buddy.account=اÙØساب contact.tags=Tags ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-messenger-loggerproperties_completed] Update translations for tor-messenger-loggerproperties_completed
commit 4f1e34a21bf1349e682f9d2cd72cd053bd4a4ce3 Author: Translation commit botDate: Thu Oct 8 01:16:54 2015 + Update translations for tor-messenger-loggerproperties_completed --- zh_TW/logger.properties |7 +++ 1 file changed, 7 insertions(+) diff --git a/zh_TW/logger.properties b/zh_TW/logger.properties new file mode 100644 index 000..8b270ac --- /dev/null +++ b/zh_TW/logger.properties @@ -0,0 +1,7 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# LOCALIZATION NOTE (badLogfile): +# %S is the filename of the log file. +badLogfile=空ç½ææå£çæ¥èªæ件ï¼%S ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.2.7] Make get_ifaddrs tests more tolerant of unusual network configs
commit c464a367728dcd123b9ad9bd0cf6a4a3e4397310 Author: teor (Tim Wilson-Brown)Date: Tue Oct 6 15:32:44 2015 +1100 Make get_ifaddrs tests more tolerant of unusual network configs * Don't assume that every test box has an IPv4 address * Don't assume that every test box has a non-local address Resolves issue #17255 released in unit tests in 0.2.7.3-rc. --- changes/ifaddrs-tests-network-configs |7 + src/test/test_address.c | 46 + 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/changes/ifaddrs-tests-network-configs b/changes/ifaddrs-tests-network-configs new file mode 100644 index 000..f7f3d3e --- /dev/null +++ b/changes/ifaddrs-tests-network-configs @@ -0,0 +1,7 @@ + o Minor fixes (unit tests, networking): +- Make get_ifaddrs_* unit tests more tolerant of different network + configurations: +- Don't assume every test box has an IPv4 address. +- Don't assume every test box has a non-localhost address. +- Closes ticket #17255. Patch by "teor". + Fix for unit tests released in 0.2.7.3. diff --git a/src/test/test_address.c b/src/test/test_address.c index 938f776..3e73c3e 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -688,16 +688,20 @@ test_address_get_if_addrs_list_internal(void *arg) results = get_interface_address_list(LOG_ERR, 1); tt_assert(results != NULL); - /* Assume every system has at least 1 non-local non-multicast IPv4 - * interface, even if it is an internal one */ - tt_int_op(smartlist_len(results),>=,1); + /* When the network is down, a system might not have any non-local + * non-multicast addresseses, not even internal ones. + * Unit tests shouldn't fail because of this. */ + tt_int_op(smartlist_len(results),>=,0); tt_assert(!smartlist_contains_localhost_tor_addr(results)); tt_assert(!smartlist_contains_multicast_tor_addr(results)); /* The list may or may not contain internal addresses */ - tt_assert(smartlist_contains_ipv4_tor_addr(results)); - tt_assert(!smartlist_contains_ipv6_tor_addr(results)); + /* Allow unit tests to pass on IPv6-only machines */ + if (smartlist_len(results) > 0) { +tt_assert(smartlist_contains_ipv4_tor_addr(results) + || smartlist_contains_ipv6_tor_addr(results)); + } done: free_interface_address_list(results); @@ -721,7 +725,10 @@ test_address_get_if_addrs_list_no_internal(void *arg) tt_assert(!smartlist_contains_multicast_tor_addr(results)); tt_assert(!smartlist_contains_internal_tor_addr(results)); -/* The list may or may not contain IPv4 addresses */ + /* if there are any addresses, they must be IPv4 */ + if (smartlist_len(results) > 0) { +tt_assert(smartlist_contains_ipv4_tor_addr(results)); + } tt_assert(!smartlist_contains_ipv6_tor_addr(results)); done: @@ -746,8 +753,11 @@ test_address_get_if_addrs6_list_internal(void *arg) tt_assert(!smartlist_contains_multicast_tor_addr(results)); /* The list may or may not contain internal addresses */ + /* if there are any addresses, they must be IPv6 */ tt_assert(!smartlist_contains_ipv4_tor_addr(results)); - /* The list may or may not contain IPv6 addresses */ + if (smartlist_len(results) > 0) { +tt_assert(smartlist_contains_ipv6_tor_addr(results)); + } done: free_interface_address6_list(results); @@ -772,7 +782,9 @@ test_address_get_if_addrs6_list_no_internal(void *arg) tt_assert(!smartlist_contains_internal_tor_addr(results)); tt_assert(!smartlist_contains_ipv4_tor_addr(results)); - /* The list may or may not contain IPv6 addresses */ + if (smartlist_len(results) > 0) { +tt_assert(smartlist_contains_ipv6_tor_addr(results)); + } done: free_interface_address6_list(results); @@ -883,16 +895,18 @@ test_address_get_if_addrs(void *arg) rv = get_interface_address(LOG_ERR, _h); - /* Assume every system has at least 1 non-local non-multicast IPv4 - * interface, even if it is an internal one */ - tt_assert(rv == 0); - tor_addr_from_ipv4h(_addr, addr_h); + /* When the network is down, a system might not have any non-local + * non-multicast IPv4 addresses, not even internal ones. + * Unit tests shouldn't fail because of this. */ + if (rv == 0) { +tor_addr_from_ipv4h(_addr, addr_h); - tt_assert(!tor_addr_is_loopback(_addr)); - tt_assert(!tor_addr_is_multicast(_addr)); - /* The address may or may not be an internal address */ +tt_assert(!tor_addr_is_loopback(_addr)); +tt_assert(!tor_addr_is_multicast(_addr)); +/* The address may or may not be an internal address */ - tt_assert(tor_addr_is_v4(_addr)); +tt_assert(tor_addr_is_v4(_addr)); + } done: return; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'
commit cd14405a431cf351abe79441214899cfee5eb670 Merge: aeb9373 c464a36 Author: Nick MathewsonDate: Wed Oct 7 15:21:23 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.7' changes/ifaddrs-tests-network-configs |7 + src/test/test_address.c | 46 + 2 files changed, 37 insertions(+), 16 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Make get_ifaddrs tests more tolerant of unusual network configs
commit c464a367728dcd123b9ad9bd0cf6a4a3e4397310 Author: teor (Tim Wilson-Brown)Date: Tue Oct 6 15:32:44 2015 +1100 Make get_ifaddrs tests more tolerant of unusual network configs * Don't assume that every test box has an IPv4 address * Don't assume that every test box has a non-local address Resolves issue #17255 released in unit tests in 0.2.7.3-rc. --- changes/ifaddrs-tests-network-configs |7 + src/test/test_address.c | 46 + 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/changes/ifaddrs-tests-network-configs b/changes/ifaddrs-tests-network-configs new file mode 100644 index 000..f7f3d3e --- /dev/null +++ b/changes/ifaddrs-tests-network-configs @@ -0,0 +1,7 @@ + o Minor fixes (unit tests, networking): +- Make get_ifaddrs_* unit tests more tolerant of different network + configurations: +- Don't assume every test box has an IPv4 address. +- Don't assume every test box has a non-localhost address. +- Closes ticket #17255. Patch by "teor". + Fix for unit tests released in 0.2.7.3. diff --git a/src/test/test_address.c b/src/test/test_address.c index 938f776..3e73c3e 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -688,16 +688,20 @@ test_address_get_if_addrs_list_internal(void *arg) results = get_interface_address_list(LOG_ERR, 1); tt_assert(results != NULL); - /* Assume every system has at least 1 non-local non-multicast IPv4 - * interface, even if it is an internal one */ - tt_int_op(smartlist_len(results),>=,1); + /* When the network is down, a system might not have any non-local + * non-multicast addresseses, not even internal ones. + * Unit tests shouldn't fail because of this. */ + tt_int_op(smartlist_len(results),>=,0); tt_assert(!smartlist_contains_localhost_tor_addr(results)); tt_assert(!smartlist_contains_multicast_tor_addr(results)); /* The list may or may not contain internal addresses */ - tt_assert(smartlist_contains_ipv4_tor_addr(results)); - tt_assert(!smartlist_contains_ipv6_tor_addr(results)); + /* Allow unit tests to pass on IPv6-only machines */ + if (smartlist_len(results) > 0) { +tt_assert(smartlist_contains_ipv4_tor_addr(results) + || smartlist_contains_ipv6_tor_addr(results)); + } done: free_interface_address_list(results); @@ -721,7 +725,10 @@ test_address_get_if_addrs_list_no_internal(void *arg) tt_assert(!smartlist_contains_multicast_tor_addr(results)); tt_assert(!smartlist_contains_internal_tor_addr(results)); -/* The list may or may not contain IPv4 addresses */ + /* if there are any addresses, they must be IPv4 */ + if (smartlist_len(results) > 0) { +tt_assert(smartlist_contains_ipv4_tor_addr(results)); + } tt_assert(!smartlist_contains_ipv6_tor_addr(results)); done: @@ -746,8 +753,11 @@ test_address_get_if_addrs6_list_internal(void *arg) tt_assert(!smartlist_contains_multicast_tor_addr(results)); /* The list may or may not contain internal addresses */ + /* if there are any addresses, they must be IPv6 */ tt_assert(!smartlist_contains_ipv4_tor_addr(results)); - /* The list may or may not contain IPv6 addresses */ + if (smartlist_len(results) > 0) { +tt_assert(smartlist_contains_ipv6_tor_addr(results)); + } done: free_interface_address6_list(results); @@ -772,7 +782,9 @@ test_address_get_if_addrs6_list_no_internal(void *arg) tt_assert(!smartlist_contains_internal_tor_addr(results)); tt_assert(!smartlist_contains_ipv4_tor_addr(results)); - /* The list may or may not contain IPv6 addresses */ + if (smartlist_len(results) > 0) { +tt_assert(smartlist_contains_ipv6_tor_addr(results)); + } done: free_interface_address6_list(results); @@ -883,16 +895,18 @@ test_address_get_if_addrs(void *arg) rv = get_interface_address(LOG_ERR, _h); - /* Assume every system has at least 1 non-local non-multicast IPv4 - * interface, even if it is an internal one */ - tt_assert(rv == 0); - tor_addr_from_ipv4h(_addr, addr_h); + /* When the network is down, a system might not have any non-local + * non-multicast IPv4 addresses, not even internal ones. + * Unit tests shouldn't fail because of this. */ + if (rv == 0) { +tor_addr_from_ipv4h(_addr, addr_h); - tt_assert(!tor_addr_is_loopback(_addr)); - tt_assert(!tor_addr_is_multicast(_addr)); - /* The address may or may not be an internal address */ +tt_assert(!tor_addr_is_loopback(_addr)); +tt_assert(!tor_addr_is_multicast(_addr)); +/* The address may or may not be an internal address */ - tt_assert(tor_addr_is_v4(_addr)); +tt_assert(tor_addr_is_v4(_addr)); + } done: return; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add tests for procmon. These currently fail. Investigation should happen before submitting
commit b4950c9334d476049b8b273ad1d8cb15a86f6074 Author: Ola BiniDate: Tue Sep 15 17:56:56 2015 +0200 Add tests for procmon. These currently fail. Investigation should happen before submitting --- src/test/include.am |2 + src/test/log_test_helpers.c | 95 +++ src/test/log_test_helpers.h | 27 src/test/test.c |3 +- src/test/test_procmon.c | 51 +++ 5 files changed, 177 insertions(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index f7c0204..b99adb9 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -51,6 +51,7 @@ src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ # matters a lot there, and is quite hard to debug if you forget to do it. src_test_test_SOURCES = \ + src/test/log_test_helpers.c \ src/test/test.c \ src/test/test_accounting.c \ src/test/test_addr.c \ @@ -84,6 +85,7 @@ src_test_test_SOURCES = \ src/test/test_oom.c \ src/test/test_options.c \ src/test/test_policy.c \ + src/test/test_procmon.c \ src/test/test_pt.c \ src/test/test_relay.c \ src/test/test_relaycell.c \ diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c new file mode 100644 index 000..42778d4 --- /dev/null +++ b/src/test/log_test_helpers.c @@ -0,0 +1,95 @@ +#define LOG_PRIVATE +#include "torlog.h" +#include "log_test_helpers.h" + +static smartlist_t *saved_logs = NULL; + +int +setup_capture_of_logs(int new_level) +{ + int previous_log = log_global_min_severity_; + log_global_min_severity_ = new_level; + mock_clean_saved_logs(); + MOCK(logv, mock_saving_logv); + return previous_log; +} + +void +teardown_capture_of_logs(int prev) +{ + UNMOCK(logv); + log_global_min_severity_ = prev; + mock_clean_saved_logs(); +} + +void +mock_clean_saved_logs(void) +{ + if (!saved_logs) +return; + SMARTLIST_FOREACH(saved_logs, mock_saved_log_entry_t *, m, +{ tor_free(m->generated_msg); tor_free(m); }); + smartlist_free(saved_logs); + saved_logs = NULL; +} + +char * +mock_saved_log_at(int ix) +{ + int saved_log_count = mock_saved_log_number(); + if(ix < 0) { +ix = saved_log_count + ix; + } + + if (saved_log_count <= ix) +return ""; + return ((mock_saved_log_entry_t *)smartlist_get(saved_logs, ix))->generated_msg; +} + +int +mock_saved_severity_at(int ix) +{ + int saved_log_count = mock_saved_log_number(); + if(ix < 0) { +ix = saved_log_count + ix; + } + + if (saved_log_count <= ix) +return -1; + return ((mock_saved_log_entry_t *)smartlist_get(saved_logs, ix))->severity; +} + +int +mock_saved_log_number(void) +{ + if (!saved_logs) +return 0; + return smartlist_len(saved_logs); +} + +const smartlist_t * +mock_saved_logs(void) +{ + return saved_logs; +} + +void +mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap) +{ + char *buf = tor_malloc_zero(10240); + int n; + n = tor_vsnprintf(buf,10240,format,ap); + buf[n]='\n'; + buf[n+1]='\0'; + + mock_saved_log_entry_t *e = tor_malloc_zero(sizeof(mock_saved_log_entry_t)); + e->severity = severity; + e->funcname = funcname; + e->suffix = suffix; + e->format = format; + e->generated_msg = buf; + + if (!saved_logs) +saved_logs = smartlist_new(); + smartlist_add(saved_logs, e); +} diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h new file mode 100644 index 000..789bfe4 --- /dev/null +++ b/src/test/log_test_helpers.h @@ -0,0 +1,27 @@ +/* Copyright (c) 2014-2015, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "or.h" + +#ifndef TOR_LOG_TEST_HELPERS_H +#define TOR_LOG_TEST_HELPERS_H + +typedef struct mock_saved_log_entry_t { + int severity; + const char *funcname; + const char *suffix; + const char *format; + char *generated_msg; + struct mock_saved_log_entry_t *next; +} mock_saved_log_entry_t; + +void mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap); +void mock_clean_saved_logs(void); +const smartlist_t *mock_saved_logs(void); +int setup_capture_of_logs(int new_level); +void teardown_capture_of_logs(int prev); +char *mock_saved_log_at(int ix); +int mock_saved_severity_at(int ix); +int mock_saved_log_number(void); + +#endif diff --git a/src/test/test.c b/src/test/test.c index e10e260..23e41b7 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1145,6 +1145,7 @@ extern struct testcase_t nodelist_tests[]; extern struct testcase_t oom_tests[]; extern struct testcase_t options_tests[]; extern struct testcase_t policy_tests[]; +extern struct testcase_t procmon_tests[]; extern struct testcase_t pt_tests[]; extern struct testcase_t relay_tests[]; extern struct testcase_t relaycell_tests[]; @@ -1192,6 +1193,7 @@ struct
[tor-commits] [tor/master] Fix "make check-spaces"
commit 5a5112f7011046033b31dedb3f376c4a488f599c Author: Nick MathewsonDate: Wed Oct 7 09:34:02 2015 -0400 Fix "make check-spaces" --- src/common/procmon.c|1 + src/test/test.c |1 + src/test/test_procmon.c |1 + 3 files changed, 3 insertions(+) diff --git a/src/common/procmon.c b/src/common/procmon.c index 8c59cad..346a0c6 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -355,3 +355,4 @@ tor_process_monitor_free(tor_process_monitor_t *procmon) tor_free(procmon); } + diff --git a/src/test/test.c b/src/test/test.c index 33a1e57..3468f7f 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1224,3 +1224,4 @@ struct testgroup_t testgroups[] = { { "dns/", dns_tests }, END_OF_GROUPS }; + diff --git a/src/test/test_procmon.c b/src/test/test_procmon.c index 6a9c209..4eff52a 100644 --- a/src/test/test_procmon.c +++ b/src/test/test_procmon.c @@ -53,3 +53,4 @@ struct testcase_t procmon_tests[] = { TT_FORK, NULL, NULL }, END_OF_TESTCASES }; + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'twstrike/procmon_tests'
commit cec2bc435ed252389d80d77ab17ba4de33ae3153 Merge: 15bfdbe ca927b7 Author: Nick MathewsonDate: Wed Oct 7 09:32:51 2015 -0400 Merge remote-tracking branch 'twstrike/procmon_tests' Conflicts: src/test/include.am src/test/log_test_helpers.c src/test/log_test_helpers.h src/common/procmon.c|4 ++-- src/test/include.am |1 + src/test/test.c |3 ++- src/test/test_procmon.c | 55 +++ 4 files changed, 60 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
commit 51cf853f0a34b00aed488265670cdaa8652ac19b Author: Translation commit botDate: Wed Oct 7 18:45:22 2015 + Update translations for liveusb-creator_completed --- vi/vi.po | 600 ++ 1 file changed, 600 insertions(+) diff --git a/vi/vi.po b/vi/vi.po new file mode 100644 index 000..7a95df7 --- /dev/null +++ b/vi/vi.po @@ -0,0 +1,600 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Hoang Thu Giang , 2014 +# Khanh Nguyen , 2015 +# Tho Nguyen , 2015 +msgid "" +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-10-07 18:45+\n" +"Last-Translator: Tho Nguyen \n" +"Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: vi\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../liveusb/gui.py:451 +msgid "\"Clone & Install\"" +msgstr "\"Tạo bản sao và Cà i Äặt\"" + +#: ../liveusb/gui.py:453 +msgid "\"Install from ISO\"" +msgstr "\"Cà i Äặt từ ISO\"" + +#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 +#, python-format +msgid "%(distribution)s Installer" +msgstr "%(distribution)s Bản cà i Äặt" + +#: ../liveusb/gui.py:804 +#, python-format +msgid "%(filename)s selected" +msgstr "%(filename)s Äược chá»n" + +#: ../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 Äã có thá» khá»i Äá»ng" + +#: ../liveusb/launcher_ui.py:156 +msgid "" +"http://www.w3.org/TR/REC-html40/strict.dtd\;>\n" +"\n" +"p, li { white-space: pre-wrap; }\n" +"\n" +"Need help? Read the documentation." +msgstr "http://www.w3.org/TR/REC-html40/strict.dtd\;>\n\np, li { white-space: pre-wrap; }\n\nCần giúp Äỡ? Hãy Äá»c Tà i liá»u." + +#: ../liveusb/launcher_ui.py:151 +msgid "" +"http://www.w3.org/TR/REC-html40/strict.dtd\;>\n" +"\n" +"p, li { white-space: pre-wrap; }\n" +"\n" +"Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost." +msgstr "http://www.w3.org/TR/REC-html40/strict.dtd\;>\n\np, li { white-space: pre-wrap; }\n\nChép há» Äiá»u hà nh Tails Äang chạy và o USB hay thẻ SD. Tất cả dữ liá»u trong á» ÄÄ©a Äó sẽ bá» mất." + +#: ../liveusb/launcher_ui.py:153 +msgid "" +"http://www.w3.org/TR/REC-html40/strict.dtd\;>\n" +"\n" +"p, li { white-space: pre-wrap; }\n" +"\n" +"Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved." +msgstr "http://www.w3.org/TR/REC-html40/strict.dtd\;>\n\np, li { white-space: pre-wrap; }\n\nChép há» Äiá»u hà nh Tails Äang chạy và o thiết bá» Äã Äược cà i Tails. Những phân vùng Äược tìm thấy trên thẻ nhá» Äược giữ lại." + +#: ../liveusb/launcher_ui.py:155 +msgid "" +"http://www.w3.org/TR/REC-html40/strict.dtd\;>\n" +"\n" +"p, li { white-space: pre-wrap; }\n" +"\n" +"Upgrade an already installed Tails device from a new ISO image." +msgstr "http://www.w3.org/TR/REC-html40/strict.dtd\;>\n\np, li { white-space: pre-wrap; }\n\nNâng cấp má»t thiết bá» Äã Äược cà i Tails từ hình ảnh ISO má»i." + +#: ../liveusb/dialog.py:154 +msgid "Alt+B" +msgstr "Alt+B" + +#: ../liveusb/dialog.py:153 +msgid "Browse" +msgstr "Duyá»t qua" + +#: ../liveusb/dialog.py:160 +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 "Bằng viá»c phân chia thêm khoảng trá»ng trên USB dà nh cho má»t vùng cá» Äá»nh, bạn có thá» lÆ°u dữ liá»u và tạo sá»± thay Äá»i vÄ©nh viá» n Äá»i vá»i há» thá»ng váºn hà nh hiá»n nay của bạn. Nếu không có nó, bạn không thá» lÆ°u dữ liá»u mà có thá» tá»n tại sau khi khá»i Äá»ng lại." + +#: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459 +#, python-format +msgid "Calculating the SHA1 of %s" +msgstr "Äang tÃnh toán SHA của %s" + +#: ../liveusb/creator.py:1407 +msgid "Cannot find" +msgstr "Không thá» tìm thấy" + +#: ../liveusb/creator.py:560 +#, python-format +msgid "Cannot find device %s" +msgstr "Không
[tor-commits] [tor/master] Fix 32-bit case of rend_cache/entry_allocation
commit aeb9373158df00d77d26245c7524db3d5f1e515c Author: Nick MathewsonDate: Wed Oct 7 14:31:21 2015 -0400 Fix 32-bit case of rend_cache/entry_allocation --- src/test/test_rendcache.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 6075d39..01eeecb 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -1138,7 +1138,7 @@ test_rend_cache_entry_allocation(void *data) // Handles a non-null argument e = tor_malloc_zero(sizeof(rend_cache_entry_t)); ret = rend_cache_entry_allocation(e); - tt_int_op(ret, OP_EQ, 88); + tt_int_op(ret, OP_GT, sizeof(rend_cache_entry_t)); done: (void)0; ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit 5449c47b598a184a3cebe2f39b4856e3c1b4d4de Author: Translation commit botDate: Wed Oct 7 18:45:18 2015 + Update translations for liveusb-creator --- vi/vi.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vi/vi.po b/vi/vi.po index 4119836..11a6395 100644 --- a/vi/vi.po +++ b/vi/vi.po @@ -5,13 +5,14 @@ # Translators: # Hoang Thu Giang , 2014 # Khanh Nguyen , 2015 +# Tho Nguyen , 2015 msgid "" 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-22 08:10+\n" -"Last-Translator: Khanh Nguyen \n" +"PO-Revision-Date: 2015-10-07 18:42+\n" +"Last-Translator: Tho Nguyen \n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -570,7 +571,7 @@ msgstr "Äã Äược viết và o thiết bá» á» %(speed)d MB/giây" 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 "Bạn Äang cà i Äặt Tails trên %(size)s %(vendor)s %(model)s thiết bá»\n(%(device)s). Tất cả dữ liá»u trên thiết bá» sẽ bá» xóa. Bạn muá»n tiếp tục?" #: ../liveusb/gui.py:715 #, python-format ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits