[tor-commits] r26722: {website} drop tor store, move bitcoins to after dwolla in both the li (website/trunk/donate/en)

2014-04-20 Thread Andrew Lewman 
Author: phobos
Date: 2014-04-21 02:00:11 + (Mon, 21 Apr 2014)
New Revision: 26722

Modified:
   website/trunk/donate/en/donate.wml
Log:
drop tor store, move bitcoins to after dwolla in both the list and the form.


Modified: website/trunk/donate/en/donate.wml
===
--- website/trunk/donate/en/donate.wml  2014-04-21 01:39:23 UTC (rev 26721)
+++ website/trunk/donate/en/donate.wml  2014-04-21 02:00:11 UTC (rev 26722)
@@ -18,8 +18,7 @@
charitable donations. Our tax ID number is 20-8096820. We are listed on
   http://www2.guidestar.org/organizations/20-8096820/tor-project.aspx";>GuideStar.
 
-   We're happy to have you shop and indirectly support us via http://www.printfection.com/torprojectstore";>The Tor Store or
+   We're happy to have you shop and indirectly support us via 
 http://smile.amazon.com/ch/20-8096820";>Amazon Smile. A
 portion of your purchase is donated to help keep us working.
 
@@ -28,8 +27,8 @@
 Paypal
 Amazon Payments
 Dwolla
-checks, money orders, or bank transfers
-bitcoin
+Bitcoins
+checks, money orders, or bank 
transfers
   
 Contact us at donati...@torproject.org for more donation details.
 
@@ -167,47 +166,6 @@
 »
 
 
-   
-
-   
-   
- 
-   Donate via Check, Cash, Money Order, Bank Transfer
-   You can send checks or money orders to:
-   The Tor Project, Inc
-7 Temple Street, Suite A
-Cambridge, MA 02139-2403 USA
-
-
-   Donate via European Bank Transfer
-   For European bank transfers, we have an arrangement with
-http://www.ccc.de/";>CCC in Germany to provide
-tax-deductible donations for Europeans:
-Wau Holland Stiftung
-IBAN DE03 5204 0021 0277 281202
-SWIFT BIC COBADEFF520
-Classic style German account information is:
-Konto: 2772812-02
-Inhaber: Wau Holland Stiftung
-Bank: Commerzbank Kassel
-BLZ: 52040021
-
-  Residents from any of the 31 http://en.wikipedia.org/wiki/Single_Euro_Payments_Area";>SEPA
-  member states can wire up to 50.000 Euro at the cost of
-  a domestic transaction (i.e., usually free if submitted
-  electronically).
-  European citizens can make a charitable contribution that
-  is tax-deductible to a certain degree (Germany: max 20% of total 
income).
-  
-  Corporate entities can deduct donations up to 4/1000 of
-  their combined turnovers, wages and salaries. WHS issues
-  a donation receipt upon request (if provided with address
-  information).
-
- 
-   
-
 


@@ -284,6 +242,47 @@
 

 
+   
+
+   
+   
+ 
+   Donate via Check, Cash, Money Order, Bank Transfer
+   You can send checks or money orders to:
+   The Tor Project, Inc
+7 Temple Street, Suite A
+Cambridge, MA 02139-2403 USA
+
+
+   Donate via European Bank Transfer
+   For European bank transfers, we have an arrangement with
+http://www.ccc.de/";>CCC in Germany to provide
+tax-deductible donations for Europeans:
+Wau Holland Stiftung
+IBAN DE03 5204 0021 0277 281202
+SWIFT BIC COBADEFF520
+Classic style German account information is:
+Konto: 2772812-02
+Inhaber: Wau Holland Stiftung
+Bank: Commerzbank Kassel
+BLZ: 52040021
+
+  Residents from any of the 31 http://en.wikipedia.org/wiki/Single_Euro_Payments_Area";>SEPA
+  member states can wire up to 50.000 Euro at the cost of
+  a domestic transaction (i.e., usually free if submitted
+  electronically).
+  European citizens can make a charitable contribution that
+  is tax-deductible to a certain degree (Germany: max 20% of total 
income).
+  
+  Corporate entities can deduct donations up to 4/1000 of
+  their combined turnovers, wages and salaries. WHS issues
+  a donation receipt upon request (if provided with address
+  information).
+
+ 
+   
+
 
 
   

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

[tor-commits] r26721: {website} remove account limits on bitcoins, remove givv since we get (website/trunk/donate/en)

2014-04-20 Thread Andrew Lewman 
Author: phobos
Date: 2014-04-21 01:39:23 + (Mon, 21 Apr 2014)
New Revision: 26721

Modified:
   website/trunk/donate/en/donate.wml
Log:
remove account limits on bitcoins, remove givv since we get zero donations 
through them.


Modified: website/trunk/donate/en/donate.wml
===
--- website/trunk/donate/en/donate.wml  2014-04-20 02:29:59 UTC (rev 26720)
+++ website/trunk/donate/en/donate.wml  2014-04-21 01:39:23 UTC (rev 26721)
@@ -28,7 +28,6 @@
 Paypal
 Amazon Payments
 Dwolla
-Givv.org
 checks, money orders, or bank transfers
 bitcoin
   
@@ -168,17 +167,6 @@
 »
 
 
-
-
-
-  Donate via Givv.org
-  Givv.org is a new way to think about making your impact. Make
-  one monthly donation. To as many nonprofits as you like. Automatic,
-  one-click giving. You stay anonymous to Tor and stay in
-  control!
-  http://givv.org/recipients/the-tor-project";>Continue to Givv.org 
»
-
-

 

@@ -231,9 +219,7 @@
 or https://tails.boum.org/contribute/how/donate/#bitcoin";>Tails
 which will turn your bitcoin donation into a faster, larger Tor
 Network for all.
-  If you are committed to donating bitcoins to Tor, please use our
-  BitPay account. We're limited to $1000/day at this time. We're working
-  with Bitpay to remove this limit.
+  If you are committed to donating bitcoins to Tor, please complete the 
form below.
   https://bitpay.com/checkout"; method="post" 
onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));">
 
 

___
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-20 Thread translation 
commit d00515a9beca7f6009a12c4f5ef8a79826621aae
Author: Translation commit bot 
Date:   Sun Apr 20 20:45:34 2014 +

Update translations for tails-misc
---
 fi.po |   35 ++-
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/fi.po b/fi.po
index ab8a155..0654b79 100644
--- a/fi.po
+++ b/fi.po
@@ -5,13 +5,14 @@
 # Translators:
 # Tomi Toivio , 2013
 # tonttula, 2013
+# Finland355 , 2014
 msgid ""
 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"
-"Last-Translator: runasand \n"
+"PO-Revision-Date: 2014-04-20 20:25+\n"
+"Last-Translator: Finland355 \n"
 "Language-Team: Finnish 
(http://www.transifex.com/projects/p/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,11 +22,11 @@ msgstr ""
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
 msgid "Tor is ready"
-msgstr ""
+msgstr "Tor on valmis."
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44
 msgid "You can now access the Internet."
-msgstr ""
+msgstr "Voit nyt päästä internettiin."
 
 #: config/chroot_local-includes/etc/whisperback/config.py:64
 #, python-format
@@ -81,7 +82,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:296
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:298
 msgid "Unknown Trust"
-msgstr ""
+msgstr "Tuntematon Luotettavuus."
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:300
 msgid "Marginal Trust"
@@ -89,7 +90,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:302
 msgid "Full Trust"
-msgstr ""
+msgstr "Täysy luotettavuus."
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:304
 msgid "Ultimate Trust"
@@ -200,15 +201,15 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/iceweasel:12
 msgid "Tor is not ready"
-msgstr ""
+msgstr "Tor ei ole valmis."
 
 #: config/chroot_local-includes/usr/local/bin/iceweasel:13
 msgid "Tor is not ready. Start Tor Browser anyway?"
-msgstr ""
+msgstr "Tor ei ole valmis. Käynnistä Tor selain joka tapauksessa?"
 
 #: config/chroot_local-includes/usr/local/bin/iceweasel:14
 msgid "Start Tor Browser"
-msgstr ""
+msgstr "Käynnistä Tor Selain"
 
 #: config/chroot_local-includes/usr/local/bin/iceweasel:15
 msgid "Cancel"
@@ -229,7 +230,7 @@ msgstr "ei saatavilla"
 #: config/chroot_local-includes/usr/local/bin/tails-about:16
 #: 
../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1
 msgid "Tails"
-msgstr ""
+msgstr "Tails"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:17
 msgid "The Amnesic Incognito Live System"
@@ -244,7 +245,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:20
 msgid "About Tails"
-msgstr ""
+msgstr "Tailssista"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124
@@ -262,7 +263,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
 msgid "The upgrade was successful."
-msgstr ""
+msgstr "Päivitys onnistui."
 
 #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52
 msgid "Synchronizing the system's clock"
@@ -280,7 +281,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38
 msgid "Network connection blocked?"
-msgstr ""
+msgstr "Verkko yhteys estetty?"
 
 #: 
config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40
 msgid ""
@@ -292,7 +293,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:145
 msgid "This version of Tails has known security issues:"
-msgstr ""
+msgstr "Tässä versiossa Tailissa on tunnettuja turvallisuus riskejä:"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29
 #, sh-format
@@ -308,7 +309,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39
 msgid "All networking disabled"
-msgstr ""
+msgstr "Kaikki verkot sammutettu"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40
 #, sh-format
@@ -319,7 +320,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62
 msgid "Starting I2P..."
-msgstr ""
+msgstr "Aloitetaan I2P:tä"
 
 #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63
 msgid "The I2P router console will be opened on start."
@@ -465,7 +466,7 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2
 msgid "Learn how to use Tails"
-msgstr ""
+msgstr "Opettele kuinka käytetään tailsia."
 
 #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1
 msgid "Anonymous overlay network "

___
tor-commits mail

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

2014-04-20 Thread translation 
commit acfd4659c535cfd65f659673ed11a209b05733fa
Author: Translation commit bot 
Date:   Sun Apr 20 20:15:20 2014 +

Update translations for tails-persistence-setup
---
 fi/fi.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fi/fi.po b/fi/fi.po
index e1f18fc..a35f9a2 100644
--- a/fi/fi.po
+++ b/fi/fi.po
@@ -6,13 +6,14 @@
 # karvjorm , 2014
 # Akiram , 2013
 # mikkoharhanen , 2013
+# Finland355 , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2014-04-16 21:26+0200\n"
-"PO-Revision-Date: 2014-04-17 09:09+\n"
-"Last-Translator: runasand \n"
+"PO-Revision-Date: 2014-04-20 20:07+\n"
+"Last-Translator: Finland355 \n"
 "Language-Team: Finnish 
(http://www.transifex.com/projects/p/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,7 +172,7 @@ msgstr "Laite %s on optinen."
 #: ../lib/Tails/Persistence/Setup.pm:415
 #, perl-format
 msgid "Device %s was not created using Tails Installer."
-msgstr ""
+msgstr "Laite %s ei ollut luotu käyttäen Tails-asennusohjelmaa."
 
 #: ../lib/Tails/Persistence/Setup.pm:450
 msgid "Error"

___
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_completed] Update translations for tails-persistence-setup_completed

2014-04-20 Thread translation 
commit b2ee362ab1ceca2fa4ab56c62847f7dd8989f810
Author: Translation commit bot 
Date:   Sun Apr 20 20:15:22 2014 +

Update translations for tails-persistence-setup_completed
---
 fi/fi.po |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fi/fi.po b/fi/fi.po
index 2ccb6f3..a35f9a2 100644
--- a/fi/fi.po
+++ b/fi/fi.po
@@ -6,13 +6,14 @@
 # karvjorm , 2014
 # Akiram , 2013
 # mikkoharhanen , 2013
+# Finland355 , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2014-01-18 21:00+0100\n"
-"PO-Revision-Date: 2014-03-16 16:00+\n"
-"Last-Translator: karvjorm \n"
+"POT-Creation-Date: 2014-04-16 21:26+0200\n"
+"PO-Revision-Date: 2014-04-20 20:07+\n"
+"Last-Translator: Finland355 \n"
 "Language-Team: Finnish 
(http://www.transifex.com/projects/p/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -170,8 +171,8 @@ msgstr "Laite %s on optinen."
 
 #: ../lib/Tails/Persistence/Setup.pm:415
 #, perl-format
-msgid "Device %s was not created using Tails USB installer."
-msgstr "Laitetta %s ei luotu Tailsin USB-asennusohjelmalla."
+msgid "Device %s was not created using Tails Installer."
+msgstr "Laite %s ei ollut luotu käyttäen Tails-asennusohjelmaa."
 
 #: ../lib/Tails/Persistence/Setup.pm:450
 msgid "Error"

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

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

2014-04-20 Thread translation 
commit 02bff6c34a3ddef43273e457becdf1dc52a5f09d
Author: Translation commit bot 
Date:   Sun Apr 20 19:45:32 2014 +

Update translations for tor-launcher-progress
---
 fi/progress.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fi/progress.dtd b/fi/progress.dtd
index a64bec4..75e3532 100644
--- a/fi/progress.dtd
+++ b/fi/progress.dtd
@@ -1,4 +1,4 @@
 
 
 
-
+

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

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

2014-04-20 Thread translation 
commit e49eec3fc0344d0e35063b14d274fba368eb2c3c
Author: Translation commit bot 
Date:   Sun Apr 20 19:45:34 2014 +

Update translations for tor-launcher-progress_completed
---
 fi/progress.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fi/progress.dtd b/fi/progress.dtd
index 36792ee..75e3532 100644
--- a/fi/progress.dtd
+++ b/fi/progress.dtd
@@ -1,4 +1,4 @@
 
 
 
-
+

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

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

2014-04-20 Thread translation 
commit bdb73bbc1c9dcff0647b396e358ff869b391a92e
Author: Translation commit bot 
Date:   Sun Apr 20 19:45:04 2014 +

Update translations for gettor
---
 fi/gettor.po |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fi/gettor.po b/fi/gettor.po
index 5fb1bbd..f7f0794 100644
--- a/fi/gettor.po
+++ b/fi/gettor.po
@@ -7,13 +7,14 @@
 # Jacob Appelbaum , 2009
 # SamiPerkele, 2014
 # tonttula, 2013
+# Finland355 , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-01-19 13:40+0100\n"
-"PO-Revision-Date: 2014-04-10 03:20+\n"
-"Last-Translator: SamiPerkele\n"
+"PO-Revision-Date: 2014-04-20 19:44+\n"
+"Last-Translator: Finland355 \n"
 "Language-Team: Finnish 
(http://www.transifex.com/projects/p/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -207,7 +208,7 @@ msgstr "TUKI\n==="
 msgid ""
 "Here's your requested software as a zip file. Please unzip the\n"
 "package and verify the signature."
-msgstr ""
+msgstr "Tässä on pyytämäsi ohjelmisto zip-tiedostona. Ole hyvä ja pura 
\npakattu tiedosto ja tarkistaa allekirjoitus."
 
 #: lib/gettor/i18n.py:141
 msgid ""
@@ -238,7 +239,7 @@ msgstr ""
 msgid ""
 "BLOCKED ACCESS / CENSORSHIP\n"
 "==="
-msgstr ""
+msgstr "PÄÄSY ESTETTY/SENSUROITU"
 
 #: lib/gettor/i18n.py:160
 msgid ""
@@ -456,7 +457,7 @@ msgid ""
 "Tor network. You can read more about how Tor works here:\n"
 "\n"
 "https://www.torproject.org/about/overview.html.en";
-msgstr ""
+msgstr "Tor ohjelmisto on ohjelma, jonka voit suorittaa tietokoneella, joka 
auttaa \npitämään sinut turvassa Internetissä. Tor suojaa sinua pomppimalla 
\nviestinnän ympärille jaetulla tiedotuspisteverkon vapaaehtoisvoimin 
\nympäri maailmaa: se estää jonkun katselemasta internet-yhteyttäsi. \n ja 
estää oppimasta millaisilla sivustoilla vierailet, ja se estää web-sivuilla 
olevia \n fyysisen sijainnin jäljityksiä. Tämä joukko vapaaehtoisten 
suorittamat releet ovat \nTor-verkko. Voit lukea lisää siitä, miten Tor 
toimii tässä: https://www.torproject.org/about/overview.html.en";
 
 #: lib/gettor/i18n.py:286
 msgid "What is the Tor Browser Bundle?"

___
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_completed] Update translations for tails-persistence-setup_completed

2014-04-20 Thread translation 
commit 1dfe51a4767fa38de17b5a77cfbc42f5c214772e
Author: Translation commit bot 
Date:   Sun Apr 20 12:15:24 2014 +

Update translations for tails-persistence-setup_completed
---
 sk/sk.po |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sk/sk.po b/sk/sk.po
index a147d75..1329efa 100644
--- a/sk/sk.po
+++ b/sk/sk.po
@@ -5,12 +5,13 @@
 # Translators:
 # Michelozzo , 2013
 # Svistwarrior273 , 2014
+# Svistwarrior273 , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2014-01-18 21:00+0100\n"
-"PO-Revision-Date: 2014-03-31 15:39+\n"
+"POT-Creation-Date: 2014-04-16 21:26+0200\n"
+"PO-Revision-Date: 2014-04-20 12:10+\n"
 "Last-Translator: Svistwarrior273 \n"
 "Language-Team: Slovak 
(http://www.transifex.com/projects/p/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -169,8 +170,8 @@ msgstr "Zariadenie %s je optické."
 
 #: ../lib/Tails/Persistence/Setup.pm:415
 #, perl-format
-msgid "Device %s was not created using Tails USB installer."
-msgstr "Zariadenie %s nebolo vytvorené pomocou Tails USB inštalátora."
+msgid "Device %s was not created using Tails Installer."
+msgstr "Zariadenie %s nebolo vytvorené pomocou inštalátora Tails."
 
 #: ../lib/Tails/Persistence/Setup.pm:450
 msgid "Error"

___
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-20 Thread translation 
commit 313f217a7b0fda3f02f4e6e984d2069c1ba3e3e2
Author: Translation commit bot 
Date:   Sun Apr 20 12:15:36 2014 +

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

diff --git a/sk/torlauncher.properties b/sk/torlauncher.properties
index 03da390..4743463 100644
--- a/sk/torlauncher.properties
+++ b/sk/torlauncher.properties
@@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=nesprávna identita
 torlauncher.bootstrapWarning.timeout=časový limit pripojenia 
 torlauncher.bootstrapWarning.noroute=žiadna cesta k hostiteľovi
 torlauncher.bootstrapWarning.ioerror=chyba pri načítaní/zápise
+torlauncher.bootstrapWarning.pt_missing=chýbajúca zásuvná preprava

___
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-20 Thread translation 
commit 134696705b30128fc834ed2bb1a1ea6a79a446f3
Author: Translation commit bot 
Date:   Sun Apr 20 12:15:21 2014 +

Update translations for tails-persistence-setup
---
 sk/sk.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sk/sk.po b/sk/sk.po
index 76c6162..1329efa 100644
--- a/sk/sk.po
+++ b/sk/sk.po
@@ -5,13 +5,14 @@
 # Translators:
 # Michelozzo , 2013
 # Svistwarrior273 , 2014
+# Svistwarrior273 , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2014-04-16 21:26+0200\n"
-"PO-Revision-Date: 2014-04-17 09:09+\n"
-"Last-Translator: runasand \n"
+"PO-Revision-Date: 2014-04-20 12:10+\n"
+"Last-Translator: Svistwarrior273 \n"
 "Language-Team: Slovak 
(http://www.transifex.com/projects/p/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -170,7 +171,7 @@ msgstr "Zariadenie %s je optické."
 #: ../lib/Tails/Persistence/Setup.pm:415
 #, perl-format
 msgid "Device %s was not created using Tails Installer."
-msgstr ""
+msgstr "Zariadenie %s nebolo vytvorené pomocou inštalátora Tails."
 
 #: ../lib/Tails/Persistence/Setup.pm:450
 msgid "Error"

___
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] Update translations for tor-launcher-properties

2014-04-20 Thread translation 
commit a58093b4bce5c8a3a0cd496baa3b67847fa2d9c7
Author: Translation commit bot 
Date:   Sun Apr 20 12:15:33 2014 +

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

diff --git a/sk/torlauncher.properties b/sk/torlauncher.properties
index 88902b0..4743463 100644
--- a/sk/torlauncher.properties
+++ b/sk/torlauncher.properties
@@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=nesprávna identita
 torlauncher.bootstrapWarning.timeout=časový limit pripojenia 
 torlauncher.bootstrapWarning.noroute=žiadna cesta k hostiteľovi
 torlauncher.bootstrapWarning.ioerror=chyba pri načítaní/zápise
-torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
+torlauncher.bootstrapWarning.pt_missing=chýbajúca zásuvná preprava

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

[tor-commits] [onionoo/master] Always contain non-empty documents for known relays/bridges.

2014-04-20 Thread karsten 
commit 2cb2bd456cf938b67f38f96141d3b9a629f098f5
Author: Karsten Loesing 
Date:   Sun Apr 20 13:59:16 2014 +0200

Always contain non-empty documents for known relays/bridges.

If we can't find a bandwidth/weights/clients/uptime document for a known
relay or bridge, generate one on the fly that only contains the relay's or
bridge's (hashed) fingerprint.

Implements #11428.
---
 src/org/torproject/onionoo/ResponseBuilder.java |   16 
 web/index.html  |   15 ++-
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/org/torproject/onionoo/ResponseBuilder.java 
b/src/org/torproject/onionoo/ResponseBuilder.java
index 2b22c59..f76d078 100644
--- a/src/org/torproject/onionoo/ResponseBuilder.java
+++ b/src/org/torproject/onionoo/ResponseBuilder.java
@@ -209,9 +209,7 @@ public class ResponseBuilder {
   bandwidthLines.length() - 1);
   return bandwidthLines;
 } else {
-  // TODO We should probably log that we didn't find a bandwidth
-  // document that we expected to exist.
-  return "";
+  return "{\"fingerprint\":\"" + fingerprint.toUpperCase() + "\"}";
 }
   }
 
@@ -225,9 +223,7 @@ public class ResponseBuilder {
   weightsLines = weightsLines.substring(0, weightsLines.length() - 1);
   return weightsLines;
 } else {
-  // TODO We should probably log that we didn't find a weights
-  // document that we expected to exist.
-  return "";
+  return "{\"fingerprint\":\"" + fingerprint.toUpperCase() + "\"}";
 }
   }
 
@@ -241,9 +237,7 @@ public class ResponseBuilder {
   clientsLines = clientsLines.substring(0, clientsLines.length() - 1);
   return clientsLines;
 } else {
-  // TODO We should probably log that we didn't find a clients
-  // document that we expected to exist.
-  return "";
+  return "{\"fingerprint\":\"" + fingerprint.toUpperCase() + "\"}";
 }
   }
 
@@ -257,9 +251,7 @@ public class ResponseBuilder {
   uptimeLines = uptimeLines.substring(0, uptimeLines.length() - 1);
   return uptimeLines;
 } else {
-  // TODO We should probably log that we didn't find an uptime
-  // document that we expected to exist.
-  return "";
+  return "{\"fingerprint\":\"" + fingerprint.toUpperCase() + "\"}";
 }
   }
 }
diff --git a/web/index.html b/web/index.html
index afe4f88..c941f4e 100644
--- a/web/index.html
+++ b/web/index.html
@@ -1474,7 +1474,7 @@ hexadecimal characters.
 
 write_history
 object
-required
+optional
 
 Object containing graph history objects with written bytes for different
 time periods.
@@ -1493,18 +1493,20 @@ The unit is bytes per second.
 Contained graph history objects may contain null values if the relay did
 not provide any bandwidth data or only data for less than 20% of a given
 time period.
+As of April 20, 2014, this field is optional.
 
 
 
 
 read_history
 object
-required
+optional
 
 Object containing graph history objects with read bytes for different time
 periods.
 The specification of graph history objects is similar to those in the
 write_history field.
+As of April 20, 2014, this field is optional.
 
 
 
@@ -1531,24 +1533,26 @@ of 40 upper-case hexadecimal characters.
 
 write_history
 object
-required
+optional
 
 Object containing graph history objects with written bytes for different
 time periods.
 The specification of graph history objects is similar to those in the
 write_history field of relays.
+As of April 20, 2014, this field is optional.
 
 
 
 
 read_history
 object
-required
+optional
 
 Object containing graph history objects with read bytes for different time
 periods.
 The specification of graph history objects is similar to those in the
 write_history field of relays.
+As of April 20, 2014, this field is optional.
 
 
 
@@ -2023,11 +2027,12 @@ of 40 upper-case hexadecimal characters.
 
 uptime
 object
-required
+optional
 
 Object containing uptime history objects for different time periods.
 The specification of uptime history objects is similar to those in the
 uptime field of relays.
+As of April 20, 2014, this field is optional.
 
 
 

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

[tor-commits] [onionoo/master] Add a new fingerprint parameter.

2014-04-20 Thread karsten 
commit 8f63e74709cd05cd812e33f95ffe51b05d6d537c
Author: Karsten Loesing 
Date:   Sun Apr 20 00:49:36 2014 +0200

Add a new fingerprint parameter.

By default, we are limiting all responses to relays or bridges that have
been running in the past 7 days.  The main reason for this is performance.

We're now making an exception for specific lookups by fingerprint or
hashed fingerprint.  These lookups don't use the node index, but attempt
to read the relay's or bridge's details document and extract all
information needed to compile a summary document or locate one of the
other documents.

There may be more elegant solutions, but we'll probably have to switch to
a database design for them.

Implements #11350.
---
 src/org/torproject/onionoo/DocumentStore.java  |   89 +++-
 src/org/torproject/onionoo/RequestHandler.java |   29 ++-
 src/org/torproject/onionoo/ResourceServlet.java|   20 +++--
 .../torproject/onionoo/ResourceServletTest.java|   44 +-
 web/index.html |   43 +++---
 5 files changed, 204 insertions(+), 21 deletions(-)

diff --git a/src/org/torproject/onionoo/DocumentStore.java 
b/src/org/torproject/onionoo/DocumentStore.java
index e8b35b5..0bc2970 100644
--- a/src/org/torproject/onionoo/DocumentStore.java
+++ b/src/org/torproject/onionoo/DocumentStore.java
@@ -13,6 +13,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.Scanner;
 import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.Stack;
@@ -239,7 +240,93 @@ public class DocumentStore {
   }
 
   private NodeStatus retrieveNodeStatus(String fingerprint) {
-return this.cachedNodeStatuses.get(fingerprint);
+if (this.cachedNodeStatuses.containsKey(fingerprint)) {
+  return this.cachedNodeStatuses.get(fingerprint);
+} else if (this.listedArchivedNodeStatuses) {
+  return null;
+}
+/* TODO This is an evil hack to support looking up relays or bridges
+ * that haven't been running for a week without having to load
+ * 500,000 NodeStatus instances into memory.  Maybe there's a better
+ * way?  Or do we need to switch to a real database for this? */
+DetailsDocument detailsDocument = this.retrieveDocumentFile(
+DetailsDocument.class, false, fingerprint);
+if (detailsDocument == null) {
+  return null;
+}
+try {
+  boolean isRelay = true, running = false;
+  String nickname = null, address = null, countryCode = null,
+  hostName = null, defaultPolicy = null, portList = null,
+  aSNumber = null, contact = null;
+  SortedSet orAddressesAndPorts = new TreeSet(),
+  exitAddresses = new TreeSet(),
+  relayFlags = new TreeSet();
+  long lastSeenMillis = -1L, consensusWeight = -1L,
+  lastRdnsLookup = -1L, firstSeenMillis = -1L,
+  lastChangedAddresses = -1L;
+  int orPort = 0, dirPort = 0;
+  Boolean recommendedVersion = null;
+  Scanner s = new Scanner(detailsDocument.getDocumentString());
+  while (s.hasNextLine()) {
+String line = s.nextLine();
+if (!line.contains(":")) {
+  continue;
+}
+String[] parts = line.split(":", 2);
+String key = parts[0], value = parts[1];
+if (key.equals("\"nickname\"")) {
+  if (!value.startsWith("\"") || !value.endsWith("\",")) {
+return null;
+  }
+  nickname = value.substring(1, value.length() - 2);
+} else if (key.equals("\"hashed_fingerprint\"")) {
+  isRelay = false;
+} else if (key.equals("\"or_addresses\"")) {
+  if (!value.startsWith("[") || !value.endsWith("],")) {
+return null;
+  }
+  for (String addressAndPort :
+  value.substring(1, value.length() - 2).split(",")) {
+if (addressAndPort.length() < 2 ||
+!addressAndPort.contains(":")) {
+  return null;
+}
+if (address == null) {
+  address = addressAndPort.substring(1,
+  addressAndPort.lastIndexOf(":"));
+} else {
+  orAddressesAndPorts.add(addressAndPort);
+}
+  }
+} else if (key.equals("\"exit_addresses\"")) {
+  if (!value.startsWith("[") || !value.endsWith("],")) {
+return null;
+  }
+  for (String addressPart :
+  value.substring(1, value.length() - 2).split(",")) {
+exitAddresses.add(addressPart);
+  }
+} else if (key.equals("\"running\"")) {
+  if (value.equals("true,")) {
+running = true;
+  } else if (!value.equals("false,")) {
+return null;
+  }
+}
+  }
+  NodeStatus nodeStatus = new NodeStatus(isRelay, nickname,
+  fingerprint, addr

[tor-commits] [doctor/java] Replace with newline in relay list and format with CSS.

2014-04-20 Thread karsten 
commit ea9196ead7f06176bd2860102b43947d9166b662
Author: Michael Wolf 
Date:   Sun Apr 20 03:39:29 2014 -0400

Replace  with newline in relay list and format with CSS.

* Implements part 4 of ticket #11563
---
 src/org/torproject/doctor/MetricsWebsiteReport.java |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/org/torproject/doctor/MetricsWebsiteReport.java 
b/src/org/torproject/doctor/MetricsWebsiteReport.java
index f6f59f8..28d9e9a 100644
--- a/src/org/torproject/doctor/MetricsWebsiteReport.java
+++ b/src/org/torproject/doctor/MetricsWebsiteReport.java
@@ -130,6 +130,9 @@ public class MetricsWebsiteReport {
 +   "height:3em;\n"
 +   "vertical-align:bottom;\n"
 + "}\n"
++ "#relay-list td {\n"
++   "white-space:pre;\n"
++ "}\n"
 +   "\n"
 + "\n"
 +   "\n"
@@ -678,7 +681,7 @@ public class MetricsWebsiteReport {
 + "\n"
 + "\n"
 + "\n"
++ "cellspacing=\"0\" id=\"relay-list\" summary=\"\">\n"
 +   "\n"
 + "\n"
 + "\n");
@@ -759,7 +762,7 @@ public class MetricsWebsiteReport {
 this.bw.write("");
 int flagsWritten = 0;
 for (String flag : relevantFlags) {
-  this.bw.write(flagsWritten++ > 0 ? "" : "");
+  this.bw.write(flagsWritten++ > 0 ? "\n" : "");
   if (flags.contains(flag)) {
 if (consensusFlags == null ||
   consensusFlags.contains(flag)) {

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

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2014-04-20 Thread translation 
commit e4dd3ed567ad2eece2dc0e8ea818bb25b2c7a7e5
Author: Translation commit bot 
Date:   Sun Apr 20 09:45:18 2014 +

Update translations for liveusb-creator
---
 fr/fr.po |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/fr/fr.po b/fr/fr.po
index f75a8b2..47554c5 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-04-16 21:40+0200\n"
-"PO-Revision-Date: 2014-04-19 17:25+\n"
+"PO-Revision-Date: 2014-04-20 09:41+\n"
 "Last-Translator: bassmax\n"
 "Language-Team: French 
(http://www.transifex.com/projects/p/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -137,7 +137,7 @@ msgstr "Cloner\n&&\nMettre à jour"
 #: ../liveusb/creator.py:400
 #, python-format
 msgid "Creating %sMB persistent overlay"
-msgstr "Création du stockage persistant de %s MB"
+msgstr "Création du volume persistant de %s MB"
 
 #: ../liveusb/gui.py:567
 msgid ""
@@ -194,7 +194,7 @@ msgstr "Extraction en cours de l'image Live vers le 
périphérique destination..
 #: ../liveusb/creator.py:1063
 #, python-format
 msgid "Formatting %(device)s as FAT32"
-msgstr "Création d'un système de fichiers FAT32 sur %(device)s"
+msgstr "Formattage de %(device)s en FAT32"
 
 #: ../liveusb/creator.py:140
 msgid "ISO MD5 checksum passed"
@@ -229,7 +229,7 @@ msgstr "L'installation est terminée. Appuyez sur OK pour 
fermer ce programme."
 
 #: ../liveusb/creator.py:916 ../liveusb/creator.py:1239
 msgid "Installing bootloader..."
-msgstr "Installation du chargeur de démarrage..."
+msgstr "Installation du bootloader..."
 
 #: ../liveusb/gui.py:284
 msgid "LiveUSB creation failed!"
@@ -266,7 +266,7 @@ msgstr "Pas assez d'espace libre sur le périphérique."
 
 #: ../liveusb/gui.py:554
 msgid "Partition is FAT16; Restricting overlay size to 2G"
-msgstr "La partition est de type FAT16, la taille de stockage est donc 
restreinte à 2 Go"
+msgstr "La partition est de type FAT16, la taille du volume est donc 
restreinte à 2 Go"
 
 #: ../liveusb/gui.py:550
 msgid "Partition is FAT32; Restricting overlay size to 4G"
@@ -447,13 +447,13 @@ msgstr "Impossible d'enlever le fichier du système 
d'exploitation Live précéd
 #: ../liveusb/creator.py:1115
 msgid ""
 "Unable to reset MBR.  You may not have the `syslinux` package installed."
-msgstr "Impossible de réinitialiser le MBR. Vous n'avez peut-être pas 
installé le paquet `syslinux` ?"
+msgstr "Impossible de réinitialiser le MBR. Le paquet `syslinux` n'est sans 
doute pas installé."
 
 #: ../liveusb/gui.py:802
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\\)"
-msgstr "Impossible d'utiliser le fichier sélectionné. Vous devriez avoir 
plus de chance en déplacant l'ISO à la racine de votre disque (par exemple : 
C:\\)"
+msgstr "Impossible d'utiliser le fichier sélectionné. Vous devriez avoir 
plus de chance en déplacant l'ISO à la racine de votre disque (i.e. : C:\\)"
 
 #: ../liveusb/creator.py:697
 #, python-format
@@ -546,7 +546,7 @@ msgid ""
 "Warning: The Master Boot Record on your device does not match your system's "
 "syslinux MBR.  If you have trouble booting this stick, try running the "
 "liveusb-creator with the --reset-mbr option."
-msgstr "Attention : le « Master Boot Record » de votre périphérique ne 
correspond pas à celui de votre syslinux. Si vous avez des problèmes à 
démarrer sur cette clé USB, essayer de lancer usb-creator avec l'option « 
--reset-mbr »."
+msgstr "Attention : le « Master Boot Record » de votre périphérique ne 
correspond pas à celui de votre syslinux. Si vous avez des problèmes pour 
démarrer sur cette clé USB, essayer de lancer usb-creator avec l'option « 
--reset-mbr »."
 
 #: ../liveusb/gui.py:392
 msgid ""

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

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2014-04-20 Thread translation 
commit 528acc8ff0d48c81049b3c7114839a2e3c8ab55e
Author: Translation commit bot 
Date:   Sun Apr 20 09:45:23 2014 +

Update translations for liveusb-creator_completed
---
 fr/fr.po |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/fr/fr.po b/fr/fr.po
index f75a8b2..47554c5 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-04-16 21:40+0200\n"
-"PO-Revision-Date: 2014-04-19 17:25+\n"
+"PO-Revision-Date: 2014-04-20 09:41+\n"
 "Last-Translator: bassmax\n"
 "Language-Team: French 
(http://www.transifex.com/projects/p/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -137,7 +137,7 @@ msgstr "Cloner\n&&\nMettre à jour"
 #: ../liveusb/creator.py:400
 #, python-format
 msgid "Creating %sMB persistent overlay"
-msgstr "Création du stockage persistant de %s MB"
+msgstr "Création du volume persistant de %s MB"
 
 #: ../liveusb/gui.py:567
 msgid ""
@@ -194,7 +194,7 @@ msgstr "Extraction en cours de l'image Live vers le 
périphérique destination..
 #: ../liveusb/creator.py:1063
 #, python-format
 msgid "Formatting %(device)s as FAT32"
-msgstr "Création d'un système de fichiers FAT32 sur %(device)s"
+msgstr "Formattage de %(device)s en FAT32"
 
 #: ../liveusb/creator.py:140
 msgid "ISO MD5 checksum passed"
@@ -229,7 +229,7 @@ msgstr "L'installation est terminée. Appuyez sur OK pour 
fermer ce programme."
 
 #: ../liveusb/creator.py:916 ../liveusb/creator.py:1239
 msgid "Installing bootloader..."
-msgstr "Installation du chargeur de démarrage..."
+msgstr "Installation du bootloader..."
 
 #: ../liveusb/gui.py:284
 msgid "LiveUSB creation failed!"
@@ -266,7 +266,7 @@ msgstr "Pas assez d'espace libre sur le périphérique."
 
 #: ../liveusb/gui.py:554
 msgid "Partition is FAT16; Restricting overlay size to 2G"
-msgstr "La partition est de type FAT16, la taille de stockage est donc 
restreinte à 2 Go"
+msgstr "La partition est de type FAT16, la taille du volume est donc 
restreinte à 2 Go"
 
 #: ../liveusb/gui.py:550
 msgid "Partition is FAT32; Restricting overlay size to 4G"
@@ -447,13 +447,13 @@ msgstr "Impossible d'enlever le fichier du système 
d'exploitation Live précéd
 #: ../liveusb/creator.py:1115
 msgid ""
 "Unable to reset MBR.  You may not have the `syslinux` package installed."
-msgstr "Impossible de réinitialiser le MBR. Vous n'avez peut-être pas 
installé le paquet `syslinux` ?"
+msgstr "Impossible de réinitialiser le MBR. Le paquet `syslinux` n'est sans 
doute pas installé."
 
 #: ../liveusb/gui.py:802
 msgid ""
 "Unable to use the selected file.  You may have better luck if you move your "
 "ISO to the root of your drive (ie: C:\\)"
-msgstr "Impossible d'utiliser le fichier sélectionné. Vous devriez avoir 
plus de chance en déplacant l'ISO à la racine de votre disque (par exemple : 
C:\\)"
+msgstr "Impossible d'utiliser le fichier sélectionné. Vous devriez avoir 
plus de chance en déplacant l'ISO à la racine de votre disque (i.e. : C:\\)"
 
 #: ../liveusb/creator.py:697
 #, python-format
@@ -546,7 +546,7 @@ msgid ""
 "Warning: The Master Boot Record on your device does not match your system's "
 "syslinux MBR.  If you have trouble booting this stick, try running the "
 "liveusb-creator with the --reset-mbr option."
-msgstr "Attention : le « Master Boot Record » de votre périphérique ne 
correspond pas à celui de votre syslinux. Si vous avez des problèmes à 
démarrer sur cette clé USB, essayer de lancer usb-creator avec l'option « 
--reset-mbr »."
+msgstr "Attention : le « Master Boot Record » de votre périphérique ne 
correspond pas à celui de votre syslinux. Si vous avez des problèmes pour 
démarrer sur cette clé USB, essayer de lancer usb-creator avec l'option « 
--reset-mbr »."
 
 #: ../liveusb/gui.py:392
 msgid ""

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