date:20140410

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2014-04-10 Thread translation

commit 0e5bf74a4d8e8df9a2d60c3afcdd7d45500e0a0c
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 10:15:18 2014 +

Update translations for https_everywhere_completed
---
 en_GB/https-everywhere.dtd|   47 +
 en_GB/https-everywhere.properties |8 +++
 2 files changed, 55 insertions(+)

diff --git a/en_GB/https-everywhere.dtd b/en_GB/https-everywhere.dtd
new file mode 100644
index 000..9a63c45
--- /dev/null
+++ b/en_GB/https-everywhere.dtd
@@ -0,0 +1,47 @@
+!ENTITY https-everywhere.about.title About HTTPS Everywhere
+!ENTITY https-everywhere.about.ext_name HTTPS Everywhere
+!ENTITY https-everywhere.about.ext_description Encrypt the Web! 
Automatically use HTTPS security on many sites.
+!ENTITY https-everywhere.about.version Version
+!ENTITY https-everywhere.about.created_by Created by
+!ENTITY https-everywhere.about.librarians Ruleset Librarians
+!ENTITY https-everywhere.about.thanks Thanks to
+!ENTITY https-everywhere.about.contribute  If you like HTTPS Everywhere, you 
might consider
+!ENTITY https-everywhere.about.donate_tor Donating to Tor
+!ENTITY https-everywhere.about.tor_lang_code en
+!ENTITY https-everywhere.about.donate_eff Donating to EFF
+
+!ENTITY https-everywhere.menu.about About HTTPS Everywhere
+!ENTITY https-everywhere.menu.observatory SSL Observatory Preferences
+!ENTITY https-everywhere.menu.globalEnable Enable HTTPS Everywhere
+!ENTITY https-everywhere.menu.globalDisable Disable HTTPS Everywhere
+!ENTITY https-everywhere.menu.showCounter Show Counter
+
+!ENTITY https-everywhere.prefs.title HTTPS Everywhere Preferences
+!ENTITY https-everywhere.prefs.enable_all Enable All
+!ENTITY https-everywhere.prefs.disable_all Disable All
+!ENTITY https-everywhere.prefs.reset_defaults Reset to Defaults
+!ENTITY https-everywhere.prefs.search Search
+!ENTITY https-everywhere.prefs.site Site
+!ENTITY https-everywhere.prefs.notes Notes
+!ENTITY https-everywhere.prefs.list_caption Which HTTPS redirection rules 
should apply?
+!ENTITY https-everywhere.prefs.enabled Enabled
+!ENTITY https-everywhere.prefs.ruleset_howto You can learn how to write your 
own rulesets (to add support for other web sites)
+!ENTITY https-everywhere.prefs.here_link here
+!ENTITY https-everywhere.prefs.toggle Toggle
+!ENTITY https-everywhere.prefs.reset_default Reset to Default
+!ENTITY https-everywhere.prefs.view_xml_source View XML Source
+
+!ENTITY https-everywhere.source.downloading Downloading
+!ENTITY https-everywhere.source.filename Filename
+!ENTITY https-everywhere.source.unable_to_download Unable to download 
source.
+
+!ENTITY https-everywhere.popup.title HTTPS Everywhere 4.0development.11 
notification
+!ENTITY https-everywhere.popup.paragraph1 Oops. You were using the stable 
version of HTTPS Everywhere, but we might have accidentally upgraded you to the 
development version in our last release.
+!ENTITY https-everywhere.popup.paragraph2 Would you like to go back to 
stable?
+!ENTITY https-everywhere.popup.paragraph3 We'd love it if you continued 
using our development release and helped us make HTTPS Everywhere better! You 
might find there are a few more bugs here and there, which you can report to 
https-everywh...@eff.org. Sorry about the inconvenience, and thank you for 
using HTTPS Everywhere.
+!ENTITY https-everywhere.popup.keep Keep me on the development version
+!ENTITY https-everywhere.popup.revert Download the latest stable version
+
+!ENTITY https-everywhere.ruleset-tests.status_title HTTPS Everywhere Ruleset 
Tests
+!ENTITY https-everywhere.ruleset-tests.status_cancel_button Cancel
+!ENTITY https-everywhere.ruleset-tests.status_start_button Start
diff --git a/en_GB/https-everywhere.properties 
b/en_GB/https-everywhere.properties
new file mode 100644
index 000..be83831
--- /dev/null
+++ b/en_GB/https-everywhere.properties
@@ -0,0 +1,8 @@
+https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
+https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
+https-everywhere.menu.enableDisable = Enable / Disable Rules
+https-everywhere.menu.noRules = (No Rules for This Page)
+https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
+https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle 
it on a site-by-site basis by clicking the icon in the address bar.
+https-everywhere.migration.notification0 = In order to implement a crucial 
fix, this update resets your HTTPS Everywhere rule preferences to their default 
values.
+https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests

___
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

2014-04-10 Thread translation

commit 7b683693c010ce2857797fd7223592a7918d30e9
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 10:15:24 2014 +

Update translations for tails-persistence-setup
---
 en_GB/en_GB.po |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po
index 4320c22..1902203 100644
--- a/en_GB/en_GB.po
+++ b/en_GB/en_GB.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Andi Chandler a...@gowling.com, 2014
 # richardshaylor rshay...@me.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2014-01-18 21:00+0100\n
-PO-Revision-Date: 2014-03-19 17:00+\n
-Last-Translator: richardshaylor rshay...@me.com\n
+PO-Revision-Date: 2014-04-10 10:00+\n
+Last-Translator: Andi Chandler a...@gowling.com\n
 Language-Team: English (United Kingdom) 
(http://www.transifex.com/projects/p/torproject/language/en_GB/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -84,11 +85,11 @@ msgstr Bookmarks saved in Iceweasel browser
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:128
 msgid Printers
-msgstr 
+msgstr Printers
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:130
 msgid Printers configuration
-msgstr 
+msgstr Printers configuration
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:138
 msgid APT Packages
@@ -159,7 +160,7 @@ msgstr Persistence volume is not writable. Maybe it was 
mounted read-only?
 #: ../lib/Tails/Persistence/Setup.pm:402
 #, perl-format
 msgid Tails is running from non-USB / non-SDIO device %s.
-msgstr 
+msgstr Tails is running from non-USB / non-SDIO device %s.
 
 #: ../lib/Tails/Persistence/Setup.pm:408
 #, perl-format
@@ -246,11 +247,11 @@ msgstr The Tails persistence partition will be mounted.
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283
 msgid Correcting permissions of the persistent volume.
-msgstr 
+msgstr Correcting permissions of the persistent volume.
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:286
 msgid The permissions of the persistent volume will be corrected.
-msgstr 
+msgstr The permissions of the persistent volume will be corrected.
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:308
 msgid Creating...

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-greeter_completed] Update translations for tails-greeter_completed

2014-04-10 Thread translation

commit 691b16df69029e6a48113ad7a0ff75a86f7327b2
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 10:15:32 2014 +

Update translations for tails-greeter_completed
---
 en_GB/en_GB.po |  204 
 1 file changed, 204 insertions(+)

diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po
new file mode 100644
index 000..b9ae309
--- /dev/null
+++ b/en_GB/en_GB.po
@@ -0,0 +1,204 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Andi Chandler a...@gowling.com, 2014
+# richardshaylor rshay...@me.com, 2014
+msgid 
+msgstr 
+Project-Id-Version: The Tor Project\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2014-03-17 13:54+0100\n
+PO-Revision-Date: 2014-04-10 10:00+\n
+Last-Translator: Andi Chandler a...@gowling.com\n
+Language-Team: English (United Kingdom) 
(http://www.transifex.com/projects/p/torproject/language/en_GB/)\n
+MIME-Version: 1.0\n
+Content-Type: text/plain; charset=UTF-8\n
+Content-Transfer-Encoding: 8bit\n
+Language: en_GB\n
+Plural-Forms: nplurals=2; plural=(n != 1);\n
+
+#: ../glade/persistencewindow.glade.h:1
+msgid Forward
+msgstr Forward
+
+#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
+msgid Login
+msgstr Login
+
+#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
+msgid Welcome to Tails
+msgstr Welcome to Tails
+
+#: ../glade/persistencewindow.glade.h:4
+msgid Use persistence?
+msgstr Use persistence?
+
+#: ../glade/persistencewindow.glade.h:5
+msgid a href=\doc/first_steps/persistence/use.en.html\Documentation/a
+msgstr a href=\doc/first_steps/persistence/use.en.html\Documentation/a
+
+#: ../glade/persistencewindow.glade.h:6
+msgid Yes
+msgstr Yes
+
+#: ../glade/persistencewindow.glade.h:7
+msgid No
+msgstr No
+
+#: ../glade/persistencewindow.glade.h:8
+msgid Passphrase:
+msgstr Passphrase:
+
+#: ../glade/persistencewindow.glade.h:9
+msgid Read-Only?
+msgstr Read-Only?
+
+#: ../glade/persistencewindow.glade.h:10
+msgid iWrong passphrase. Please try again./i
+msgstr iWrong passphrase. Please try again./i
+
+#: ../glade/persistencewindow.glade.h:11
+msgid More options?
+msgstr More options?
+
+#: ../glade/optionswindow.glade.h:3
+msgid Administration password
+msgstr Administration password
+
+#: ../glade/optionswindow.glade.h:4
+msgid 
+a 
+href=\doc/first_steps/startup_options/administration_password.en.html\Documentation/a
+msgstr a 
href=\doc/first_steps/startup_options/administration_password.en.html\Documentation/a
+
+#: ../glade/optionswindow.glade.h:5
+msgid 
+Enter an administration password in case you need to perform administration 
tasks.\n
+Otherwise it will be disabled for better security.
+msgstr Enter an administration password in case you need to perform 
administration tasks.\nOtherwise it will be disabled for better security.
+
+#: ../glade/optionswindow.glade.h:7
+msgid Password:
+msgstr Password:
+
+#: ../glade/optionswindow.glade.h:8
+msgid Verify Password:
+msgstr Verify Password:
+
+#: ../glade/optionswindow.glade.h:9
+msgid iPasswords do not match/i
+msgstr iPasswords do not match/i
+
+#: ../glade/optionswindow.glade.h:10
+msgid Windows camouflage
+msgstr Windows camouflage
+
+#: ../glade/optionswindow.glade.h:11
+msgid 
+a 
+href=\doc/first_steps/startup_options/windows_camouflage.en.html\Documentation/a
+msgstr a 
href=\doc/first_steps/startup_options/windows_camouflage.en.html\Documentation/a
+
+#: ../glade/optionswindow.glade.h:12
+msgid 
+This option makes Tails look more like Microsoft Windows XP. This may be 
+useful in public places in order to avoid attracting suspicion.
+msgstr This option makes Tails look more like Microsoft Windows XP. This may 
be useful in public places in order to avoid attracting suspicion.
+
+#: ../glade/optionswindow.glade.h:13
+msgid Activate Microsoft Windows XP Camouflage
+msgstr Activate Microsoft Windows XP Camouflage
+
+#: ../glade/optionswindow.glade.h:14
+msgid MAC address spoofing
+msgstr MAC address spoofing
+
+#: ../glade/optionswindow.glade.h:15
+msgid 
+a 
+href=\doc/first_steps/startup_options/mac_spoofing.en.html\Documentation/a
+msgstr a 
href=\doc/first_steps/startup_options/mac_spoofing.en.html\Documentation/a
+
+#: ../glade/optionswindow.glade.h:16
+msgid 
+Spoofing MAC addresses hides the serial number of your network cards to the 
+local networks. This can help you hide your geographical location.
+msgstr Spoofing MAC addresses hides the serial number of your network cards 
to the local networks. This can help you hide your geographical location.
+
+#: ../glade/optionswindow.glade.h:17
+msgid 
+It is generally safer to spoof MAC addresses, but it might also raise 
+suspicion or cause network connection problems.
+msgstr It is generally safer to spoof MAC addresses, but it might also raise 
suspicion or cause network connection problems.
+
+#:

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2014-04-10 Thread translation

commit db5cde8dfb7b3dd95d5b2ccaf9079f0fc461c669
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 10:15:27 2014 +

Update translations for tails-persistence-setup_completed
---
 en_GB/en_GB.po |  316 
 1 file changed, 316 insertions(+)

diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po
new file mode 100644
index 000..1902203
--- /dev/null
+++ b/en_GB/en_GB.po
@@ -0,0 +1,316 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Tails developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Andi Chandler a...@gowling.com, 2014
+# richardshaylor rshay...@me.com, 2014
+msgid 
+msgstr 
+Project-Id-Version: The Tor Project\n
+Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
+POT-Creation-Date: 2014-01-18 21:00+0100\n
+PO-Revision-Date: 2014-04-10 10:00+\n
+Last-Translator: Andi Chandler a...@gowling.com\n
+Language-Team: English (United Kingdom) 
(http://www.transifex.com/projects/p/torproject/language/en_GB/)\n
+MIME-Version: 1.0\n
+Content-Type: text/plain; charset=UTF-8\n
+Content-Transfer-Encoding: 8bit\n
+Language: en_GB\n
+Plural-Forms: nplurals=2; plural=(n != 1);\n
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:48
+msgid Personal Data
+msgstr Personal Data
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:50
+msgid Keep files stored in the `Persistent' directory
+msgstr Keep files stored in the `Persistent' directory
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:58
+msgid GnuPG
+msgstr GnuPG
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:60
+msgid GnuPG keyrings and configuration
+msgstr GnuPG keyrings and configuration
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:68
+msgid SSH Client
+msgstr SSH Client
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:70
+msgid SSH keys, configuration and known hosts
+msgstr SSH keys, configuration and known hosts
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:78
+msgid Pidgin
+msgstr Pidgin
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:80
+msgid Pidgin profiles and OTR keyring
+msgstr Pidgin profiles and OTR keyring
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:88
+msgid Claws Mail
+msgstr Claws Mail
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:90
+msgid Claws Mail profiles and locally stored email
+msgstr Claws Mail profiles and locally stored email
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:98
+msgid GNOME Keyring
+msgstr GNOME Keyring
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid Secrets stored by GNOME Keyring
+msgstr Secrets stored by GNOME Keyring
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:108
+msgid Network Connections
+msgstr Network Connections
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:110
+msgid Configuration of network devices and connections
+msgstr Configuration of network devices and connections
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:118
+msgid Browser bookmarks
+msgstr Browser bookmarks
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
+msgid Bookmarks saved in Iceweasel browser
+msgstr Bookmarks saved in Iceweasel browser
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:128
+msgid Printers
+msgstr Printers
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:130
+msgid Printers configuration
+msgstr Printers configuration
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
+msgid APT Packages
+msgstr APT Packages
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:140
+msgid Packages downloaded by APT
+msgstr Packages downloaded by APT
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:148
+msgid APT Lists
+msgstr APT Lists
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
+msgid Lists downloaded by APT
+msgstr Lists downloaded by APT
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:158
+msgid Dotfiles
+msgstr Dotfiles
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:160
+msgid 
+Symlink into $HOME every file or directory found in the `dotfiles' directory
+msgstr Symlink into $HOME every file or directory found in the `dotfiles' 
directory
+
+#: ../lib/Tails/Persistence/Setup.pm:227
+msgid Setup Tails persistent volume
+msgstr Setup Tails persistent volume
+
+#: ../lib/Tails/Persistence/Setup.pm:337
+#, perl-format
+msgid Device %s already has a persistent volume.
+msgstr Device %s already has a persistent volume.
+
+#: ../lib/Tails/Persistence/Setup.pm:345
+#, perl-format
+msgid Device %s has not enough unallocated space.
+msgstr Device %s has not enough unallocated space.
+
+#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367
+#, perl-format
+msgid Device %s has no persistent volume.
+msgstr Device %s has no persistent volume.
+
+#: ../lib/Tails/Persistence/Setup.pm:359
+msgid 
+Cannot delete the persistent volume while in use. You should restart

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2014-04-10 Thread translation

commit 36beb398d6ef69c41016a52edbbce882ea198520
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 10:15:40 2014 +

Update translations for mat-gui
---
 en_GB.po |   57 +
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/en_GB.po b/en_GB.po
index 2ae3002..1ef96ea 100644
--- a/en_GB.po
+++ b/en_GB.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Translators:
+# Andi Chandler a...@gowling.com, 2014
 # richardshaylor rshay...@me.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-01-19 14:48+\n
-PO-Revision-Date: 2014-03-19 16:51+\n
-Last-Translator: richardshaylor rshay...@me.com\n
+PO-Revision-Date: 2014-04-10 10:10+\n
+Last-Translator: Andi Chandler a...@gowling.com\n
 Language-Team: English (United Kingdom) 
(http://www.transifex.com/projects/p/torproject/language/en_GB/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -37,7 +38,7 @@ msgstr Supported files
 
 #: mat-gui:157
 msgid No metadata found
-msgstr 
+msgstr No metadata found
 
 #: mat-gui:158 mat-gui:398 mat-gui:420
 msgid Clean
@@ -50,11 +51,11 @@ msgstr Dirty
 #: mat-gui:165
 #, python-format
 msgid %s's metadata
-msgstr 
+msgstr %s's metadata
 
 #: mat-gui:176
 msgid Trash your meta, keep your data
-msgstr 
+msgstr Delete your meta, keep your data
 
 #: mat-gui:181
 msgid Website
@@ -82,7 +83,7 @@ msgstr Add non-supported (and so non-anonymised) file to 
output archive
 
 #: mat-gui:268
 msgid Unknown
-msgstr 
+msgstr Unknown
 
 #: mat-gui:310
 msgid Not-supported
@@ -90,15 +91,15 @@ msgstr Not-supported
 
 #: mat-gui:324
 msgid Harmless fileformat
-msgstr 
+msgstr Harmless fileformat
 
 #: mat-gui:326
 msgid Fileformat not supported
-msgstr 
+msgstr Fileformat not supported
 
 #: mat-gui:329
 msgid These files can not be processed:
-msgstr 
+msgstr These files can not be processed:
 
 #: mat-gui:334 mat-gui:363 data/mat.ui:292
 msgid Filename
@@ -106,54 +107,54 @@ msgstr Filename
 
 #: mat-gui:336
 msgid Reason
-msgstr 
+msgstr Reason
 
 #: mat-gui:348
 msgid Non-supported files in archive
-msgstr 
+msgstr Non-supported files in archive
 
 #: mat-gui:349 data/mat.ui:227
 msgid Scour
-msgstr 
+msgstr Scour
 
 #: mat-gui:362
 msgid Include
-msgstr 
+msgstr Include
 
 #: mat-gui:378
 #, python-format
 msgid MAT is not able to clean the following files, found in the %s archive
-msgstr 
+msgstr MAT is not able to clean the following files, found in the %s archive
 
 #: mat-gui:394
 #, python-format
 msgid Checking %s
-msgstr 
+msgstr Checking %s
 
 #: mat-gui:409
 #, python-format
 msgid Cleaning %s
-msgstr 
+msgstr Cleaning %s
 
 #: data/mat.ui:63
 msgid _File
-msgstr 
+msgstr _File
 
 #: data/mat.ui:99
 msgid _Edit
-msgstr 
+msgstr _Edit
 
 #: data/mat.ui:118 data/mat.ui:253
 msgid Clear
-msgstr 
+msgstr Clear
 
 #: data/mat.ui:134
 msgid _Process
-msgstr 
+msgstr _Process
 
 #: data/mat.ui:168
 msgid _Help
-msgstr 
+msgstr _Help
 
 #: data/mat.ui:214
 msgid Add
@@ -169,15 +170,15 @@ msgstr State
 
 #: data/mat.ui:347 data/mat.ui:499
 msgid Metadata
-msgstr 
+msgstr Metadata
 
 #: data/mat.ui:376
 msgid Name
-msgstr 
+msgstr Name
 
 #: data/mat.ui:390
 msgid Content
-msgstr 
+msgstr Content
 
 #: data/mat.ui:452
 msgid Supported formats
@@ -185,16 +186,16 @@ msgstr Supported formats
 
 #: data/mat.ui:486
 msgid Support
-msgstr 
+msgstr Support
 
 #: data/mat.ui:512
 msgid Method
-msgstr 
+msgstr Method
 
 #: data/mat.ui:525
 msgid Remaining
-msgstr 
+msgstr Remaining
 
 #: data/mat.ui:560
 msgid Fileformat
-msgstr 
+msgstr Fileformat

___
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

2014-04-10 Thread translation

commit a34ce81be25edd4e4017f16f60e6caafca6db0f1
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 10:15:43 2014 +

Update translations for mat-gui_completed
---
 en_GB.po |  201 ++
 1 file changed, 201 insertions(+)

diff --git a/en_GB.po b/en_GB.po
new file mode 100644
index 000..1ef96ea
--- /dev/null
+++ b/en_GB.po
@@ -0,0 +1,201 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Translators:
+# Andi Chandler a...@gowling.com, 2014
+# richardshaylor rshay...@me.com, 2014
+msgid 
+msgstr 
+Project-Id-Version: The Tor Project\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2014-01-19 14:48+\n
+PO-Revision-Date: 2014-04-10 10:10+\n
+Last-Translator: Andi Chandler a...@gowling.com\n
+Language-Team: English (United Kingdom) 
(http://www.transifex.com/projects/p/torproject/language/en_GB/)\n
+MIME-Version: 1.0\n
+Content-Type: text/plain; charset=UTF-8\n
+Content-Transfer-Encoding: 8bit\n
+Language: en_GB\n
+Plural-Forms: nplurals=2; plural=(n != 1);\n
+
+#: mat-gui:61 mat-gui:403 mat-gui:422
+msgid Ready
+msgstr Ready
+
+#: mat-gui:128
+msgid Choose files
+msgstr Choose files
+
+#: mat-gui:135
+msgid All files
+msgstr All files
+
+#: mat-gui:142
+msgid Supported files
+msgstr Supported files
+
+#: mat-gui:157
+msgid No metadata found
+msgstr No metadata found
+
+#: mat-gui:158 mat-gui:398 mat-gui:420
+msgid Clean
+msgstr Clean
+
+#: mat-gui:160 mat-gui:400
+msgid Dirty
+msgstr Dirty
+
+#: mat-gui:165
+#, python-format
+msgid %s's metadata
+msgstr %s's metadata
+
+#: mat-gui:176
+msgid Trash your meta, keep your data
+msgstr Delete your meta, keep your data
+
+#: mat-gui:181
+msgid Website
+msgstr Website
+
+#: mat-gui:207 data/mat.ui:107
+msgid Preferences
+msgstr Preferences
+
+#: mat-gui:220
+msgid Reduce PDF quality
+msgstr Reduce PDF quality
+
+#: mat-gui:223
+msgid Reduce the produced PDF size and quality
+msgstr Reduce the produced PDF size and quality
+
+#: mat-gui:226
+msgid Add unsupported file to archives
+msgstr Add unsupported file to archives
+
+#: mat-gui:229
+msgid Add non-supported (and so non-anonymised) file to output archive
+msgstr Add non-supported (and so non-anonymised) file to output archive
+
+#: mat-gui:268
+msgid Unknown
+msgstr Unknown
+
+#: mat-gui:310
+msgid Not-supported
+msgstr Not-supported
+
+#: mat-gui:324
+msgid Harmless fileformat
+msgstr Harmless fileformat
+
+#: mat-gui:326
+msgid Fileformat not supported
+msgstr Fileformat not supported
+
+#: mat-gui:329
+msgid These files can not be processed:
+msgstr These files can not be processed:
+
+#: mat-gui:334 mat-gui:363 data/mat.ui:292
+msgid Filename
+msgstr Filename
+
+#: mat-gui:336
+msgid Reason
+msgstr Reason
+
+#: mat-gui:348
+msgid Non-supported files in archive
+msgstr Non-supported files in archive
+
+#: mat-gui:349 data/mat.ui:227
+msgid Scour
+msgstr Scour
+
+#: mat-gui:362
+msgid Include
+msgstr Include
+
+#: mat-gui:378
+#, python-format
+msgid MAT is not able to clean the following files, found in the %s archive
+msgstr MAT is not able to clean the following files, found in the %s archive
+
+#: mat-gui:394
+#, python-format
+msgid Checking %s
+msgstr Checking %s
+
+#: mat-gui:409
+#, python-format
+msgid Cleaning %s
+msgstr Cleaning %s
+
+#: data/mat.ui:63
+msgid _File
+msgstr _File
+
+#: data/mat.ui:99
+msgid _Edit
+msgstr _Edit
+
+#: data/mat.ui:118 data/mat.ui:253
+msgid Clear
+msgstr Clear
+
+#: data/mat.ui:134
+msgid _Process
+msgstr _Process
+
+#: data/mat.ui:168
+msgid _Help
+msgstr _Help
+
+#: data/mat.ui:214
+msgid Add
+msgstr Add
+
+#: data/mat.ui:240
+msgid Check
+msgstr Check
+
+#: data/mat.ui:309
+msgid State
+msgstr State
+
+#: data/mat.ui:347 data/mat.ui:499
+msgid Metadata
+msgstr Metadata
+
+#: data/mat.ui:376
+msgid Name
+msgstr Name
+
+#: data/mat.ui:390
+msgid Content
+msgstr Content
+
+#: data/mat.ui:452
+msgid Supported formats
+msgstr Supported formats
+
+#: data/mat.ui:486
+msgid Support
+msgstr Support
+
+#: data/mat.ui:512
+msgid Method
+msgstr Method
+
+#: data/mat.ui:525
+msgid Remaining
+msgstr Remaining
+
+#: data/mat.ui:560
+msgid Fileformat
+msgstr Fileformat

___
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

2014-04-10 Thread translation

commit 2e020fb5418fb8eea32083205719d7c24c84de43
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 10:15:51 2014 +

Update translations for tails-misc
---
 en_GB.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/en_GB.po b/en_GB.po
index 58326b7..2b5de50 100644
--- a/en_GB.po
+++ b/en_GB.po
@@ -8,7 +8,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-03-23 08:55+0100\n
-PO-Revision-Date: 2014-04-04 08:50+\n
+PO-Revision-Date: 2014-04-10 10:10+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: English (United Kingdom) 
(http://www.transifex.com/projects/p/torproject/language/en_GB/)\n
 MIME-Version: 1.0\n
@@ -95,7 +95,7 @@ msgstr 
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:357
 msgid Name
-msgstr 
+msgstr Name
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:358
 msgid Key ID

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbirdy_completed] Update translations for torbirdy_completed

2014-04-10 Thread translation

commit 20ee2acd2e2d0737c3cc8b3a91f825eb3aa612c2
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 10:15:37 2014 +

Update translations for torbirdy_completed
---
 en_GB/torbirdy.dtd |   63 
 1 file changed, 63 insertions(+)

diff --git a/en_GB/torbirdy.dtd b/en_GB/torbirdy.dtd
new file mode 100644
index 000..3e22539
--- /dev/null
+++ b/en_GB/torbirdy.dtd
@@ -0,0 +1,63 @@
+!ENTITY torbirdy.accountprefs.title Account Configuration
+!ENTITY torbirdy.accountprefs.startup.label Check for new messages at 
startup
+!ENTITY torbirdy.accountprefs.startup.key C
+!ENTITY torbirdy.accountprefs.minutes.label Check for new messages every
+!ENTITY torbirdy.accountprefs.minutes.key y
+!ENTITY torbirdy.accountprefs.minutes.trail.label minutes
+!ENTITY torbirdy.accountprefs.cancel.button Cancel
+!ENTITY torbirdy.accountprefs.save.button Save
+!ENTITY torbirdy.accountprefs.save.key S
+
+!ENTITY torbirdy.prefs.title TorBirdy Preferences
+!ENTITY torbirdy.prefs.save.button Save
+!ENTITY torbirdy.prefs.save.key s
+!ENTITY torbirdy.prefs.cancel.button Cancel
+!ENTITY torbirdy.prefs.extra2.button Restore Defaults
+!ENTITY torbirdy.prefs.extra2.key d
+!ENTITY torbirdy.prefs.testproxy.button Test Proxy Settings
+!ENTITY torbirdy.prefs.testproxy.key n
+!ENTITY torbirdy.prefs.proxy.label Proxy
+!ENTITY torbirdy.prefs.privacy.label Privacy
+!ENTITY torbirdy.prefs.enigmail.label Enigmail
+!ENTITY torbirdy.prefs.security.label Security
+!ENTITY torbirdy.prefs.recommended.text Use the recommended proxy settings 
for TorBirdy (Tor)
+!ENTITY torbirdy.prefs.recommended.key r
+!ENTITY torbirdy.prefs.anonservice.text Choose an anonymization service
+!ENTITY torbirdy.prefs.anonservice.key a
+!ENTITY torbirdy.prefs.customsettings.text Use custom proxy settings
+!ENTITY torbirdy.prefs.customsettings.key c
+!ENTITY torbirdy.prefs.socks_host.label SOCKS Host: 
+!ENTITY torbirdy.prefs.socks_host.key h
+!ENTITY torbirdy.prefs.socks_port.label Port: 
+!ENTITY torbirdy.prefs.socks_port.key p
+!ENTITY torbirdy.prefs.torification.label Transparent Torification (warning: 
requires custom transproxy or Tor router)
+!ENTITY torbirdy.prefs.torification.key t
+!ENTITY torbirdy.prefs.global Global
+!ENTITY torbirdy.prefs.imap.label Enable push email support for IMAP 
accounts [default: disabled]
+!ENTITY torbirdy.prefs.imap.key p
+!ENTITY torbirdy.prefs.startup_folder.label Select last accessed mail folder 
on startup [default: disabled]
+!ENTITY torbirdy.prefs.startup_folder.key l
+!ENTITY torbirdy.prefs.timezone.label Do not set Thunderbird's time zone to 
UTC [default: set to UTC]
+!ENTITY torbirdy.prefs.timezone.key z
+!ENTITY torbirdy.prefs.enigmail_throwkeyid.label Do not put the recipient 
key IDs into encrypted messages [default: put]
+!ENTITY torbirdy.prefs.enigmail_throwkeyid.key r
+!ENTITY torbirdy.prefs.confirmemail.label Confirm before sending email if 
Enigmail is enabled [default: do not confirm]
+!ENTITY torbirdy.prefs.confirmemail.key c
+!ENTITY torbirdy.prefs.emailwizard.label Enable Thunderbird's automatic 
email configuration wizard [default: disabled]
+!ENTITY torbirdy.prefs.emailwizard.key w
+!ENTITY torbirdy.prefs.automatic.label Check for new messages automatically 
for all accounts [default: disabled]
+!ENTITY torbirdy.prefs.automatic.key f
+!ENTITY torbirdy.prefs.renegotiation.label Allow connections to servers that 
do not support SSL/TLS with secure renegotiation [default: do not allow]
+!ENTITY torbirdy.prefs.renegotiation.key r
+!ENTITY torbirdy.prefs.account_specific Account-Specific
+!ENTITY torbirdy.prefs.select_account.key C
+!ENTITY torbirdy.prefs.select_account.label Choose an account: 
+!ENTITY torbirdy.prefs.enigmail.keyserver.label Keyserver(s) to use: 
+!ENTITY torbirdy.prefs.enigmail.keyserver.key k
+
+!ENTITY torbirdy.panel.usetor.label Use Tor Onion Router
+!ENTITY torbirdy.panel.usejondo.label Use JonDo (Premium)
+!ENTITY torbirdy.panel.usewhonix.label Use Whonix
+!ENTITY torbirdy.panel.preferences.label Open TorBirdy Preferences
+
+!ENTITY torbirdy.firstrun.title TorBirdy First-Run

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-launcher/master] Add turkish dtd files, bump version.

2014-04-10 Thread mikeperry

commit 773de03a2ce611a5ddf4a5162f9c5d1cf9ef1b2c
Author: Mike Perry mikeperry-...@torproject.org
Date:   Thu Apr 10 08:43:30 2014 -0700

Add turkish dtd files, bump version.

Also update translations.
---
 src/chrome/locale/ar/torlauncher.properties|1 +
 src/chrome/locale/de/torlauncher.properties|1 +
 src/chrome/locale/es/torlauncher.properties|1 +
 src/chrome/locale/eu/torlauncher.properties|1 +
 src/chrome/locale/fa/torlauncher.properties|1 +
 src/chrome/locale/fr/torlauncher.properties|1 +
 src/chrome/locale/it/torlauncher.properties|1 +
 src/chrome/locale/ja/torlauncher.properties|1 +
 src/chrome/locale/ko/torlauncher.properties|1 +
 src/chrome/locale/nl/torlauncher.properties|1 +
 src/chrome/locale/pl/torlauncher.properties|1 +
 src/chrome/locale/pt/torlauncher.properties|1 +
 src/chrome/locale/ru/torlauncher.properties|1 +
 src/chrome/locale/sv/torlauncher.properties|1 +
 src/chrome/locale/tr/network-settings.dtd  |   64 
 src/chrome/locale/tr/progress.dtd  |4 ++
 src/chrome/locale/tr/torlauncher.properties|1 +
 src/chrome/locale/vi/torlauncher.properties|1 +
 src/chrome/locale/zh-CN/torlauncher.properties |1 +
 src/install.rdf|2 +-
 20 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/src/chrome/locale/ar/torlauncher.properties 
b/src/chrome/locale/ar/torlauncher.properties
index c7ee50d..ff393f7 100644
--- a/src/chrome/locale/ar/torlauncher.properties
+++ b/src/chrome/locale/ar/torlauncher.properties
@@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=ÙÙ ØªØªØ·Ø§Ø¨Ù 
Ø§ÙÙÙÙØ©
 torlauncher.bootstrapWarning.timeout=Ø§ÙØ§ØªØµØ§Ù Ø¹Ø§Ø·Ù
 torlauncher.bootstrapWarning.noroute=ÙØ§ Ø·Ø±ÙÙ ÙÙÙØ¶ÙÙ
 torlauncher.bootstrapWarning.ioerror=Ø®Ø·Ø£ ÙÙ Ø§ÙÙØ±Ø§Ø¡Ø©/Ø§ÙÙØªØ§Ø¨Ø©
+torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
diff --git a/src/chrome/locale/de/torlauncher.properties 
b/src/chrome/locale/de/torlauncher.properties
index bcbb64e..8ba8ae1 100644
--- a/src/chrome/locale/de/torlauncher.properties
+++ b/src/chrome/locale/de/torlauncher.properties
@@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=NichtÃ¼bereinstimmung 
der IdentitÃ¤ten
 torlauncher.bootstrapWarning.timeout=VerbindungszeitÃ¼berschreitung
 torlauncher.bootstrapWarning.noroute=Kein Pfad zum Rechner
 torlauncher.bootstrapWarning.ioerror=Lese-/Schreibfehler
+torlauncher.bootstrapWarning.pt_missing=Pluggable Transport fehlt
diff --git a/src/chrome/locale/es/torlauncher.properties 
b/src/chrome/locale/es/torlauncher.properties
index 9739b50..4c1fc30 100644
--- a/src/chrome/locale/es/torlauncher.properties
+++ b/src/chrome/locale/es/torlauncher.properties
@@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=las identidades no 
coinciden
 torlauncher.bootstrapWarning.timeout=tiempo de espera de conexiÃ³n agotado
 torlauncher.bootstrapWarning.noroute=no hay ruta hacia el servidor ('host')
 torlauncher.bootstrapWarning.ioerror=error de lectura/escritura
+torlauncher.bootstrapWarning.pt_missing=transporte enchufable desaparecido
diff --git a/src/chrome/locale/eu/torlauncher.properties 
b/src/chrome/locale/eu/torlauncher.properties
index 2d57a88..3f4fb59 100644
--- a/src/chrome/locale/eu/torlauncher.properties
+++ b/src/chrome/locale/eu/torlauncher.properties
@@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=nortasuna ez dator bat
 torlauncher.bootstrapWarning.timeout=konexioa denboraz kanpo
 torlauncher.bootstrapWarning.noroute=ez dago biderik ostalarira
 torlauncher.bootstrapWarning.ioerror=irakurketa/idazketa akatsa
+torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
diff --git a/src/chrome/locale/fa/torlauncher.properties 
b/src/chrome/locale/fa/torlauncher.properties
index 0571889..4914fb2 100644
--- a/src/chrome/locale/fa/torlauncher.properties
+++ b/src/chrome/locale/fa/torlauncher.properties
@@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=Ø¹Ø¯Ù ØªØ·Ø¨ÛÙ 
ÙÙÛØª
 torlauncher.bootstrapWarning.timeout=Ø§ØªÙØ§Ù ÙÙØª Ø§ØªØµØ§Ù
 torlauncher.bootstrapWarning.noroute=ÙØ¨ÙØ¯ ÙØ³ÛØ± Ø¨Ù ÙÛØ²Ø¨Ø§Ù
 torlauncher.bootstrapWarning.ioerror=Ø®Ø·Ø§Û Ø®ÙØ§ÙØ¯Ù/ÙÙØ´ØªÙ
+torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
diff --git a/src/chrome/locale/fr/torlauncher.properties 
b/src/chrome/locale/fr/torlauncher.properties
index 807e901..d113f54 100644
--- a/src/chrome/locale/fr/torlauncher.properties
+++ b/src/chrome/locale/fr/torlauncher.properties
@@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identitÃ© incorrecte
 torlauncher.bootstrapWarning.timeout=temps de connexion expirÃ©
 torlauncher.bootstrapWarning.noroute=pas de route vers l'hÃ´te
 torlauncher.bootstrapWarning.ioerror=erreur de lecture/Ã©criture
+torlauncher.bootstrapWarning.pt_missing=un transport cÃ¢blÃ© est manquant
diff --git

[tor-commits] [tor-browser-bundle/master] Backport fix for Bug9665.

2014-04-10 Thread mikeperry

commit ab04781bdb01977b9b122681474bfecb96017169
Author: Mike Perry mikeperry-...@torproject.org
Date:   Mon Apr 7 20:05:47 2014 -0700

Backport fix for Bug9665.
---
 gitian/descriptors/linux/gitian-tor.yml   |4 +-
 gitian/descriptors/mac/gitian-tor.yml |2 +
 gitian/descriptors/windows/gitian-tor.yml |2 +
 gitian/patches/bug9665.patch  |  108 +
 4 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml 
b/gitian/descriptors/linux/gitian-tor.yml
index 698fcba..15ba469 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -28,8 +28,9 @@ files:
 - bug5018.patch
 - bug9229.patch
 - bug11156.patch
-- bug11069.patch
 - bug11200.patch
+- bug11069.patch
+- bug9665.patch
 - dzip.sh
 - openssl.tar.gz
 script: |
@@ -98,6 +99,7 @@ script: |
   git am ~/build/bug11156.patch
 fi
 git am ~/build/bug11200.patch
+git am ~/build/bug9665.patch
   fi
   mkdir -p $OUTDIR/src
   #git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/descriptors/mac/gitian-tor.yml 
b/gitian/descriptors/mac/gitian-tor.yml
index 30c23bb..5ea3b4e 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -31,6 +31,7 @@ files:
 - bug11156.patch
 - bug11200.patch
 - bug11069.patch
+- bug9665.patch
 - apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
 - 
multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 - dzip.sh
@@ -109,6 +110,7 @@ script: |
   git am ~/build/bug11156.patch
 fi
 git am ~/build/bug11200.patch
+git am ~/build/bug9665.patch
   fi
   mkdir -p $OUTDIR/src
   git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/descriptors/windows/gitian-tor.yml 
b/gitian/descriptors/windows/gitian-tor.yml
index 1698726..6369e7f 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -30,6 +30,7 @@ files:
 - bug11156.patch
 - bug11200.patch
 - bug11069.patch
+- bug9665.patch
 - binutils.tar.bz2
 - dzip.sh
 - openssl.tar.gz
@@ -105,6 +106,7 @@ script: |
   git am ~/build/bug11156.patch
 fi
 git am ~/build/bug11200.patch
+git am ~/build/bug9665.patch
   fi
   mkdir -p $OUTDIR/src
   git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/patches/bug9665.patch b/gitian/patches/bug9665.patch
new file mode 100644
index 000..aeab37b
--- /dev/null
+++ b/gitian/patches/bug9665.patch
@@ -0,0 +1,108 @@
+From 08ae53e400ff6fa2d8147aad440c38173c106cae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?F=C3=A1bio=20J=2E=20Bertinatto?= fabio...@gmail.com
+Date: Tue, 5 Nov 2013 00:50:16 -0200
+Subject: [PATCH 1/3] Fix bug9665
+
+---
+ src/or/connection_or.c | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/or/connection_or.c b/src/or/connection_or.c
+index 04ad2cc..ba3ac00 100644
+--- a/src/or/connection_or.c
 b/src/or/connection_or.c
+@@ -1195,6 +1195,11 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t 
port,
+your pluggable transport proxy stopped running.,
+fmt_addrport(TO_CONN(conn)-addr, TO_CONN(conn)-port),
+transport_name, transport_name);
++
++  control_event_bootstrap_problem(
++Can't connect to bridge,
++END_OR_CONN_REASON_NO_ROUTE);
++
+ } else {
+   log_warn(LD_GENERAL, Tried to connect to '%s' through a proxy, but 
+the proxy address could not be found.,
+-- 
+1.8.1.2
+
+From 754a50592c412d95d2eb48038784d0ef725a7dc2 Mon Sep 17 00:00:00 2001
+From: Nick Mathewson ni...@torproject.org
+Date: Mon, 7 Apr 2014 13:41:07 -0400
+Subject: [PATCH 2/3] Forward-port bug9665 fix to work with our fix for 11069
+
+---
+ src/or/connection_or.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/or/connection_or.c b/src/or/connection_or.c
+index ba3ac00..01ff4dc 100644
+--- a/src/or/connection_or.c
 b/src/or/connection_or.c
+@@ -1198,7 +1198,8 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t 
port,
+ 
+   control_event_bootstrap_problem(
+ Can't connect to bridge,
+-END_OR_CONN_REASON_NO_ROUTE);
++END_OR_CONN_REASON_NO_ROUTE,
++conn);
+ 
+ } else {
+   log_warn(LD_GENERAL, Tried to connect to '%s' through a proxy, but 
+-- 
+1.8.1.2
+
+From 90341b4852bf88f1fdf9fd150fa2f5c47f88b2cb Mon Sep 17 00:00:00 2001
+From: Nick Mathewson ni...@torproject.org
+Date: Mon, 7 Apr 2014 13:44:22 -0400
+Subject: [PATCH 3/3] For missing transport, say PT_MISSING not NO_ROUTE
+
+---
+ src/or/connection_or.c | 2 +-
+ src/or/or.h| 3 ++-
+ src/or/reasons.c   | 2 ++
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/or/connection_or.c b/src/or/connection_or.c
+index 01ff4dc..6572a91 100644

[tor-commits] [tor-browser-bundle/master] Bump versions for 3.6beta2.

2014-04-10 Thread mikeperry

commit c133d234c81d82b2ec94c6afd178897f88f6abb7
Author: Mike Perry mikeperry-...@torproject.org
Date:   Mon Apr 7 20:05:30 2014 -0700

Bump versions for 3.6beta2.
---
 Bundle-Data/Docs/ChangeLog.txt |   21 +
 gitian/versions|4 ++--
 gitian/versions.alpha  |6 +++---
 gitian/versions.beta   |   14 +++---
 gitian/versions.nightly|4 ++--
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 3f12ac9..42c764c 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,24 @@
+Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014
+ * All Platforms
+   * Update OpenSSL to 1.0.1g
+   * Bug 9010: Add Turkish language support.
+   * Update obfs3 transport to 0.2.8
+   * Update fte transport to 0.2.12
+   * Update NoScript to 2.6.8.19
+   * Update Torbutton to 1.6.8.0
+ * Bug 11242: Fix improper update needed message after in-place upgrade.
+ * Bug 10398: Ease translation of about:tor page elements
+   * Update Tor Launcher to 0.2.5.2
+ * Bug 9665: Localize Tor's unreachable bridges bootstrap error
+   * Backport Pending Tor Patches:
+ * Bug 9665: Report a bootstrap error if all bridges are unreachable
+ * Bug 11200: Prevent spurious error message prior to enabling network.
+ * Linux:
+   * Bug 11190: Switch linux PT build process to python2
+   * Bug 10383: Enable NIST P224 and P256 accel support for 64bit builds.
+ * Windows:
+   * Bug 11286: Fix fte transport launch error
+
 Tor Browser Bundle 3.5.4 -- Apr 7 2014
  * All Platforms
* Update OpenSSL to 1.0.1g
diff --git a/gitian/versions b/gitian/versions
index 570656d..b49c276 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -39,7 +39,7 @@ SETUPTOOLS_VER=1.4
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.19-fn+sm+fx.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
@@ -63,7 +63,7 @@ 
GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1
+NOSCRIPT_HASH=6cf5387e3501923a22673887151c76187e1cd14a63b5d0b5d774a26db21ed69a
 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index baee44a..498bcb6 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
-OBFSPROXY_TAG=obfsproxy-0.2.4
+OBFSPROXY_TAG=obfsproxy-0.2.6
 FLASHPROXY_TAG=1.6
 FTEPROXY_TAG=0.2.6
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
@@ -40,7 +40,7 @@ SETUPTOOLS_VER=1.4
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.19-fn+sm+fx.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
@@ -64,7 +64,7 @@ 
GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1
+NOSCRIPT_HASH=6cf5387e3501923a22673887151c76187e1cd14a63b5d0b5d774a26db21ed69a
 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 53060ca..2d9c3af 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -1,4 +1,4 @@
-TORBROWSER_VERSION=3.6-beta-1
+TORBROWSER_VERSION=3.6-beta-2
 BUNDLE_LOCALES=ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN

[tor-commits] [tor-browser-bundle/master] Update to bump fteproxy to 0.2.12: a simplified build process and fixes for Windows/Linux

2014-04-10 Thread mikeperry

commit 53a8b3a994be27762c98bc3fa58f38a46532babc
Author: Kevin P. Dyer kpd...@gmail.com
Date:   Sun Apr 6 17:53:46 2014 -0700

Update to bump fteproxy to 0.2.12: a simplified build process and fixes for 
Windows/Linux
---
 .../linux/gitian-pluggable-transports.yml  |3 ++-
 .../windows/gitian-pluggable-transports.yml|   23 ++--
 gitian/versions|2 +-
 gitian/versions.alpha  |2 +-
 gitian/versions.beta   |2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml 
b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index 6619a1c..fbea855 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -133,8 +133,9 @@ script: |
   cd ..
   #
   cd fteproxy
+  ln -s $INSTDIR/gmp thirdparty/gmp
   find -type f | xargs touch --date=$REFERENCE_DATETIME
-  CFLAGS=-L$INSTDIR/Tor -I$INSTDIR/gmp/include CXXFLAGS=-L$INSTDIR/Tor 
-I$INSTDIR/gmp/include make
+  make
   cp -a bin/fteproxy $PTDIR/
   cp -ra fte $PTDIR/
   mkdir -p $INSTDIR/Docs/fteproxy
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml 
b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index 9b0e8ec..d2a3005 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -97,7 +97,6 @@ script: |
   make
   make install
   cp -an $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor
-  cp -an $INSTDIR/gmp/lib/*dll* $INSTDIR/Tor
   cd ..
   #
   #
@@ -119,6 +118,7 @@ script: |
   # http://wiki.winehq.org/msiexec
   # /qn disables user interface; /i installs.
   LD_PRELOAD= msiexec /qn /i python.msi TARGETDIR=$INSTDIR/python
+  sed -i 's/self.dll_libraries = get_msvcr()/pass#self.dll_libraries = 
get_msvcr()/g' $INSTDIR/python/Lib/distutils/cygwinccompiler.py
   INSTPYTHON=wine $INSTDIR/python/python.exe
   #
   7z x py2exe.exe
@@ -226,21 +226,20 @@ script: |
   cd ..
   #
   cd fteproxy
-  cp $INSTDIR/gmp/bin/*dll* .
-  cp $INSTDIR/gmp/lib/*dll* .
   ln -s $INSTDIR/gmp thirdparty/gmp
+  cp -a $INSTDIR/gmp/bin/libgmp-*.dll .
   find -type f | xargs touch --date=$REFERENCE_DATETIME
-  make win32
-  make thirdparty/re2/obj/libre2.a
-  LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace
-  LD_PRELOAD= $INSTPYTHON setup.py py2exe
+  WINDOWS_BUILD=1 CROSS_COMPILE=1 make thirdparty/re2/obj/libre2.a
+  LD_PRELOAD= $INSTPYTHON setup_tbb.py build_ext -c mingw32
+  LD_PRELOAD= $INSTPYTHON setup_tbb.py py2exe
   py2exe_zip_timestomp dist/fteproxy.zip
-  mkdir -p $PTDIR/fte
-  mkdir -p $PTDIR/fte/tests
   cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/
-  cp -an fte/VERSION $PTDIR/fte
-  cp -ran fte/defs $PTDIR/fte
-  cp -ran fte/tests/dfas $PTDIR/fte/tests
+  mkdir -p $PTDIR/fte
+  cp -a fte/VERSION $PTDIR/fte
+  mkdir -p $PTDIR/fte/defs
+  cp -a fte/defs/*.json $PTDIR/fte/defs
+  mkdir -p $PTDIR/fte/tests/dfas
+  cp -a fte/tests/dfas/{*.dfa,*.regex} $PTDIR/fte/tests/dfas
   mkdir -p $INSTDIR/Docs/fteproxy
   cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy
   cd ..
diff --git a/gitian/versions b/gitian/versions
index b49c276..673cf32 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -17,7 +17,7 @@ MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
 OBFSPROXY_TAG=obfsproxy-0.2.4
 FLASHPROXY_TAG=1.6
-FTEPROXY_TAG=0.2.6
+FTEPROXY_TAG=0.2.12
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 
 GITIAN_TAG=tor-browser-builder-3.x-5
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 498bcb6..5447d76 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -18,7 +18,7 @@ MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
 OBFSPROXY_TAG=obfsproxy-0.2.6
 FLASHPROXY_TAG=1.6
-FTEPROXY_TAG=0.2.6
+FTEPROXY_TAG=0.2.12
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 
 GITIAN_TAG=tor-browser-builder-3.x-5
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 2d9c3af..8c8433d 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -18,7 +18,7 @@ MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
 OBFSPROXY_TAG=obfsproxy-0.2.6
 FLASHPROXY_TAG=1.6
-FTEPROXY_TAG=0.2.6
+FTEPROXY_TAG=0.2.12
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 
 GITIAN_TAG=tor-browser-builder-3.x-5



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Update default PT Bridges.

2014-04-10 Thread mikeperry

commit ae9d19adf7935782d926919c84977f703b7ebadf
Author: Kevin P. Dyer kpd...@gmail.com
Date:   Tue Apr 8 12:24:27 2014 -0700

Update default PT Bridges.
---
 Bundle-Data/PTConfigs/bridge_prefs.js |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js 
b/Bundle-Data/PTConfigs/bridge_prefs.js
index 47d20e8..2d9777c 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -2,13 +2,13 @@
 pref(extensions.torlauncher.default_bridge_recommended_type, obfs3);
 
 // Default bridges.
-pref(extensions.torlauncher.default_bridge.obfs3.1, obfs3 
83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239);
+pref(extensions.torlauncher.default_bridge.obfs3.1, obfs3 83.212.101.3:80 
A09D536DD1752D542E1FBB3C9CE4449D51298239);
 pref(extensions.torlauncher.default_bridge.obfs3.2, obfs3 
169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9);
 pref(extensions.torlauncher.default_bridge.obfs3.3, obfs3 
169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9);
 pref(extensions.torlauncher.default_bridge.obfs3.4, obfs3 
209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2);
 pref(extensions.torlauncher.default_bridge.obfs3.5, obfs3 
208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F);
-pref(extensions.torlauncher.default_bridge.obfs3.6, obfs3 
109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD);
-pref(extensions.torlauncher.default_bridge.obfs3.7, obfs3 
109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E);
+pref(extensions.torlauncher.default_bridge.obfs3.6, obfs3 
109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED);
+pref(extensions.torlauncher.default_bridge.obfs3.7, obfs3 
109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A);
 
 pref(extensions.torlauncher.default_bridge.flashproxy.1, flashproxy 
0.0.1.0:1);
 pref(extensions.torlauncher.default_bridge.flashproxy.2, flashproxy 
0.0.1.0:2);
@@ -18,3 +18,6 @@ pref(extensions.torlauncher.default_bridge.flashproxy.5, 
flashproxy 0.0.1.0:5
 
 pref(extensions.torlauncher.default_bridge.fte.1, fte 131.252.210.150:8080 
271EC1874E40FE65C145C6397AA34FFF7008E50E);
 pref(extensions.torlauncher.default_bridge.fte.2, fte 79.125.3.12:8080 
17AF9F9F4E57614A060B7221DCCEDB8BB546DD73);
+pref(extensions.torlauncher.default_bridge.fte.3, fte 128.105.214.161:8080 
1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
+pref(extensions.torlauncher.default_bridge.fte.4, fte 128.105.214.162:8080 
FC562097E1951DCC41B7D7F324D88157119BB56D);
+pref(extensions.torlauncher.default_bridge.fte.5, fte 128.105.214.163:8080 
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Fix changelog for obfsproxy3.

2014-04-10 Thread mikeperry

commit 751c60a211bfea3156f34d63f47a10eabb18f2d8
Author: Mike Perry mikeperry-...@torproject.org
Date:   Wed Apr 9 15:19:21 2014 -0700

Fix changelog for obfsproxy3.
---
 Bundle-Data/Docs/ChangeLog.txt |1 -
 1 file changed, 1 deletion(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 42c764c..af9b59d 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -2,7 +2,6 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014
  * All Platforms
* Update OpenSSL to 1.0.1g
* Bug 9010: Add Turkish language support.
-   * Update obfs3 transport to 0.2.8
* Update fte transport to 0.2.12
* Update NoScript to 2.6.8.19
* Update Torbutton to 1.6.8.0



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Remove busted FTE bridges (bad fingerprints).

2014-04-10 Thread mikeperry

commit e58aabac8234b4115cef70030e213caf6444607f
Author: Mike Perry mikeperry-...@torproject.org
Date:   Thu Apr 10 09:01:34 2014 -0700

Remove busted FTE bridges (bad fingerprints).
---
 Bundle-Data/PTConfigs/bridge_prefs.js |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js 
b/Bundle-Data/PTConfigs/bridge_prefs.js
index 2d9777c..bb000cd 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -16,8 +16,10 @@ pref(extensions.torlauncher.default_bridge.flashproxy.3, 
flashproxy 0.0.1.0:3
 pref(extensions.torlauncher.default_bridge.flashproxy.4, flashproxy 
0.0.1.0:4);
 pref(extensions.torlauncher.default_bridge.flashproxy.5, flashproxy 
0.0.1.0:5);
 
-pref(extensions.torlauncher.default_bridge.fte.1, fte 131.252.210.150:8080 
271EC1874E40FE65C145C6397AA34FFF7008E50E);
-pref(extensions.torlauncher.default_bridge.fte.2, fte 79.125.3.12:8080 
17AF9F9F4E57614A060B7221DCCEDB8BB546DD73);
-pref(extensions.torlauncher.default_bridge.fte.3, fte 128.105.214.161:8080 
1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
-pref(extensions.torlauncher.default_bridge.fte.4, fte 128.105.214.162:8080 
FC562097E1951DCC41B7D7F324D88157119BB56D);
-pref(extensions.torlauncher.default_bridge.fte.5, fte 128.105.214.163:8080 
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
+pref(extensions.torlauncher.default_bridge.fte.1, fte 128.105.214.161:8080 
1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
+pref(extensions.torlauncher.default_bridge.fte.2, fte 128.105.214.162:8080 
FC562097E1951DCC41B7D7F324D88157119BB56D);
+pref(extensions.torlauncher.default_bridge.fte.3, fte 128.105.214.163:8080 
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
+// XXX: Fingerprints changed:
+//pref(extensions.torlauncher.default_bridge.fte.4, fte 
131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E);
+//pref(extensions.torlauncher.default_bridge.fte.5, fte 79.125.3.12:8080 
17AF9F9F4E57614A060B7221DCCEDB8BB546DD73);
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Bump Tor Launcher version.

2014-04-10 Thread mikeperry

commit 6d2934c93e402e544e8df8e248134bd3305d26ce
Author: Mike Perry mikeperry-...@torproject.org
Date:   Thu Apr 10 08:46:44 2014 -0700

Bump Tor Launcher version.

Turkish DTDs were missing.
---
 Bundle-Data/Docs/ChangeLog.txt |2 +-
 gitian/versions.beta   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index af9b59d..9b66b5e 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -7,7 +7,7 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014
* Update Torbutton to 1.6.8.0
  * Bug 11242: Fix improper update needed message after in-place upgrade.
  * Bug 10398: Ease translation of about:tor page elements
-   * Update Tor Launcher to 0.2.5.2
+   * Update Tor Launcher to 0.2.5.3
  * Bug 9665: Localize Tor's unreachable bridges bootstrap error
* Backport Pending Tor Patches:
  * Bug 9665: Report a bootstrap error if all bridges are unreachable
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 9ec3927..ca59070 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -8,7 +8,7 @@ FIREFOX_VERSION=24.4.0esr
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2
 TOR_TAG=tor-0.2.4.21
-TORLAUNCHER_TAG=0.2.5.2
+TORLAUNCHER_TAG=0.2.5.3
 TORBUTTON_TAG=1.6.8.0
 HTTPSE_TAG=3.4.5
 NSIS_TAG=v0.1



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Move obfsproxy back to 0.2.4.

2014-04-10 Thread mikeperry

commit 13dd293a1888d6faac8fcb39d10c4938c639b443
Author: Mike Perry mikeperry-...@torproject.org
Date:   Wed Apr 9 11:32:49 2014 -0700

Move obfsproxy back to 0.2.4.

Moving back to last known-good. 0.2.6 won't launch either.
---
 gitian/versions.alpha |2 +-
 gitian/versions.beta  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 5447d76..2bdbb2d 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
-OBFSPROXY_TAG=obfsproxy-0.2.6
+OBFSPROXY_TAG=obfsproxy-0.2.4
 FLASHPROXY_TAG=1.6
 FTEPROXY_TAG=0.2.12
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 8c8433d..9ec3927 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.5
-OBFSPROXY_TAG=obfsproxy-0.2.6
+OBFSPROXY_TAG=obfsproxy-0.2.4
 FLASHPROXY_TAG=1.6
 FTEPROXY_TAG=0.2.12
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] General site revisions

2014-04-10 Thread atagar

commit 872b1e1647cb0dc31699045b0f2b90511a3fd07e
Merge: d70fa9c eee3a99
Author: Damian Johnson ata...@torproject.org
Date:   Sun Mar 30 20:38:32 2014 -0700

General site revisions

Lots of revisions to our site, most notably around our FAQ and examples
section...

* Adding scripts section with neat examples that have come up in the past.
* Greatly improved the readability of our FAQ by making entries more 
concise.
* Application entry for Exit Map, and added munin-tor and exit-funding 
below.
* Torrc syntax highlighting.

 docs/_static/buttons/back.png |  Bin 0 - 2774 bytes
 docs/_static/buttons/resources/back.xcf   |  Bin 0 - 5648 bytes
 docs/_static/exit_map.png |  Bin 0 - 12371 bytes
 docs/_static/label/exit_map.png   |  Bin 0 - 1540 bytes
 docs/_static/label/resources/exit_map.xcf |  Bin 0 - 3284 bytes
 docs/_static/resources/exit_map_alt.png   |  Bin 0 - 12747 bytes
 docs/contents.rst |5 +
 docs/faq.rst  |  416 -
 docs/tutorials/double_double_toil_and_trouble.rst |   48 ++-
 docs/tutorials/examples/compare_flags.rst |   63 
 docs/tutorials/examples/exit_used.rst |   76 
 docs/tutorials/examples/list_circuits.rst |   52 +++
 docs/tutorials/examples/outdated_relays.rst   |   45 +++
 docs/tutorials/mirror_mirror_on_the_wall.rst  |   59 +--
 docs/tutorials/the_little_relay_that_could.rst|2 +-
 docs/tutorials/to_russia_with_love.rst|   74 +---
 docs/tutorials/tortoise_and_the_hare.rst  |3 +-
 stem/connection.py|   27 ++
 stem/control.py   |   64 +++-
 stem/response/events.py   |   39 +-
 stem/socket.py|   42 ++-
 21 files changed, 649 insertions(+), 366 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] Unit tests for the connect() function

2014-04-10 Thread atagar

commit 0efd180327c96a75d25744374e72bf11b5a5b586
Author: Damian Johnson ata...@torproject.org
Date:   Sat Apr 5 21:07:51 2014 -0700

Unit tests for the connect() function

One really neat thing about stealing arm's code is that I'd actually 
written a
lot of good unit tests, so we can now move those to stem! Our connect* 
methods
previously only had integ coverage, so this is a really nice improvement.

This also uncovered a few bugs from porting the function.
---
 stem/connection.py  |   52 +--
 test/settings.cfg   |1 +
 test/unit/connection/connect.py |  141 +++
 3 files changed, 188 insertions(+), 6 deletions(-)

diff --git a/stem/connection.py b/stem/connection.py
index 1304357..35524d7 100644
--- a/stem/connection.py
+++ b/stem/connection.py
@@ -147,6 +147,40 @@ AuthMethod = stem.util.enum.Enum(NONE, PASSWORD, 
COOKIE, SAFECOOKIE, UN
 CLIENT_HASH_CONSTANT = bTor safe cookie authentication controller-to-server 
hash
 SERVER_HASH_CONSTANT = bTor safe cookie authentication server-to-controller 
hash
 
+MISSING_PASSWORD_BUG_MSG = 
+BUG: You provided a password but despite this stem reported that it was
+missing. This shouldn't happen - please let us know about it!
+
+  http://bugs.torproject.org
+
+
+UNRECOGNIZED_AUTH_TYPE_MSG = 
+Tor is using a type of authentication we do not recognize...
+
+  {auth_methods}
+
+Please check that arm is up to date and if there is an existing issue on
+'http://bugs.torproject.org'. If there isn't one then let us know!
+
+
+
+UNREADABLE_COOKIE_FILE_MSG = 
+We were unable to read tor's authentication cookie...
+
+  Path: {path}
+  Issue: {issue}
+
+
+WRONG_PORT_TYPE_MSG = 
+Please check in your torrc that {port} is the ControlPort. Maybe you
+configured it to be the ORPort or SocksPort instead?
+
+
+WRONG_SOCKET_TYPE_MSG = 
+Unable to connect to tor. Are you sure the interface you specified belongs to
+tor?
+
+
 CONNECT_MESSAGES = {
   'general_auth_failure': Unable to authenticate: {error},
   'incorrect_password': Incorrect password,
@@ -156,6 +190,11 @@ CONNECT_MESSAGES = {
   'tor_isnt_running': Unable to connect to tor. Are you sure it's running?,
   'unable_to_use_port': Unable to connect to {address}:{port}: {error},
   'unable_to_use_socket': Unable to connect to '{path}': {error},
+  'missing_password_bug': MISSING_PASSWORD_BUG_MSG.strip(),
+  'uncrcognized_auth_type': UNRECOGNIZED_AUTH_TYPE_MSG.strip(),
+  'unreadable_cookie_file': UNREADABLE_COOKIE_FILE_MSG.strip(),
+  'wrong_port_type': WRONG_PORT_TYPE_MSG.strip(),
+  'wrong_socket_type': WRONG_SOCKET_TYPE_MSG.strip(),
 }
 
 
@@ -232,7 +271,7 @@ def connect(control_port = ('127.0.0.1', 9051), 
control_socket = '/var/run/tor/c
 print error_msg
 return None
 
-  return _connect(control_connection, password, chroot_path, controller)
+  return _connect_auth(control_connection, password, chroot_path, controller)
 
 
 def connect_port(address = 127.0.0.1, port = 9051, password = None, 
chroot_path = None, controller = stem.control.Controller):
@@ -261,7 +300,7 @@ def connect_port(address = 127.0.0.1, port = 9051, 
password = None, chroot_pat
 print exc
 return None
 
-  return _connect(control_port, password, chroot_path, controller)
+  return _connect_auth(control_port, password, chroot_path, controller)
 
 
 def connect_socket_file(path = /var/run/tor/control, password = None, 
chroot_path = None, controller = stem.control.Controller):
@@ -291,12 +330,13 @@ def connect_socket_file(path = /var/run/tor/control, 
password = None, chroot_p
 print exc
 return None
 
-  return _connect(control_socket, password, chroot_path, controller)
+  return _connect_auth(control_socket, password, chroot_path, controller)
 
 
-def _connect(control_socket, password, chroot_path, controller):
+def _connect_auth(control_socket, password, chroot_path, controller):
   
-  Common implementation for the connect_* functions.
+  Helper for the connect_* functions that authenticates the socket and
+  constructs the controller.
 
   :param stem.socket.ControlSocket control_socket: socket being authenticated 
to
   :param str password: passphrase to authenticate to the socket
@@ -341,7 +381,7 @@ def _connect(control_socket, password, chroot_path, 
controller):
   control_socket.close()
   return None
 
-return _connect(control_socket, password, chroot_path, controller)
+return _connect_auth(control_socket, password, chroot_path, controller)
   except UnreadableCookieFile as exc:
 print CONNECT_MESSAGES['unreadable_cookie_file'].format(path = 
exc.cookie_path, issue = str(exc))
 control_socket.close()
diff --git a/test/settings.cfg b/test/settings.cfg
index f12311d..f0eb758 100644
--- a/test/settings.cfg
+++ b/test/settings.cfg
@@ -181,6 +181,7 @@ test.unit_tests
 |test.unit.response.protocolinfo.TestProtocolInfoResponse
 |test.unit.response.mapaddress.TestMapAddressResponse

[tor-commits] [stem/master] Making connect()'s password prompt opt-in

2014-04-10 Thread atagar

commit be37a4f8a7c388970518e1502ef6d6194743a9d1
Author: Damian Johnson ata...@torproject.org
Date:   Mon Apr 7 09:58:02 2014 -0700

Making connect()'s password prompt opt-in

Making use of stdin opt-in allows the connect() function to be used more 
safely
in quick and dirty scripts. Users can then allow a password prompt if 
waiting
on stdin is safe.
---
 stem/connection.py  |   30 --
 test/unit/connection/connect.py |8 
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/stem/connection.py b/stem/connection.py
index 35524d7..c49ff85 100644
--- a/stem/connection.py
+++ b/stem/connection.py
@@ -186,6 +186,7 @@ CONNECT_MESSAGES = {
   'incorrect_password': Incorrect password,
   'no_control_port': Unable to connect to tor. Maybe it's running without a 
ControlPort?,
   'password_prompt': Tor controller password:,
+  'needs_password': Tor requires a password to authenticate,
   'socket_doesnt_exist': The socket file you specified ({path}) doesn't 
exist,
   'tor_isnt_running': Unable to connect to tor. Are you sure it's running?,
   'unable_to_use_port': Unable to connect to {address}:{port}: {error},
@@ -198,7 +199,7 @@ CONNECT_MESSAGES = {
 }
 
 
-def connect(control_port = ('127.0.0.1', 9051), control_socket = 
'/var/run/tor/control', password = None, chroot_path = None, controller = 
stem.control.Controller):
+def connect(control_port = ('127.0.0.1', 9051), control_socket = 
'/var/run/tor/control', password = None, password_prompt = False, chroot_path = 
None, controller = stem.control.Controller):
   
   Convenience function for quickly getting a control connection. This is very
   handy for debugging or CLI setup, handling setup and prompting for a password
@@ -216,6 +217,8 @@ def connect(control_port = ('127.0.0.1', 9051), 
control_socket = '/var/run/tor/c
   :param tuple contol_port: address and port tuple, for instance 
**('127.0.0.1', 9051)**
   :param str path: path where the control socket is located
   :param str password: passphrase to authenticate to the socket
+  :param bool password_prompt: prompt for the controller password if it wasn't
+supplied
   :param str chroot_path: path prefix if in a chroot environment
   :param Class controller: :class:`~stem.control.BaseController` subclass to be
 returned, this provides a :class:`~stem.socket.ControlSocket` if **None**
@@ -271,7 +274,7 @@ def connect(control_port = ('127.0.0.1', 9051), 
control_socket = '/var/run/tor/c
 print error_msg
 return None
 
-  return _connect_auth(control_connection, password, chroot_path, controller)
+  return _connect_auth(control_connection, password, password_prompt, 
chroot_path, controller)
 
 
 def connect_port(address = 127.0.0.1, port = 9051, password = None, 
chroot_path = None, controller = stem.control.Controller):
@@ -300,7 +303,7 @@ def connect_port(address = 127.0.0.1, port = 9051, 
password = None, chroot_pat
 print exc
 return None
 
-  return _connect_auth(control_port, password, chroot_path, controller)
+  return _connect_auth(control_port, password, True, chroot_path, controller)
 
 
 def connect_socket_file(path = /var/run/tor/control, password = None, 
chroot_path = None, controller = stem.control.Controller):
@@ -330,16 +333,18 @@ def connect_socket_file(path = /var/run/tor/control, 
password = None, chroot_p
 print exc
 return None
 
-  return _connect_auth(control_socket, password, chroot_path, controller)
+  return _connect_auth(control_socket, password, True, chroot_path, controller)
 
 
-def _connect_auth(control_socket, password, chroot_path, controller):
+def _connect_auth(control_socket, password, password_prompt, chroot_path, 
controller):
   
   Helper for the connect_* functions that authenticates the socket and
   constructs the controller.
 
   :param stem.socket.ControlSocket control_socket: socket being authenticated 
to
   :param str password: passphrase to authenticate to the socket
+  :param bool password_prompt: prompt for the controller password if it wasn't
+supplied
   :param str chroot_path: path prefix if in a chroot environment
   :param Class controller: :class:`~stem.control.BaseController` subclass to be
 returned, this provides a :class:`~stem.socket.ControlSocket` if **None**
@@ -375,13 +380,18 @@ def _connect_auth(control_socket, password, chroot_path, 
controller):
   control_socket.close()
   raise ValueError(CONNECT_MESSAGES['missing_password_bug'])
 
-try:
-  password = getpass.getpass(CONNECT_MESSAGES['password_prompt'] + ' ')
-except KeyboardInterrupt:
+if password_prompt:
+  try:
+password = getpass.getpass(CONNECT_MESSAGES['password_prompt'] + ' ')
+  except KeyboardInterrupt:
+control_socket.close()
+return None
+
+  return _connect_auth(control_socket, password, password_prompt, 
chroot_path, controller)
+else:
+  print CONNECT_MESSAGES['needs_password']

[tor-commits] [stem/master] Better connect() function for easily getting a Controller

2014-04-10 Thread atagar

commit 69433bdacc27d3db968b8fc414f1ee598ad54013
Author: Damian Johnson ata...@torproject.org
Date:   Sat Apr 5 15:48:48 2014 -0700

Better connect() function for easily getting a Controller

Stem provided a couple high level functions for getting a Controller with
minimal fuss: connect_port() and connect_socket_file(). These interacted
directly with stdin and stdout making them undesirable for sophisticated use
cases, but for commandline scripts provided a one-line method of geting an
authenticated Controller.

Personally I never used these myself. Not because I didn't need this, but
because I had done better in arm. In arm's connection helper it...

* Provided better, more useful error output upon authentication failure.

* Attempted to connect to both a control port and socket, then was smart 
about
  the message it presented if both failed.

On reflection the first belongs in Stem (hell, why not provide better error
output?!?). As for the second I realized that having separate control_port()
and control_sockeet_file() functions was a mistake.

This deprecates the old connect_* functions in favor of a single new 
connect()
that does essentially exactly what we do in arm: try to get a tor 
connection,
and give nice advice if we can't.
---
 docs/change_log.rst  |1 +
 docs/faq.rst |7 +-
 stem/connection.py   |  141 ++
 stem/socket.py   |2 +-
 test/integ/connection/connect.py |   19 +
 5 files changed, 153 insertions(+), 17 deletions(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index a02750c..624f730 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -50,6 +50,7 @@ The following are only available within Stem's `git repository
   * Added `support for TB_EMPTY events 
api/response.html#stem.response.events.TokenBucketEmptyEvent`_ 
(:spec:`6f2919a`)
   * Added `support for HS_DESC events 
api/response.html#stem.response.events.HSDescEvent`_ (:spec:`a67ac4d`, 
:trac:`10807`)
   * Changed :func:`~stem.control.Controller.get_network_status` and 
:func:`~stem.control.Controller.get_network_statuses` to provide 
:class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` if Tor 
is using microdescriptors (:trac:`7646`)
+  * Deprecated :func:`~stem.connection.connect_port` and 
:func:`~stem.connection.connect_socket_file` in favor of a new, better 
:func:`~stem.connection.connect` function
 
  * **Utilities**
 
diff --git a/docs/faq.rst b/docs/faq.rst
index 51aa527..a30601e 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -273,12 +273,11 @@ Once you have Tor running and `properly configured 
tutorials/the_little_relay_t
 
 #. `Connection Module api/connection.html`_
 
-   Writing a commandline script? Then the :func:`~stem.connection.connect_port`
-   and :func:`~stem.connection.connect_socket_file` functions provide you the
-   quickest and most hassle free method for getting a
+   Writing a commandline script? Then the :func:`~stem.connection.connect`
+   function provide you the quickest and most hassle free method for getting a
:class:`~stem.control.Controller`.
 
-   These functions connect and authenticate to the given port or socket,
+   This function connects and authenticates to the given port or socket,
providing you a one-line method of getting a
:class:`~stem.control.Controller` that's ready to use. If Tor requires a
password then the user will be prompted for it. When the connection cannot
diff --git a/stem/connection.py b/stem/connection.py
index 769f432..1304357 100644
--- a/stem/connection.py
+++ b/stem/connection.py
@@ -4,8 +4,7 @@
 
 Functions for connecting and authenticating to the tor process.
 
-The :func:`~stem.connection.connect_port` and
-:func:`~stem.connection.connect_socket_file` functions give an easy, one line
+The :func:`~stem.connection.connect` function give an easy, one line
 method for getting an authenticated control connection. This is handy for CLI
 applications and the python interactive interpreter, but does several things
 that makes it undesirable for applications (uses stdin/stdout, suppresses
@@ -13,12 +12,12 @@ exceptions, etc).
 
 ::
 
-  import sys 
+  import sys
 
-  from stem.connection import connect_port
+  from stem.connection import connect
 
   if __name__ == '__main__':
-controller = connect_port()
+controller = connect()
 
 if not controller:
   sys.exit(1)  # unable to get a connection
@@ -28,14 +27,14 @@ exceptions, etc).
 
 ::
 
-  % python example.py 
+  % python example.py
   Tor is running version 0.2.4.10-alpha-dev (git-8be6058d8f31e578)
 
 ... or if Tor isn't running...
 
 ::
 
-  % python example.py 
+  % python example.py
   [Errno 111] Connection refused
 
 The :func:`~stem.connection.authenticate` function, however, gives easy but
@@ -76,8 +75,7 @@ fine-grained control over the

[tor-commits] [arm/master] Using Stem's connect() method

2014-04-10 Thread atagar

commit 3aa83a9de0056425c47d3f3695ec6a299218c4f0
Author: Damian Johnson ata...@torproject.org
Date:   Thu Apr 10 09:13:47 2014 -0700

Using Stem's connect() method

Replacing our connection and authentication code in favor of stem's shiny 
new
method for this.
---
 arm/__init__.py  |2 +-
 arm/arguments.py |2 +-
 arm/config/strings.cfg   |   38 -
 arm/starter.py   |   21 
 arm/util/__init__.py |   77 +++---
 test/util/authenticate.py|   73 ---
 test/util/init_controller.py |   67 
 7 files changed, 21 insertions(+), 259 deletions(-)

diff --git a/arm/__init__.py b/arm/__init__.py
index c203b5f..25e322f 100644
--- a/arm/__init__.py
+++ b/arm/__init__.py
@@ -2,7 +2,7 @@
 Scripts involved in validating user input, system state, and initializing arm.
 
 
-__all__ = [starter, prereq, version, config_panel, controller, 
header_panel, log_panel, popups, torrc_panel]
+__all__ = [starter, arguments, prereq, version, config_panel, 
controller, header_panel, log_panel, popups, torrc_panel]
 
 __version__ = '1.4.6_dev'
 __release_date__ = 'April 28, 2011'
diff --git a/arm/arguments.py b/arm/arguments.py
index 3d4a656..b527564 100644
--- a/arm/arguments.py
+++ b/arm/arguments.py
@@ -25,7 +25,7 @@ DEFAULT_ARGS = {
   'print_help': False,
 }
 
-OPT = 'i:s:c:d:bl:vh'
+OPT = 'i:s:c:d:l:vh'
 
 OPT_EXPANDED = [
   'interface=',
diff --git a/arm/config/strings.cfg b/arm/config/strings.cfg
index 17a9cd7..3ac3b3c 100644
--- a/arm/config/strings.cfg
+++ b/arm/config/strings.cfg
@@ -3,7 +3,6 @@
 # User facing strings. These are sorted into the following namespaces...
 #
 #   * configparsing or handling configuration options
-#   * connect   connection and authentication to tor
 #   * debug concerns the --debug argument
 #   * misc  anything that doesn't fit into a present namespace
 #   * setup notificaitons or issues arising while starting arm
@@ -18,15 +17,6 @@ msg.config.unable_to_load_settings Unable to load arm's 
internal configurations:
 msg.config.unable_to_read_file Failed to load configuration (using defaults): 
{error}
 msg.config.nothing_loaded No armrc loaded, using defaults. You can customize 
arm by placing a configuration file at {path} (see the armrc.sample for its 
options).
 
-msg.connect.general_auth_failure Unable to authenticate: {error}
-msg.connect.incorrect_password Incorrect password
-msg.connect.no_control_port Unable to connect to tor. Maybe it's running 
without a ControlPort?
-msg.connect.password_prompt Tor controller password:
-msg.connect.socket_doesnt_exist The socket file you specified ({path}) doesn't 
exist
-msg.connect.tor_isnt_running Unable to connect to tor. Are you sure it's 
running?
-msg.connect.unable_to_use_port Unable to connect to {address}:{port}: {error}
-msg.connect.unable_to_use_socket Unable to connect to '{path}': {error}
-
 msg.debug.saving_to_path Saving a debug log to {path}, please check it for 
sensitive information before sharing it.
 msg.debug.unable_to_write_file Unable to write to our debug log file ({path}): 
{error}
 
@@ -53,26 +43,6 @@ msg.usage.not_a_valid_port '{port_input}' isn't a valid port 
number
 msg.usage.unrecognized_log_flags Unrecognized event flags: {flags}
 msg.usage.unable_to_set_color_override {color} isn't a valid color
 
-msg.connect.missing_password_bug
-|BUG: You provided a password but despite this stem reported that it was
-|missing. This shouldn't happen - please let us know about it!
-|
-|  http://bugs.torproject.org
-
-msg.connect.unreadable_cookie_file
-|We were unable to read tor's authentication cookie...
-|
-|  Path: {path}
-|  Issue: {issue}
-
-msg.connect.wrong_port_type
-|Please check in your torrc that {port} is the ControlPort. Maybe you
-|configured it to be the ORPort or SocksPort instead?
-
-msg.connect.wrong_socket_type
-|Unable to connect to tor. Are you sure the interface you specified belongs to
-|tor?
-
 msg.debug.header
 |Arm {arm_version} Debug Dump
 |Stem Version: {stem_version}
@@ -99,14 +69,6 @@ msg.setup.unknown_term
 |Either update your terminfo database or run arm using TERM=xterm arm.
 |
 
-msg.uncrcognized_auth_type
-|Tor is using a type of authentication we do not recognize...
-|
-|  {auth_methods}
-|
-|Please check that arm is up to date and if there is an existing issue on
-|'http://bugs.torproject.org'. If there isn't one then let us know!
-
 msg.usage.help_output
 |Usage arm [OPTION]
 |Terminal status monitor for Tor relays.
diff --git a/arm/starter.py b/arm/starter.py
index 9493415..ba7c9af 100644
--- a/arm/starter.py
+++ b/arm/starter.py
@@ -22,11 +22,12 @@ import arm.util.tracker
 import arm.util.ui_tools
 
 import stem
+import stem.connection
 import stem.util.conf
 import stem.util.log
 import stem.util.system
 
-from arm.util import BASE_DIR, init_controller, authenticate,

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2014-04-10 Thread translation

commit eee5526139f47299068eef8a8a9cb7656b751e5a
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 16:15:30 2014 +

Update translations for tor-launcher-properties
---
 vi/torlauncher.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vi/torlauncher.properties b/vi/torlauncher.properties
index e57776c..e70b4c1 100644
--- a/vi/torlauncher.properties
+++ b/vi/torlauncher.properties
@@ -17,7 +17,7 @@ torlauncher.torrc_missing=Thiáº¿u táºp tin torrc.
 torlauncher.datadir_missing=ThÆ° má»¥c data trong Tor khÃ´ng tá»n táº¡i.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
-torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
+torlauncher.failed_to_get_settings=KhÃ´ng thá» nháºn ÄÆ°á»£c cÃ i Äáº·t 
Tor.
 torlauncher.failed_to_save_settings=KhÃ´ng thá» lÆ°u láº¡i cÃ¡c cÃ i Äáº·t 
cá»§a Tor.
 torlauncher.ensure_tor_is_running=HÃ£y cháº¯c cháº¯n ráº±ng Tor Äang cháº¡y.
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torcheck] Update translations for torcheck

2014-04-10 Thread translation

commit 8028b971dd02c2ee7a5c4675057ba0911c2581cc
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 21:45:10 2014 +

Update translations for torcheck
---
 hu/torcheck.po |   29 +++--
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/hu/torcheck.po b/hu/torcheck.po
index d85a679..fcc6f2d 100644
--- a/hu/torcheck.po
+++ b/hu/torcheck.po
@@ -2,13 +2,14 @@
 # Copyright (C) 2008-2013 The Tor Project, Inc
 # 
 # Translators:
+# lajos mrla...@gmail.com, 2014
 # vargaviktor viktor.va...@gmail.com, 2012
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2012-02-16 20:28+PDT\n
-PO-Revision-Date: 2014-01-02 08:41+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2014-04-10 21:40+\n
+Last-Translator: lajos mrla...@gmail.com\n
 Language-Team: Hungarian 
(http://www.transifex.com/projects/p/torproject/language/hu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -18,7 +19,7 @@ msgstr 
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 
 msgid Congratulations. This browser is configured to use Tor.
-msgstr 
+msgstr GratulÃ¡lunk! A bÃ¶ngÃ©szÅ be lett konfigurÃ¡lva a Tor 
hasznÃ¡latÃ¡hoz.
 
 msgid 
 Please refer to the a href=\https://www.torproject.org/\;Tor website/a 
@@ -56,13 +57,13 @@ msgid Your IP address appears to be: 
 msgstr Az Ã¶n IP cÃme a kÃ¶vetkezÅnek lÃ¡tszik:
 
 msgid Are you using Tor?
-msgstr 
+msgstr HasznÃ¡lsz Tor-t ?
 
 msgid This page is also available in the following languages:
-msgstr 
+msgstr Ez az oldal a kÃ¶vetkezÅ nyelveken is elÃ©rhetÅ:
 
 msgid For more information about this exit relay, see:
-msgstr 
+msgstr TovÃ¡bb informÃ¡ciÃ³ errÅl a exit relay itt:
 
 msgid 
 The Tor Project is a US 501(c)(3) non-profit dedicated to the research, 
@@ -70,25 +71,25 @@ msgid 
 msgstr A Tor Project egy a US 501(c)(3) szerinti non-profit, amely 
kutatÃ¡ssal, fejÃ©esztÃ©ssel Ã©s oktatÃ¡ssal foglakozik az online anonimitÃ¡s 
Ã©s szemÃ©lyes adatvÃ©delem terÃ¼letÃ©n.
 
 msgid Learn More raquo;
-msgstr 
+msgstr Tanulj tÃ¶bbet raquo;
 
 msgid Go
-msgstr 
+msgstr Mehet
 
 msgid Short User Manual
-msgstr 
+msgstr RÃ¶vid felhasznÃ¡lÃ³i ÃºtmutatÃ³
 
 msgid Donate to Support Tor
-msgstr 
+msgstr AdakozÃ¡s a Tor tÃ¡mogatÃ¡sÃ¡ra
 
 msgid Tor QA Site
-msgstr 
+msgstr Tor KÃ©rdÃ©sek Ã©s VÃ¡laszok oldal
 
 msgid Volunteer
-msgstr 
+msgstr ÃnkÃ©ntes
 
 msgid JavaScript is enabled.
-msgstr 
+msgstr JavaScript engedÃ©lyezve.
 
 msgid JavaScript is disabled.
-msgstr 
+msgstr JavaScript letiltva.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib

2014-04-10 Thread translation

commit 41f37a598c397f67b26c1a8ae93ceaabe79d7383
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 21:45:55 2014 +

Update translations for tails-perl5lib
---
 hu.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hu.po b/hu.po
index 9780d75..723fb6a 100644
--- a/hu.po
+++ b/hu.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# lajos mrla...@gmail.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2013-11-28 11:56+0100\n
-PO-Revision-Date: 2013-12-30 04:38+\n
-Last-Translator: Phoul co...@torproject.org\n
+PO-Revision-Date: 2014-04-10 21:44+\n
+Last-Translator: lajos mrla...@gmail.com\n
 Language-Team: Hungarian 
(http://www.transifex.com/projects/p/torproject/language/hu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -21,4 +22,4 @@ msgstr 
 msgid 
 The device Tails is running from cannot be found. Maybe you used the `toram'
  option?
-msgstr 
+msgstr Az eszkÃ¶z amirÅl a Tails fut nem talÃ¡lhatÃ³. LehetsÃ©ges, hogy a 
\toram\ opciÃ³t hasznÃ¡ltad?

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed

2014-04-10 Thread translation

commit 6adc2feb6ba4f4a6fa15917778284206c4af2d23
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 21:45:16 2014 +

Update translations for torcheck_completed
---
 hu/torcheck.po |   49 -
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/hu/torcheck.po b/hu/torcheck.po
index 3cfb15c..fcc6f2d 100644
--- a/hu/torcheck.po
+++ b/hu/torcheck.po
@@ -1,14 +1,15 @@
 # TorCheck gettext template
-# Copyright (C) 2008-2012 The Tor Project, Inc
+# Copyright (C) 2008-2013 The Tor Project, Inc
 # 
 # Translators:
+# lajos mrla...@gmail.com, 2014
 # vargaviktor viktor.va...@gmail.com, 2012
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2012-02-16 20:28+PDT\n
-PO-Revision-Date: 2013-11-06 09:10+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2014-04-10 21:40+\n
+Last-Translator: lajos mrla...@gmail.com\n
 Language-Team: Hungarian 
(http://www.transifex.com/projects/p/torproject/language/hu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -17,8 +18,8 @@ msgstr 
 Language: hu\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 
-msgid Congratulations. Your browser is configured to use Tor.
-msgstr GratulÃ¡lunk a bÃ¶ngÃ©szÅje be van Ã¡llÃtva Tor hasznÃ¡latÃ¡hoz.
+msgid Congratulations. This browser is configured to use Tor.
+msgstr GratulÃ¡lunk! A bÃ¶ngÃ©szÅ be lett konfigurÃ¡lva a Tor 
hasznÃ¡latÃ¡hoz.
 
 msgid 
 Please refer to the a href=\https://www.torproject.org/\;Tor website/a 
@@ -54,3 +55,41 @@ msgstr Ãtmeneti hÃ¡lÃ³zati kimaradÃ¡s nem teszi 
lehetÅvÃ©, hogy eldÃ¶ntsÃ¼k,
 
 msgid Your IP address appears to be: 
 msgstr Az Ã¶n IP cÃme a kÃ¶vetkezÅnek lÃ¡tszik:
+
+msgid Are you using Tor?
+msgstr HasznÃ¡lsz Tor-t ?
+
+msgid This page is also available in the following languages:
+msgstr Ez az oldal a kÃ¶vetkezÅ nyelveken is elÃ©rhetÅ:
+
+msgid For more information about this exit relay, see:
+msgstr TovÃ¡bb informÃ¡ciÃ³ errÅl a exit relay itt:
+
+msgid 
+The Tor Project is a US 501(c)(3) non-profit dedicated to the research, 
+development, and education of online anonymity and privacy.
+msgstr A Tor Project egy a US 501(c)(3) szerinti non-profit, amely 
kutatÃ¡ssal, fejÃ©esztÃ©ssel Ã©s oktatÃ¡ssal foglakozik az online anonimitÃ¡s 
Ã©s szemÃ©lyes adatvÃ©delem terÃ¼letÃ©n.
+
+msgid Learn More raquo;
+msgstr Tanulj tÃ¶bbet raquo;
+
+msgid Go
+msgstr Mehet
+
+msgid Short User Manual
+msgstr RÃ¶vid felhasznÃ¡lÃ³i ÃºtmutatÃ³
+
+msgid Donate to Support Tor
+msgstr AdakozÃ¡s a Tor tÃ¡mogatÃ¡sÃ¡ra
+
+msgid Tor QA Site
+msgstr Tor KÃ©rdÃ©sek Ã©s VÃ¡laszok oldal
+
+msgid Volunteer
+msgstr ÃnkÃ©ntes
+
+msgid JavaScript is enabled.
+msgstr JavaScript engedÃ©lyezve.
+
+msgid JavaScript is disabled.
+msgstr JavaScript letiltva.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2014-04-10 Thread translation

commit 9249f664be4c7cfccdb6d121ac8249e4682c6dcd
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 22:15:32 2014 +

Update translations for tor-launcher-properties_completed
---
 hu/torlauncher.properties |1 +
 1 file changed, 1 insertion(+)

diff --git a/hu/torlauncher.properties b/hu/torlauncher.properties
index 2d5245b..a4e7a6f 100644
--- a/hu/torlauncher.properties
+++ b/hu/torlauncher.properties
@@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identitÃ¡s eltÃ©rÃ©s
 torlauncher.bootstrapWarning.timeout=a kapcsolÃ³dÃ¡si idÅ letelt
 torlauncher.bootstrapWarning.noroute=nincs Ãºt a kiszolgÃ¡lÃ³hoz
 torlauncher.bootstrapWarning.ioerror=ÃrÃ¡s/olvasÃ¡s hiba
+torlauncher.bootstrapWarning.pt_missing=hiÃ¡nyzÃ³ becsatlakoztathatÃ³ Ã¡tvitel

___
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

2014-04-10 Thread translation

commit 4ac6e3fe79097074a8c700b5785cb59298bbd08f
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 22:15:36 2014 +

Update translations for tor-launcher-network-settings
---
 hu/network-settings.dtd |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/hu/network-settings.dtd b/hu/network-settings.dtd
index 2b093b8..cc47d71 100644
--- a/hu/network-settings.dtd
+++ b/hu/network-settings.dtd
@@ -2,7 +2,7 @@
 
 !-- For first run wizard: --
 
-!ENTITY torsettings.prompt Before you connect to the Tor network, you need 
to provide information about this computer's Internet connection.
+!ENTITY torsettings.prompt MielÅtt a Tor hÃ¡lÃ³zatra csatlakoznÃ¡l, 
informÃ¡ciÃ³t kell adj a szÃ¡mÃtÃ³gÃ©p internet kapcsolatÃ¡rÃ³l.
 
 !ENTITY torSettings.yes Igen
 !ENTITY torSettings.no Nem
@@ -15,14 +15,14 @@
 !ENTITY torSettings.connectPrompt3 This will work in most situations.
 !ENTITY torSettings.connect CsatlakozÃ¡s
 
-!ENTITY torSettings.proxyQuestion Does this computer need to use a proxy to 
access the Internet?
+!ENTITY torSettings.proxyQuestion A szÃ¡mÃtÃ³gÃ©pnek proxy hasznÃ¡latÃ¡ra 
van szÃ¼ksÃ©ge az internet elÃ©rÃ©sÃ©hez?
 !-- see https://www.torproject.org/docs/proxychain.html.en --
-!ENTITY torSettings.proxyHelp If you are not sure how to answer this 
question, look at the Internet settings in another browser to see whether it is 
configured to use a proxy.
+!ENTITY torSettings.proxyHelp Ha nem vagy biztos a vÃ¡laszban nÃ©zd meg az 
Internet beÃ¡llÃtÃ¡sokat egy mÃ¡sik bÃ¶ngÃ©szÅben. NÃ©zd meg van-e proxy 
hasznÃ¡lat beÃ¡llÃtva.
 !ENTITY torSettings.enterProxy Adja meg a proxy beÃ¡llÃtÃ¡sokat.
 !ENTITY torSettings.firewallQuestion Ezen szÃ¡mÃtÃ³gÃ©p internet kapcsolata 
tÅ±zfalon halad Ã¡t, mely csak bizonyos portokhoz enged csatlakozni?
 !ENTITY torSettings.firewallHelp Nem biztos abban, hogy hogyan vÃ¡laszoljon 
erre a kÃ©rdÃ©sre, vÃ¡lassza a 'Nem'-et. Ha problÃ©mÃ¡kba Ã¼tkÃ¶zik a Tor 
hÃ¡lÃ³zathoz valÃ³ csatlakozÃ¡skor, vÃ¡ltoztassa meg ezt a beÃ¡llÃtÃ¡st.
-!ENTITY torSettings.enterFirewall Enter a comma-separated list of ports that 
are allowed by the firewall.
-!ENTITY torSettings.bridgeQuestion Does your Internet Service Provider (ISP) 
block or otherwise censor connections to the Tor Network?
+!ENTITY torSettings.enterFirewall GÃ©pelj be egy vesszÅvel elvÃ¡lasztott 
listÃ¡t a portokrÃ³l amik engedÃ©lyezve vannak a tÅ±zfal Ã¡ltal.
+!ENTITY torSettings.bridgeQuestion Az internet szolgÃ¡ltatÃ³d (ISP) 
blokkolja vagy cenzÃºrÃ¡zza a kapcsolatot a Tor hÃ¡lÃ³zathoz?
 !ENTITY torSettings.bridgeHelp If you are not sure how to answer this 
question, choose No.amp;#160; If you choose Yes, you will be asked to 
configure Tor Bridges, which are unlisted relays that make it more difficult to 
block connections to the Tor Network.
 !ENTITY torSettings.bridgeSettingsPrompt You may use the provided set of 
bridges or you may obtain and enter a custom set of bridges.
 
@@ -33,7 +33,7 @@
 
 !ENTITY torsettings.optional OpcionÃ¡lis
 
-!ENTITY torsettings.useProxy.checkbox This computer needs to use a proxy to 
access the Internet
+!ENTITY torsettings.useProxy.checkbox A szÃ¡mÃtÃ³gÃ©pnek szÃ¼ksÃ©ge van a 
proxy hasznÃ¡latÃ¡ra az internet kapcsolathoz.
 !ENTITY torsettings.useProxy.type Proxy TÃpus:
 !ENTITY torsettings.useProxy.address CÃm:
 !ENTITY torsettings.useProxy.address.placeholder IP cÃm vagy gÃ©pnÃ©v
@@ -43,18 +43,18 @@
 !ENTITY torsettings.useProxy.type.socks4 SOCKS 4
 !ENTITY torsettings.useProxy.type.socks5 SOCKS 5
 !ENTITY torsettings.useProxy.type.http HTTP / HTTPS
-!ENTITY torsettings.firewall.checkbox This computer goes through a firewall 
that only allows connections to certain ports
+!ENTITY torsettings.firewall.checkbox A szÃ¡mÃtÃ³gÃ©p egy tÅ±zfalon 
keresztÃ¼l kommunikÃ¡l ami csak adott portokon keresztÃ¼l engedÃ©lyezi a 
kapcsolatotokat.
 !ENTITY torsettings.firewall.allowedPorts EngedÃ©lyezett portok:
 !ENTITY torsettings.useBridges.checkbox Az internet szolgÃ¡ltatÃ³m (ISP) 
blokkolja a Tor hÃ¡lÃ³zathoz valÃ³ csatlakozÃ¡sokat
 !ENTITY torsettings.useBridges.default Connect with provided bridges
 !ENTITY torsettings.useBridges.type Transport type:
 !ENTITY torsettings.useBridges.custom Enter custom bridges
-!ENTITY torsettings.useBridges.label Enter one or more bridge relays (one 
per line).
-!ENTITY torsettings.useBridges.placeholder type address:port
+!ENTITY torsettings.useBridges.label Addj meg egy vagy tÃ¶bb bridge relay 
cÃmet (soronkÃ©nt egy)
+!ENTITY torsettings.useBridges.placeholder Ãrd cÃm:port
 
 !ENTITY torsettings.copyLog A Tor log VÃ¡gÃ³lapra mÃ¡solÃ¡sa
 !ENTITY torsettings.bridgeHelpTitle HÃd kapcsolÃ³ sÃºgÃ³
-!ENTITY torsettings.bridgeHelp1 If you are unable to connect to the Tor 
network, it could be that your Internet Service Provider (ISP) or another 
agency is blocking Tor.amp;#160; Often, you can work around this problem by 
using Tor Bridges, which are unlisted relays that are more

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2014-04-10 Thread translation

commit f64314cc08ebc5a2de7aa2890fd5d0c8d6d5943c
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 22:15:29 2014 +

Update translations for tor-launcher-properties
---
 hu/torlauncher.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hu/torlauncher.properties b/hu/torlauncher.properties
index df66bae..a4e7a6f 100644
--- a/hu/torlauncher.properties
+++ b/hu/torlauncher.properties
@@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=identitÃ¡s eltÃ©rÃ©s
 torlauncher.bootstrapWarning.timeout=a kapcsolÃ³dÃ¡si idÅ letelt
 torlauncher.bootstrapWarning.noroute=nincs Ãºt a kiszolgÃ¡lÃ³hoz
 torlauncher.bootstrapWarning.ioerror=ÃrÃ¡s/olvasÃ¡s hiba
-torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
+torlauncher.bootstrapWarning.pt_missing=hiÃ¡nyzÃ³ becsatlakoztathatÃ³ Ã¡tvitel

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib

2014-04-10 Thread translation

commit be1657555ea07451c4c2d4c78d1f7649b7de0e12
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 22:15:53 2014 +

Update translations for tails-perl5lib
---
 hu.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hu.po b/hu.po
index 723fb6a..c35ac4a 100644
--- a/hu.po
+++ b/hu.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2013-11-28 11:56+0100\n
-PO-Revision-Date: 2014-04-10 21:44+\n
+PO-Revision-Date: 2014-04-10 21:50+\n
 Last-Translator: lajos mrla...@gmail.com\n
 Language-Team: Hungarian 
(http://www.transifex.com/projects/p/torproject/language/hu/)\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/tails-perl5lib_completed] Update translations for tails-perl5lib_completed

2014-04-10 Thread translation

commit 0e7b485c36ccd5f8271df13d949301861e7a4dca
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 22:15:55 2014 +

Update translations for tails-perl5lib_completed
---
 hu.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hu.po b/hu.po
index 723fb6a..c35ac4a 100644
--- a/hu.po
+++ b/hu.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2013-11-28 11:56+0100\n
-PO-Revision-Date: 2014-04-10 21:44+\n
+PO-Revision-Date: 2014-04-10 21:50+\n
 Last-Translator: lajos mrla...@gmail.com\n
 Language-Team: Hungarian 
(http://www.transifex.com/projects/p/torproject/language/hu/)\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-launcher-network-settings] Update translations for tor-launcher-network-settings

2014-04-10 Thread translation

commit c41f74da95f97a0032183cdfee4638f6918038b0
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 22:45:33 2014 +

Update translations for tor-launcher-network-settings
---
 hu/network-settings.dtd |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/hu/network-settings.dtd b/hu/network-settings.dtd
index cc47d71..b565db5 100644
--- a/hu/network-settings.dtd
+++ b/hu/network-settings.dtd
@@ -7,12 +7,12 @@
 !ENTITY torSettings.yes Igen
 !ENTITY torSettings.no Nem
 
-!ENTITY torSettings.firstQuestion Which of the following best describes your 
situation?
-!ENTITY torSettings.configurePrompt1 This computer's Internet connection is 
censored, filtered, or proxied.
-!ENTITY torSettings.configurePrompt2 I need to configure bridge, firewall, 
or proxy settings.
+!ENTITY torSettings.firstQuestion A kÃ¶vetkezÅk kÃ¶zÃ¼l melyik illik jobban 
a szituÃ¡ciÃ³hoz?
+!ENTITY torSettings.configurePrompt1 A szÃ¡mÃtÃ³gÃ©p internet kapcsolata 
cenzÃºrÃ¡zott, szÅ±rt vagy proxy-t hasznÃ¡l.
+!ENTITY torSettings.configurePrompt2 KonfigurÃ¡lni kell a bridge, tÅ±zfal 
vagy proxy beÃ¡llÃtÃ¡sokat.
 !ENTITY torSettings.configure BeÃ¡llÃt
-!ENTITY torSettings.connectPrompt2 I would like to connect directly to the 
Tor network.
-!ENTITY torSettings.connectPrompt3 This will work in most situations.
+!ENTITY torSettings.connectPrompt2 SzeretnÃ©k kÃ¶zvetlenÃ¼l kapcsolÃ³dni a 
Tor hÃ¡lÃ³zathoz.
+!ENTITY torSettings.connectPrompt3 A legtÃ¶bb esetben ez mÅ±kÃ¶dni fog.
 !ENTITY torSettings.connect CsatlakozÃ¡s
 
 !ENTITY torSettings.proxyQuestion A szÃ¡mÃtÃ³gÃ©pnek proxy hasznÃ¡latÃ¡ra 
van szÃ¼ksÃ©ge az internet elÃ©rÃ©sÃ©hez?
@@ -23,7 +23,7 @@
 !ENTITY torSettings.firewallHelp Nem biztos abban, hogy hogyan vÃ¡laszoljon 
erre a kÃ©rdÃ©sre, vÃ¡lassza a 'Nem'-et. Ha problÃ©mÃ¡kba Ã¼tkÃ¶zik a Tor 
hÃ¡lÃ³zathoz valÃ³ csatlakozÃ¡skor, vÃ¡ltoztassa meg ezt a beÃ¡llÃtÃ¡st.
 !ENTITY torSettings.enterFirewall GÃ©pelj be egy vesszÅvel elvÃ¡lasztott 
listÃ¡t a portokrÃ³l amik engedÃ©lyezve vannak a tÅ±zfal Ã¡ltal.
 !ENTITY torSettings.bridgeQuestion Az internet szolgÃ¡ltatÃ³d (ISP) 
blokkolja vagy cenzÃºrÃ¡zza a kapcsolatot a Tor hÃ¡lÃ³zathoz?
-!ENTITY torSettings.bridgeHelp If you are not sure how to answer this 
question, choose No.amp;#160; If you choose Yes, you will be asked to 
configure Tor Bridges, which are unlisted relays that make it more difficult to 
block connections to the Tor Network.
+!ENTITY torSettings.bridgeHelp Ha nem vagy biztos a vÃ¡laszban, vÃ¡laszd a 
Nem-et.amp;#160; Ha az Igen-t vÃ¡lasztod neked kell konfigurÃ¡lni a Tor 
bridges amik nem listÃ¡zott Ã¡tjÃ¡tszÃ³k Ã©s nehezebbÃ© teszik a Tor hÃ¡lÃ³zat 
kapcsolÃ³dÃ¡sÃ¡nak a blokkolÃ¡sÃ¡t.
 !ENTITY torSettings.bridgeSettingsPrompt You may use the provided set of 
bridges or you may obtain and enter a custom set of bridges.
 
 !-- Other: --
@@ -54,11 +54,11 @@
 
 !ENTITY torsettings.copyLog A Tor log VÃ¡gÃ³lapra mÃ¡solÃ¡sa
 !ENTITY torsettings.bridgeHelpTitle HÃd kapcsolÃ³ sÃºgÃ³
-!ENTITY torsettings.bridgeHelp1 Ha nem tudsz csatlakozni a Tor hÃ¡lÃ³zathoz, 
akkor valÃ³szÃnÅ± az internet szolgÃ¡ltatÃ³ vagy egy mÃ¡sik szervezet 
blokkolja. Gyakran megkerÃ¼lhetÅ a problÃ©ma Tor bridges hasznÃ¡latÃ¡val. Ezek 
nem listÃ¡zott Ã¡tjÃ¡tszÃ³k amiket sokkal nehezebb blokkolni.
-!ENTITY torsettings.bridgeHelp1B You may use the preconfigured, provided set 
of bridge addresses or you may obtain a custom set of addresses by using one of 
these three methods:
-!ENTITY torsettings.bridgeHelp2Heading Through the Web
-!ENTITY torsettings.bridgeHelp2 Use a web browser to visit 
https://bridges.torproject.org;
-!ENTITY torsettings.bridgeHelp3Heading Through the Email Autoresponder
-!ENTITY torsettings.bridgeHelp3 Send email to brid...@torproject.org with 
the line 'get bridges' by itself in the body of the message.amp;#160; However, 
to make it harder for an attacker to learn a lot of bridge addresses, you must 
send this request from a gmail.com or yahoo.com email address.
-!ENTITY torsettings.bridgeHelp4Heading Through the Help Desk
-!ENTITY torsettings.bridgeHelp4 As a last resort, you can request bridge 
addresses by sending a polite email message to 
h...@rt.torproject.org.amp;#160; Please note that a person will need to 
respond to each request.
+!ENTITY torsettings.bridgeHelp1 Ha nem tudsz csatlakozni a Tor.amp;#160; 
hÃ¡lÃ³zathoz, akkor valÃ³szÃnÅ± az internet szolgÃ¡ltatÃ³ (ISP) vagy egy 
mÃ¡sik szervezet blokkolja. Gyakran megkerÃ¼lhetÅ a problÃ©ma Tor bridges 
hasznÃ¡latÃ¡val. Ezek nem listÃ¡zott Ã¡tjÃ¡tszÃ³k amiket sokkal nehezebb 
blokkolni.
+!ENTITY torsettings.bridgeHelp1B HasznÃ¡lhatod az elÅre beÃ¡llÃtott bridge 
cÃmeket vagy beszerezhetsz egyedi cÃmeket ezzel a hÃ¡rom mÃ³dszerrel:
+!ENTITY torsettings.bridgeHelp2Heading Interneten keresztÃ¼l
+!ENTITY torsettings.bridgeHelp2 HasznÃ¡lj egy bÃ¶ngÃ©szÅt megnÃ©zni ezt az 
oldalt: https://bridges.torproject.org;
+!ENTITY

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2014-04-10 Thread translation

commit 481a4bac75ddab4b010bf1330168497dc39f2bc9
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 23:15:36 2014 +

Update translations for tor-launcher-network-settings
---
 hu/network-settings.dtd |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hu/network-settings.dtd b/hu/network-settings.dtd
index b565db5..9075d38 100644
--- a/hu/network-settings.dtd
+++ b/hu/network-settings.dtd
@@ -24,7 +24,7 @@
 !ENTITY torSettings.enterFirewall GÃ©pelj be egy vesszÅvel elvÃ¡lasztott 
listÃ¡t a portokrÃ³l amik engedÃ©lyezve vannak a tÅ±zfal Ã¡ltal.
 !ENTITY torSettings.bridgeQuestion Az internet szolgÃ¡ltatÃ³d (ISP) 
blokkolja vagy cenzÃºrÃ¡zza a kapcsolatot a Tor hÃ¡lÃ³zathoz?
 !ENTITY torSettings.bridgeHelp Ha nem vagy biztos a vÃ¡laszban, vÃ¡laszd a 
Nem-et.amp;#160; Ha az Igen-t vÃ¡lasztod neked kell konfigurÃ¡lni a Tor 
bridges amik nem listÃ¡zott Ã¡tjÃ¡tszÃ³k Ã©s nehezebbÃ© teszik a Tor hÃ¡lÃ³zat 
kapcsolÃ³dÃ¡sÃ¡nak a blokkolÃ¡sÃ¡t.
-!ENTITY torSettings.bridgeSettingsPrompt You may use the provided set of 
bridges or you may obtain and enter a custom set of bridges.
+!ENTITY torSettings.bridgeSettingsPrompt HasznÃ¡lhatod a szolgÃ¡ltatott 
bridge cÃmeket vagy beszerezhetsz egyedi bridge cÃmeket.
 
 !-- Other: --
 
@@ -46,9 +46,9 @@
 !ENTITY torsettings.firewall.checkbox A szÃ¡mÃtÃ³gÃ©p egy tÅ±zfalon 
keresztÃ¼l kommunikÃ¡l ami csak adott portokon keresztÃ¼l engedÃ©lyezi a 
kapcsolatotokat.
 !ENTITY torsettings.firewall.allowedPorts EngedÃ©lyezett portok:
 !ENTITY torsettings.useBridges.checkbox Az internet szolgÃ¡ltatÃ³m (ISP) 
blokkolja a Tor hÃ¡lÃ³zathoz valÃ³ csatlakozÃ¡sokat
-!ENTITY torsettings.useBridges.default Connect with provided bridges
-!ENTITY torsettings.useBridges.type Transport type:
-!ENTITY torsettings.useBridges.custom Enter custom bridges
+!ENTITY torsettings.useBridges.default CsatlakozÃ¡s a szolgÃ¡ltatott bridge 
cÃmekkel.
+!ENTITY torsettings.useBridges.type Ãtvitel tÃpusa:
+!ENTITY torsettings.useBridges.custom Addj meg egyedi bridge cÃmeket
 !ENTITY torsettings.useBridges.label Addj meg egy vagy tÃ¶bb bridge relay 
cÃmet (soronkÃ©nt egy)
 !ENTITY torsettings.useBridges.placeholder Ãrd cÃm:port
 

___
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_completed] Update translations for tor-launcher-network-settings_completed

2014-04-10 Thread translation

commit 9c35b31ee0e7e7e662fcbd08e40e477d563e5431
Author: Translation commit bot translat...@torproject.org
Date:   Thu Apr 10 23:15:38 2014 +

Update translations for tor-launcher-network-settings_completed
---
 hu/network-settings.dtd |   64 +++
 1 file changed, 64 insertions(+)

diff --git a/hu/network-settings.dtd b/hu/network-settings.dtd
new file mode 100644
index 000..9075d38
--- /dev/null
+++ b/hu/network-settings.dtd
@@ -0,0 +1,64 @@
+!ENTITY torsettings.dialog.title Tor hÃ¡lÃ³zati beÃ¡llÃtÃ¡sok
+
+!-- For first run wizard: --
+
+!ENTITY torsettings.prompt MielÅtt a Tor hÃ¡lÃ³zatra csatlakoznÃ¡l, 
informÃ¡ciÃ³t kell adj a szÃ¡mÃtÃ³gÃ©p internet kapcsolatÃ¡rÃ³l.
+
+!ENTITY torSettings.yes Igen
+!ENTITY torSettings.no Nem
+
+!ENTITY torSettings.firstQuestion A kÃ¶vetkezÅk kÃ¶zÃ¼l melyik illik jobban 
a szituÃ¡ciÃ³hoz?
+!ENTITY torSettings.configurePrompt1 A szÃ¡mÃtÃ³gÃ©p internet kapcsolata 
cenzÃºrÃ¡zott, szÅ±rt vagy proxy-t hasznÃ¡l.
+!ENTITY torSettings.configurePrompt2 KonfigurÃ¡lni kell a bridge, tÅ±zfal 
vagy proxy beÃ¡llÃtÃ¡sokat.
+!ENTITY torSettings.configure BeÃ¡llÃt
+!ENTITY torSettings.connectPrompt2 SzeretnÃ©k kÃ¶zvetlenÃ¼l kapcsolÃ³dni a 
Tor hÃ¡lÃ³zathoz.
+!ENTITY torSettings.connectPrompt3 A legtÃ¶bb esetben ez mÅ±kÃ¶dni fog.
+!ENTITY torSettings.connect CsatlakozÃ¡s
+
+!ENTITY torSettings.proxyQuestion A szÃ¡mÃtÃ³gÃ©pnek proxy hasznÃ¡latÃ¡ra 
van szÃ¼ksÃ©ge az internet elÃ©rÃ©sÃ©hez?
+!-- see https://www.torproject.org/docs/proxychain.html.en --
+!ENTITY torSettings.proxyHelp Ha nem vagy biztos a vÃ¡laszban nÃ©zd meg az 
Internet beÃ¡llÃtÃ¡sokat egy mÃ¡sik bÃ¶ngÃ©szÅben. NÃ©zd meg van-e proxy 
hasznÃ¡lat beÃ¡llÃtva.
+!ENTITY torSettings.enterProxy Adja meg a proxy beÃ¡llÃtÃ¡sokat.
+!ENTITY torSettings.firewallQuestion Ezen szÃ¡mÃtÃ³gÃ©p internet kapcsolata 
tÅ±zfalon halad Ã¡t, mely csak bizonyos portokhoz enged csatlakozni?
+!ENTITY torSettings.firewallHelp Nem biztos abban, hogy hogyan vÃ¡laszoljon 
erre a kÃ©rdÃ©sre, vÃ¡lassza a 'Nem'-et. Ha problÃ©mÃ¡kba Ã¼tkÃ¶zik a Tor 
hÃ¡lÃ³zathoz valÃ³ csatlakozÃ¡skor, vÃ¡ltoztassa meg ezt a beÃ¡llÃtÃ¡st.
+!ENTITY torSettings.enterFirewall GÃ©pelj be egy vesszÅvel elvÃ¡lasztott 
listÃ¡t a portokrÃ³l amik engedÃ©lyezve vannak a tÅ±zfal Ã¡ltal.
+!ENTITY torSettings.bridgeQuestion Az internet szolgÃ¡ltatÃ³d (ISP) 
blokkolja vagy cenzÃºrÃ¡zza a kapcsolatot a Tor hÃ¡lÃ³zathoz?
+!ENTITY torSettings.bridgeHelp Ha nem vagy biztos a vÃ¡laszban, vÃ¡laszd a 
Nem-et.amp;#160; Ha az Igen-t vÃ¡lasztod neked kell konfigurÃ¡lni a Tor 
bridges amik nem listÃ¡zott Ã¡tjÃ¡tszÃ³k Ã©s nehezebbÃ© teszik a Tor hÃ¡lÃ³zat 
kapcsolÃ³dÃ¡sÃ¡nak a blokkolÃ¡sÃ¡t.
+!ENTITY torSettings.bridgeSettingsPrompt HasznÃ¡lhatod a szolgÃ¡ltatott 
bridge cÃmeket vagy beszerezhetsz egyedi bridge cÃmeket.
+
+!-- Other: --
+
+!ENTITY torsettings.startingTor VÃ¡rakozÃ¡s a Tor indulÃ¡sÃ¡ra...
+!ENTITY torsettings.restart ÃjraindÃtÃ¡s
+
+!ENTITY torsettings.optional OpcionÃ¡lis
+
+!ENTITY torsettings.useProxy.checkbox A szÃ¡mÃtÃ³gÃ©pnek szÃ¼ksÃ©ge van a 
proxy hasznÃ¡latÃ¡ra az internet kapcsolathoz.
+!ENTITY torsettings.useProxy.type Proxy TÃpus:
+!ENTITY torsettings.useProxy.address CÃm:
+!ENTITY torsettings.useProxy.address.placeholder IP cÃm vagy gÃ©pnÃ©v
+!ENTITY torsettings.useProxy.port Port:
+!ENTITY torsettings.useProxy.username FelhasznÃ¡lÃ³nÃ©v:
+!ENTITY torsettings.useProxy.password JelszÃ³:
+!ENTITY torsettings.useProxy.type.socks4 SOCKS 4
+!ENTITY torsettings.useProxy.type.socks5 SOCKS 5
+!ENTITY torsettings.useProxy.type.http HTTP / HTTPS
+!ENTITY torsettings.firewall.checkbox A szÃ¡mÃtÃ³gÃ©p egy tÅ±zfalon 
keresztÃ¼l kommunikÃ¡l ami csak adott portokon keresztÃ¼l engedÃ©lyezi a 
kapcsolatotokat.
+!ENTITY torsettings.firewall.allowedPorts EngedÃ©lyezett portok:
+!ENTITY torsettings.useBridges.checkbox Az internet szolgÃ¡ltatÃ³m (ISP) 
blokkolja a Tor hÃ¡lÃ³zathoz valÃ³ csatlakozÃ¡sokat
+!ENTITY torsettings.useBridges.default CsatlakozÃ¡s a szolgÃ¡ltatott bridge 
cÃmekkel.
+!ENTITY torsettings.useBridges.type Ãtvitel tÃpusa:
+!ENTITY torsettings.useBridges.custom Addj meg egyedi bridge cÃmeket
+!ENTITY torsettings.useBridges.label Addj meg egy vagy tÃ¶bb bridge relay 
cÃmet (soronkÃ©nt egy)
+!ENTITY torsettings.useBridges.placeholder Ãrd cÃm:port
+
+!ENTITY torsettings.copyLog A Tor log VÃ¡gÃ³lapra mÃ¡solÃ¡sa
+!ENTITY torsettings.bridgeHelpTitle HÃd kapcsolÃ³ sÃºgÃ³
+!ENTITY torsettings.bridgeHelp1 Ha nem tudsz csatlakozni a Tor.amp;#160; 
hÃ¡lÃ³zathoz, akkor valÃ³szÃnÅ± az internet szolgÃ¡ltatÃ³ (ISP) vagy egy 
mÃ¡sik szervezet blokkolja. Gyakran megkerÃ¼lhetÅ a problÃ©ma Tor bridges 
hasznÃ¡latÃ¡val. Ezek nem listÃ¡zott Ã¡tjÃ¡tszÃ³k amiket sokkal nehezebb 
blokkolni.
+!ENTITY torsettings.bridgeHelp1B HasznÃ¡lhatod az elÅre beÃ¡llÃtott bridge 
cÃmeket vagy beszerezhetsz egyedi cÃmeket ezzel a hÃ¡rom mÃ³dszerrel:
+!ENTITY torsettings.bridgeHelp2Heading Interneten keresztÃ¼l
+!ENTITY

[tor-commits] r26701: {website} add a new mirror (website/trunk/include)

2014-04-10 Thread Andrew Lewman

Author: phobos
Date: 2014-04-11 00:49:45 + (Fri, 11 Apr 2014)
New Revision: 26701

Modified:
   website/trunk/include/tor-mirrors.csv
Log:
add a new mirror


Modified: website/trunk/include/tor-mirrors.csv
===
--- website/trunk/include/tor-mirrors.csv   2014-04-09 19:45:27 UTC (rev 
26700)
+++ website/trunk/include/tor-mirrors.csv   2014-04-11 00:49:45 UTC (rev 
26701)
@@ -88,3 +88,4 @@
 Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, NO, 
http://tor-mirror.snurn.de, , , , http://tor-mirror.snurn.de/dist/, , , , Thu 
Mar 27 13:13:23 2014
 EFF, EFF, US, United States, US, TRUE, FALSE, NO, https://tor.eff.org, 
https://tor.eff.org, , , https://tor.eff.org/dist/, https://tor.eff.org/dist/, 
, , Tue Apr  8 23:51:05 2014
 Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, https://tor.void.gr, 
https://tor.void.gr, , , https://tor.void.gr/dist/, https://tor.void.gr/dist/, 
, , Tue Apr  8 23:51:05 2014
+Ich Eben,Tor 
Supporter,DE,Germany,DE,TRUE,TRUE,No,http://reichster.de/mirrors/torproject.org/,https://reichster.de/mirrors/torproject.org,,,http://reichster.de/mirrors/torproject.org/dist/,https://reichster.de/mirrors/torproject.org/dist/

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] r26702: {website} add more hints about running a mirror (website/trunk/docs/en)

2014-04-10 Thread Andrew Lewman

Author: phobos
Date: 2014-04-11 00:52:48 + (Fri, 11 Apr 2014)
New Revision: 26702

Modified:
   website/trunk/docs/en/running-a-mirror.wml
Log:
add more hints about running a mirror


Modified: website/trunk/docs/en/running-a-mirror.wml
===
--- website/trunk/docs/en/running-a-mirror.wml  2014-04-11 00:49:45 UTC (rev 
26701)
+++ website/trunk/docs/en/running-a-mirror.wml  2014-04-11 00:52:48 UTC (rev 
26702)
@@ -124,9 +124,13 @@
 
href=https://svn.torproject.org/svn/website/trunk/include/tor-mirrors.csv;this
 file/a to the mirrors list. Your mirror will then be added manually
 if it passes availability testing and your provided information is
-confirmed. Do not run your mirror behind a content delivery network
+confirmed. Some general pointers on mirrors are:
+olli Try not run your mirror behind a content delivery network
 (such as Akamai, Cloudflare, Fastly, etc), as most of them block
-access from countries where the mirror is needed the most.
+access from countries where the mirror is needed the most./li
+li Try not to redirect http to https. Many places in the world
+cannot use https due to firewalling./li
+/ol
 /p
   /div
   !-- END MAINCOL --

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Dear Turkish Translators: Don't translate the homepage URL, yo.

2014-04-10 Thread mikeperry

commit 5393b528462d265b87972bc1279d024b0efb9eb8
Author: Mike Perry mikeperry-...@torproject.org
Date:   Thu Apr 10 22:35:39 2014 -0700

Dear Turkish Translators: Don't translate the homepage URL, yo.

(Or the search engine names, but we'll deal with that later).

I fixed this in transifex too, but don't want to wait for transifex to get
pulled again.
---
 src/chrome/locale/tr/browser.properties |2 +-
 src/install.rdf |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/chrome/locale/tr/browser.properties 
b/src/chrome/locale/tr/browser.properties
index 0a3..c30bc36 100644
--- a/src/chrome/locale/tr/browser.properties
+++ b/src/chrome/locale/tr/browser.properties
@@ -1,5 +1,5 @@
 # Default home page
-browser.startup.homepage=hakkÄ±nda:tor
+browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=en_US
diff --git a/src/install.rdf b/src/install.rdf
index 370cad8..87db08f 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
 em:nameTorbutton/em:name
 em:creatorMike Perry/em:creator
 em:idtorbut...@torproject.org/em:id
-em:version1.6.8.0/em:version
+em:version1.6.8.1/em:version
 
em:homepageURLhttps://www.torproject.org/projects/torbrowser.html.en/em:homepageURL
 
em:optionsURLchrome://torbutton/content/preferences.xul/em:optionsURL
 em:iconURLchrome://torbutton/skin/tor.png/em:iconURL

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Bump Torbutton version for Turkish homepage fix.

2014-04-10 Thread mikeperry

commit 362bca4ed06cd0b12301492e2df8f69e9f6258e6
Author: Mike Perry mikeperry-...@torproject.org
Date:   Thu Apr 10 22:43:08 2014 -0700

Bump Torbutton version for Turkish homepage fix.
---
 Bundle-Data/Docs/ChangeLog.txt |2 +-
 gitian/versions.alpha  |2 +-
 gitian/versions.beta   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 194ce0f..4b72c7f 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -5,7 +5,7 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014
* Bug 9387 testing: Disable JS JIT, type inference, asmjs, and ion. 
* Update fte transport to 0.2.12
* Update NoScript to 2.6.8.19
-   * Update Torbutton to 1.6.8.0
+   * Update Torbutton to 1.6.8.1
  * Bug 11242: Fix improper update needed message after in-place upgrade.
  * Bug 10398: Ease translation of about:tor page elements
* Update Tor Launcher to 0.2.5.3
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 2bdbb2d..f53fbd8 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -9,7 +9,7 @@ FIREFOX_VERSION=24.4.0esr
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1
 TOR_TAG=tor-0.2.5.2-alpha
 TORLAUNCHER_TAG=0.2.5.1a
-TORBUTTON_TAG=1.6.7.0
+TORBUTTON_TAG=1.6.8.1
 HTTPSE_TAG=3.4.5
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8
diff --git a/gitian/versions.beta b/gitian/versions.beta
index ca59070..adb9818 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -9,7 +9,7 @@ FIREFOX_VERSION=24.4.0esr
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2
 TOR_TAG=tor-0.2.4.21
 TORLAUNCHER_TAG=0.2.5.3
-TORBUTTON_TAG=1.6.8.0
+TORBUTTON_TAG=1.6.8.1
 HTTPSE_TAG=3.4.5
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

38 matches

Mail list logo