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

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 20 Sep '15

20 Sep '15

commit 318d3b1f01cd1605da24673a15fa41c0d17c40ca Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 20 18:46:29 2015 +0000 Update translations for tor-messenger-ircproperties_completed --- nl/irc.properties | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) diff --git a/nl/irc.properties b/nl/irc.properties new file mode 100644 index 0000000..b1753a4 --- /dev/null +++ b/nl/irc.properties @@ -0,0 +1,205 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# LOCALIZATION NOTE (irc.usernameHint): +# This is displayed inside the accountUsernameInfoWithDescription +# string defined in imAccounts.properties when the user is +# configuring an IRC account. +irc.usernameHint=nick + +# LOCALIZATION NOTE (connection.error.*): +# These will show in the account manager if the account is +# disconnected because of an error. +connection.error.lost=Verbinding verbroken met de server +connection.error.timeOut=Verbindingstimeout +connection.error.invalidUsername=%S is niet toegestaan als gebruikersnaam +connection.error.invalidPassword=Verkeerd server wachtwoord +connection.error.passwordRequired=Wachtwoord vereist + +# LOCALIZATION NOTE (joinChat.*): +# These show up on the join chat menu. An underscore is for the access key. +joinChat.channel=_Kanaal +joinChat.password=_Wachtwoord + +# LOCALIZATION NOTE (options.*): +# These are the protocol specific options shown in the account manager and +# account wizard windows. +options.server=Server +options.port=Poort +options.ssl=Gebruik SSL +options.encoding=Tekenset +options.quitMessage=Beeindig bericht +options.partMessage=Onderdeel bericht +options.showServerTab=Geef de berichten van de server weer +options.alternateNicks=Alternatieve bijnamen + +# LOCALIZATION NOTE (ctcp.version): +# %1$S is the nickname of the user whose version was requested. +# %2$S is the version response from the client. +ctcp.version=%1$S gebruikt "%2$S". +# LOCALIZATION NOTE (ctcp.time): +# %1$S is the nickname of the user whose time was requested. +# %2$S is the time response. +ctcp.time=De tijd voor %1$S is %2$S. + +# LOCALZIATION NOTE (command.*): +# These are the help messages for each command, the %S is the command name +# Each command first gives the parameter it accepts and then a description of +# the command. +command.action=%S <uit te voeren actie>: Voer een actie uit. +command.ctcp=%S <bijnaam> <bericht>: Verstuur een CTCP bericht naar de bijnaam. +command.chanserv=%S <commando>: Verstuur een commando naar ChanServ. +command.deop=%S <nick1>[,<nick2>]*: Verwijder de kanaal beheerder status van iemand. U moet hiervoor een kanaal beheerder zijn. +command.devoice=% S & lt; nick1 & gt; [& lt; nick2 & gt;] *: Verwijder channel voice-status van iemand, voorkom dat gesproken wordt wanneer het kanaal is gemodereerd (+ m). Je moet een channel operator zijn om dit te kunnen doen. +command.invite2=%S <nick>[ <nick>]* [<channel>]: Nodig een of meerdere mensen uit om te komen naar jou in uw huidige kanaal, of een specifieke kanaal. +command.join=% S & lt; room1 & gt; [& lt; key1 & gt;] [& lt; room2 & gt; [& lt; key2 & gt;]] *: Betreedt één of meerdere kanalen, eventueel met het verstrekken van een kanaal sleutel voor elke indien gewenst. +command.kick=%S <nick> [<message>]:Verwijder iemand van een kanaal. U moet een channel operator zijn om dit te kunnen. +command.list=%S: Toont een lijst van chatrooms op het netwerk. Waarschuwing, sommige servers verbreken de verbinding om dit mogelijk te maken. +command.memoserv=%S <command>: Stuur een command naar MemoServ. +command.modeUser=%S (+|-)<new mode> [<nick>]: Stel de user's mode in. +command.modeChannel=%S <channel>[ (+|-)<new mode> [<parameter>][,<parameter>]*]: Krijg of stel de channel mode in. +command.msg=%S <nick> <message>: Stuur een prive bericht naar een gebruiker (in tegenstelling tot een kanaal) +command.nick=%S <new nickname>: verander je bijnaam . +command.nickserv=%S <command>: Send een commando naar NickServ. +command.notice=%S <target> <message>: Stuur een notificatie naar een gebruiker of kanaal. +command.op=%S <nick1>[,<nick2>]*: Sta channel operator status toe aan iemand. Om dit te mogen moet u een channel operator zijn. +command.operserv=%S <command>: Stuur een opdracht naar OperServ. +command.part=%S [message]: Verlaat het kanaal met een optioneel bericht. +command.ping=%S [<nick>]: Vraag hoeveel lag een gebruiker (of de server wanneer geen gebruiker opgegeven) heeft. +command.quit=% S & lt; message & gt;: Verbreken van de server, met een optioneel bericht. +command.quote=%S <command>: Stuur een raw opdracht naar de server. +command.time=%S: Toont de lokale tijd in de IRC server. +command.topic=%S [<new topic>]: Onderwerp kanaal. +command.umode=%S (+|-)<new mode>: Inschakelen/uitschakelen van user mode. +command.version=%S <nick>: Verzoek de versie van een client van de gebruiker. +command.voice=%S <nick1>[,<nick2>]*: Sta channel voice status toe aan iemand. U moet een channel operator zijn om dit toe te kunnen laten. +command.whois2=%S [<nick>]: Krijg informatie van een gebruiker. + +# LOCALIZATION NOTE (message.*): +# These are shown as system messages in the conversation. +# %1$S is the nick and %2$S is the nick and host of the user who joined. +message.join=%1$S [%2$S] is de room binnengekomen. +message.rejoined=Je bent de chatroom opnieuw binnengetreden +# %1$S is the nick of who kicked you. +# %2$S is message.kicked.reason, if a kick message was given. +message.kicked.you=Je bent verwijderd door %1$S%2$S. +# %1$S is the nick that is kicked, %2$S the nick of the person who kicked +# %1$S. %3$S is message.kicked.reason, if a kick message was given. +message.kicked=%1$S is verwijderd door %2$S%3$S. +# %S is the kick message +message.kicked.reason=: %S +# %1$S is the new mode, %2$S is the nickname of the user whose mode +# was changed, and %3$S is who set the mode. +message.usermode=Mode %1$S voor %2$S ingesteld door %3$S. +# %1$S is the new channel mode and %2$S is who set the mode. +message.channelmode=Kanaalmode %1$S ingesteld door %2$S. +# %S is the user's mode. +message.yourmode=Uw mode is %S. +# Could not change the nickname. %S is the user's nick. +message.nick.fail=Je kunt de schuilnaam die je wilt niet gebruiken. Je schuilnaam blijft %S. +# The parameter is the message.parted.reason, if a part message is given. +message.parted.you=Je hebt de room verlaten (Part%1$S). +# %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given. +message.parted=%1$S heeft de room verlaten (Part%2$S) +# %S is the part message supplied by the user. +message.parted.reason=: %S +# %1$S is the user's nick, %2$S is message.quit2 if a quit message is given. +message.quit=%1$S heeft de room verlaten (Quit%2$S). +# The parameter is the quit message given by the user. +message.quit2=: %S +# %1$S is the nickname of the user that invited us, %2$S is the conversation +# name. +message.inviteReceived=%1$S heeft je uitgenodigd voor %2$S. +# %1$S is the nickname of the invited user, %2$S is the conversation name +# they were invited to. +message.invited=%1$S is in goede orde uitgenodigd voor %2$S. +# %1$S is the nickname of the invited user, %2$S is the conversation name +# they were invited to but are already in +message.alreadyInChannel=%1$S is al deelnemer aan %2$S. +# %S is the nickname of the user who was summoned. +message.summoned=%S is gedagvaardigd +# %S is the nickname of the user whose WHOIS information follows this message. +message.whois=WHOIS-informatie voor %S: +# %1$S is the nickname of the (offline) user whose WHOWAS information follows this message. +message.whowas=%1$S is offline. WHOWAS-informatie voor %1$S: +# %1$S is the entry description (from tooltip.*), %2$S is its value. +message.whoisEntry=\\ua0\\ua0\\ua0\\ua0%1$S: %2$S +# %S is the nickname that is not known to the server. +message.unknownNick=%S is an onbekende nickname. +# %1$S is the nickname of the user who changed the mode and %2$S is the new +# channel key (password). +message.channelKeyAdded=%1$S heeft het wachtwoord van het kanaal veranderd naar %2$S. +message.channelKeyRemoved=%S heeft het kanaalwachtwoord verwijderd. +# This will be followed by a list of ban masks. +message.banMasks=De gebruikers van de volgende locatie zijn gebannen %S: +message.noBanMasks=Er zijn geen verboden locaties voor %S. +message.banMaskAdded=Gebruikers uit de volgende locatie %1$S zijn gebannen door %2$S. +message.banMaskRemoved=Gebruikers van de locatie %1$S zijn niet langer gebanned door %2$S. +# LOCALIZATION NOTE (message.ping): Semi-colon list of plural forms. +# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals +# %1$S is the nickname of the user or the server that was pinged. +# #2 is the delay (in milliseconds). +message.ping=Ping reageert van %1$S in #2 millisecond.;Ping reageert van %1$S in #2 milliseconds. + + +# LOCALIZATION NOTE (error.*): +# These are shown as error messages in the conversation or server tab. +# %S is the channel name. +error.noChannel=Er is geen kanaal '%S'. +error.tooManyChannels=Kan niet deelnemen aan %S; je neemt aan teveel kanalen deel. +# %1$S is your new nick, %2$S is the kill message from the server. +error.nickCollision=Schuilnaam wordt al gebruikt, schuilnaam veranderen naar %1$S [%2$S]. +error.erroneousNickname=%S is niet toegestaan als schuilnaam. +error.banned=Je bent verbannen van deze server. +error.bannedSoon=Je wordt binnenkort verbannen van deze server. +error.mode.wrongUser=Je kan modes niet veranderen voor ander gebruikers +# %S is the nickname or channel name that isn't available. +error.noSuchNick=%S is niet online. +error.wasNoSuchNick=Er is geen bijnaam: %S +error.noSuchChannel=Er is geen kanaal '%S'. +error.unavailable=%S is momenteel niet beschikbaar +# %S is the channel name. +error.channelBanned=Je bent verbannen van %S. +error.cannotSendToChannel=Je kunt geen berichten sturen aan %S. +error.channelFull=Het kanaal %S is vol. +error.inviteOnly=Je moet uitgenodigd worden om lid te worden van %S. +error.nonUniqueTarget=%S is geen unieke user@host of korte naam of u heeft geprobeerd bij teveel kanalen tegelijk aan te melden. +error.notChannelOp=Je bent geen kanaaloperator op %S. +error.notChannelOwner=Je bent geen kanaaleigenaar van %S. +error.wrongKey=kan niet deelnemen aan %S, door niet geldig kanaal paswoord +error.sendMessageFailed=Er ging iets mis bij het versturen van je bericht. Probeer het zometeen gewoon nog een keer. +# %1$S is the channel the user tried to join, %2$S is the channel +# he was forwarded to. +error.channelForward=U mag niet aansluiten bij %1$S, en werd automatisch doorgelinkt naar %2$S. + +# LOCALIZATION NOTE (tooltip.*): +# These are the descriptions given in a tooltip with information received +# from a whois response. +# The human readable ("realname") description of the user. +tooltip.realname=Naam +tooltip.server=Verbonden met +# The username and hostname that the user connects from (usually based on the +# reverse DNS of the user's IP, but often mangled by the server to +# protect users). +tooltip.connectedFrom=Verbonden van +tooltip.registered=Geregistreerd +tooltip.registeredAs=Geregistreerd als +tooltip.secure=Gebruik makend van een veilige verbinding. +# The away message of the user +tooltip.away=Even weg +tooltip.ircOp=IRC-operator +tooltip.bot=Bot +tooltip.lastActivity=Laatst actief +# %S is the timespan elapsed since the last activity. +tooltip.timespan=%S geleden +tooltip.channels=Staat momenteel aan + +# %1$S is the server name, %2$S is some generic server information (usually a +# location or the date the user was last seen). +tooltip.serverValue=%1$S (%2$S) + +# LOCALIZATION NOTE (yes, no): +# These are used to turn true/false values into a yes/no response. +yes=Ja +no=Nee

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 20 Sep '15

20 Sep '15

commit 145e6f4e92d5b089451629808039f506d9f7c672 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 20 18:46:25 2015 +0000 Update translations for tor-messenger-ircproperties --- nl/irc.properties | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/nl/irc.properties b/nl/irc.properties index afbf118..b1753a4 100644 --- a/nl/irc.properties +++ b/nl/irc.properties @@ -57,23 +57,23 @@ command.join=% S & lt; room1 & gt; [& lt; key1 & gt;] [& lt; room2 & gt; [& lt; command.kick=%S <nick> [<message>]:Verwijder iemand van een kanaal. U moet een channel operator zijn om dit te kunnen. command.list=%S: Toont een lijst van chatrooms op het netwerk. Waarschuwing, sommige servers verbreken de verbinding om dit mogelijk te maken. command.memoserv=%S <command>: Stuur een command naar MemoServ. -command.modeUser=%S (+|-)<new mode> [<nick>]: Set or unset a user's mode. -command.modeChannel=%S <channel>[ (+|-)<new mode> [<parameter>][,<parameter>]*]: Get, set or unset a channel mode. -command.msg=%S <nick> <message>: Send a private message to a user (as opposed to a channel). +command.modeUser=%S (+|-)<new mode> [<nick>]: Stel de user's mode in. +command.modeChannel=%S <channel>[ (+|-)<new mode> [<parameter>][,<parameter>]*]: Krijg of stel de channel mode in. +command.msg=%S <nick> <message>: Stuur een prive bericht naar een gebruiker (in tegenstelling tot een kanaal) command.nick=%S <new nickname>: verander je bijnaam . command.nickserv=%S <command>: Send een commando naar NickServ. -command.notice=%S <target> <message>: Send a notice to a user or channel. -command.op=%S <nick1>[,<nick2>]*: Grant channel operator status to someone. You must be a channel operator to do this. -command.operserv=%S <command>: Send a command to OperServ. -command.part=%S [message]: Leave the current channel with an optional message. -command.ping=%S [<nick>]: Asks how much lag a user (or the server if no user specified) has. -command.quit=%S <message>: Disconnect from the server, with an optional message. -command.quote=%S <command>: Send a raw command to the server. +command.notice=%S <target> <message>: Stuur een notificatie naar een gebruiker of kanaal. +command.op=%S <nick1>[,<nick2>]*: Sta channel operator status toe aan iemand. Om dit te mogen moet u een channel operator zijn. +command.operserv=%S <command>: Stuur een opdracht naar OperServ. +command.part=%S [message]: Verlaat het kanaal met een optioneel bericht. +command.ping=%S [<nick>]: Vraag hoeveel lag een gebruiker (of de server wanneer geen gebruiker opgegeven) heeft. +command.quit=% S & lt; message & gt;: Verbreken van de server, met een optioneel bericht. +command.quote=%S <command>: Stuur een raw opdracht naar de server. command.time=%S: Toont de lokale tijd in de IRC server. command.topic=%S [<new topic>]: Onderwerp kanaal. command.umode=%S (+|-)<new mode>: Inschakelen/uitschakelen van user mode. -command.version=%S <nick>: Request the version of a user's client. -command.voice=%S <nick1>[,<nick2>]*: Grant channel voice status to someone. You must be a channel operator to do this. +command.version=%S <nick>: Verzoek de versie van een client van de gebruiker. +command.voice=%S <nick1>[,<nick2>]*: Sta channel voice status toe aan iemand. U moet een channel operator zijn om dit toe te kunnen laten. command.whois2=%S [<nick>]: Krijg informatie van een gebruiker. # LOCALIZATION NOTE (message.*): @@ -132,15 +132,15 @@ message.unknownNick=%S is an onbekende nickname. message.channelKeyAdded=%1$S heeft het wachtwoord van het kanaal veranderd naar %2$S. message.channelKeyRemoved=%S heeft het kanaalwachtwoord verwijderd. # This will be followed by a list of ban masks. -message.banMasks=Users connected from the following locations are banned from %S: -message.noBanMasks=There are no banned locations for %S. -message.banMaskAdded=Users connected from locations matching %1$S have been banned by %2$S. -message.banMaskRemoved=Users connected from locations matching %1$S are no longer banned by %2$S. +message.banMasks=De gebruikers van de volgende locatie zijn gebannen %S: +message.noBanMasks=Er zijn geen verboden locaties voor %S. +message.banMaskAdded=Gebruikers uit de volgende locatie %1$S zijn gebannen door %2$S. +message.banMaskRemoved=Gebruikers van de locatie %1$S zijn niet langer gebanned door %2$S. # LOCALIZATION NOTE (message.ping): Semi-colon list of plural forms. # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals # %1$S is the nickname of the user or the server that was pinged. # #2 is the delay (in milliseconds). -message.ping=Ping reply from %1$S in #2 millisecond.;Ping reply from %1$S in #2 milliseconds. +message.ping=Ping reageert van %1$S in #2 millisecond.;Ping reageert van %1$S in #2 milliseconds. # LOCALIZATION NOTE (error.*): @@ -164,7 +164,7 @@ error.channelBanned=Je bent verbannen van %S. error.cannotSendToChannel=Je kunt geen berichten sturen aan %S. error.channelFull=Het kanaal %S is vol. error.inviteOnly=Je moet uitgenodigd worden om lid te worden van %S. -error.nonUniqueTarget=%S is not a unique user@host or shortname or you have tried to join too many channels at once. +error.nonUniqueTarget=%S is geen unieke user@host of korte naam of u heeft geprobeerd bij teveel kanalen tegelijk aan te melden. error.notChannelOp=Je bent geen kanaaloperator op %S. error.notChannelOwner=Je bent geen kanaaleigenaar van %S. error.wrongKey=kan niet deelnemen aan %S, door niet geldig kanaal paswoord

1 0

[webwml/master] ideas for donation page
by sebastian＠torproject.org 20 Sep '15

20 Sep '15

commit b8ac55e14d14438f9fb0e927b56fb36d8f013a1e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Sep 16 02:19:15 2015 +0200 ideas for donation page --- donate/en/donate-options.wml | 196 +++++++++++++++++++++++++++++++++++++++++ donate/en/donate.wml | 197 ++++-------------------------------------- donate/en/info.wmi | 16 ---- donate/en/side-donate.wmi | 4 +- 4 files changed, 216 insertions(+), 197 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml new file mode 100644 index 0000000..1dc118b --- /dev/null +++ b/donate/en/donate-options.wml @@ -0,0 +1,196 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 3-low + +#include "head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page donate/donate>">Donate</a> + </div> +<div id="maincol"> + <h1>Make A Donation</h1> + <p><strong>Your support is critical to our success.</strong> The + Tor Project is a US 501(c)(3) non-profit dedicated to research, + development, and education about online anonymity and privacy. Donations + to The Tor Project may be tax deductible to persons who are in the + US; or who pay taxes in countries with reciprocity with the US on + charitable donations. Our tax ID number is 20-8096820. We are listed on + <a href="http://www2.guidestar.org/organizations/20-8096820/tor-project.aspx">GuideStar</a>.</p> + + <p>We're happy to have you shop and indirectly support us via +<a href="http://smile.amazon.com/ch/20-8096820">Amazon Smile</a>. A +portion of your purchase is donated to help keep us working.</p> + + We're happy to accept direct donations via:</p> + <ul class="hlist"> + <li><a href="<page donate/donate>">Paypal</a></li> + <li><a href="#amazon">Amazon Payments</a></li> + <li><a href="#dwolla">Dwolla</a></li> + <li><a href="#bitcoin">Bitcoins</a></li> + <li class="last"><a href="#cash">checks, money orders, or bank transfers</a></li> + </ul> + <p>Contact us at donations(a)torproject.org for more donation details.</p> + <div class="hundred toptwenty"> + + <a name="amazon"></a> + <div class="dbox dsmall"> + <h3>Donate via Amazon Payments</h3> + <form action="https://authorize.payments.amazon.com/pba/paypipeline" method="post"> + <div class="drow toppad"> + <div> + <label for="amazon">$</label> + <input type="text" name="amount" size="6" value="20"> + <input class="donate-btn" type="image" src="$(IMGROOT)/golden_small_donate_withmsg_whitebg.gif"> + </div> + <input type="hidden" name="immediateReturn" value="1"> + <input type="hidden" name="collectShippingAddress" value="0"> + <input type="hidden" name="minimumDonationAmount" value="USD 5"> + <input type="hidden" name="isDonationWidget" value="1"> + <input type="hidden" name="description" value="Supporting Online Anonymity & Privacy"> + <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1"> + <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/thankyou.html"> + <input type="hidden" name="processImmediate" value="1"> + <input type="hidden" name="cobrandingStyle" value="logo"> + <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html"> + </div> + </form> + <small>Requires an Amazon Account</small> + </div> + + + <a id="dwolla"></a> + <div class="dbox dsmall dwolla"> + <h3>Donate via Dwolla</h3> + <p>Dwolla is a peer to peer payment platform which allows users to +exchange money quickly, safely, at a lower cost.</p> + <p style="text-align:center;"><strong><a +href="https://www.dwolla.com/hub/thetorproject">Continue to Dwolla +»</a></strong></p> + </div> + + + <a id="bitcoin"></a> + <div class="hundred toptwenty"> + <div class="dbox donate"> + <h3>Bitcoins</h3> + <p>Please consider a donation to + <a href="https://www.torservers.net/donate.html">Torservers.net</a>, + <a href="http://noisetor.net/#bitcoin">NoiseTor</a>, + or <a href="https://tails.boum.org/contribute/how/donate/#bitcoin">Tails</a> + which will turn your bitcoin donation into a faster, larger Tor + Network for all.</p> + <p>If you are committed to donating bitcoins to Tor, please complete the form below.</p> + <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));"> + <input name="action" type="hidden" value="checkout"> + <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;"> + <ul> + <li id="orderID" class="control-group"> + <label class="control-label" style="width: 40px">Email:</label> + <div class="controls" style="margin-left: 60px"> + <input name="orderID" type="email" class="input input-xlarge" placeholder="Email address (optional)" maxlength=50 autocapitalize=off autocorrect=off><br> + </div> + </li> + <li id="price" class="control-group"> + <label class="control-label" style="width: 40px">Amount:</label> + <div class="controls" style="margin-left: 60px"> + <input name="price" type="number" class="noscroll" value="10.00" placeholder="Amount" maxlength="10" min="0.01" step="0.01" style="width: 39%" /> + <select name="currency" value="" style="width: 49%" > + <option value="USD" selected="selected">USD</option> + <option value="BTC">BTC</option> + <option value="EUR">EUR</option> + <option value="GBP">GBP</option> + <option value="AUD">AUD</option> + <option value="BGN">BGN</option> + <option value="BRL">BRL</option> + <option value="CAD">CAD</option> + <option value="CHF">CHF</option> + <option value="CNY">CNY</option> + <option value="CZK">CZK</option> + <option value="DKK">DKK</option> + <option value="HKD">HKD</option> + <option value="HRK">HRK</option> + <option value="HUF">HUF</option> + <option value="IDR">IDR</option> + <option value="ILS">ILS</option> + <option value="INR">INR</option> + <option value="JPY">JPY</option> + <option value="KRW">KRW</option> + <option value="LTL">LTL</option> + <option value="LVL">LVL</option> + <option value="MXN">MXN</option> + <option value="MYR">MYR</option> + <option value="NOK">NOK</option> + <option value="NZD">NZD</option> + <option value="PHP">PHP</option> + <option value="PLN">PLN</option> + <option value="RON">RON</option> + <option value="RUB">RUB</option> + <option value="SEK">SEK</option> + <option value="SGD">SGD</option> + <option value="THB">THB</option> + <option value="TRY">TRY</option> + <option value="ZAR">ZAR</option> + </select/> + </div> + </li> + </ul> + <br> + <input type="hidden" name="data" value="iH+sCoKQo5J52hkEzWcMi8+PRt78/89lcSU9GnapWfWL6thyubtDCahTUqa2JTlj6RQrQySkZAoFvK05yifMwfx5V87JJuoaDlHUsZR9ppzkklmzHpKJ4TG5M0zNVcKfNBfyopdfTFbzpOXM2FDppqmU7njsRUF1EZPa0K7SIxpv4lNKSPn1PyjVKVxjnpFE0AZ1Qa75VwZnS+rBNNfwxPsgSz+Oa2Twe226FmJJrLtPuBteFfHAIWh6QS5JnpOn4ScMFph0zjixutmunMAjKw=="> + <div style="margin: auto; width: 100%; text-align: center"> + <input name="submit" src="$(IMGROOT)/bitpay-donate-md.png" type="image" style="width: auto" alt="BitPay" border="0"> + </div> + </fieldset> + </form> + </div> + </div> + + </div> + + <a id="cash"></a> + <div class="hundred toptwenty"> + <div class="dbox donate"> + <h3>Donate via Check, Cash, Money Order, Bank Transfer</h3> + <h4>You can send checks or money orders to:</h4> + <p>The Tor Project, Inc<br> + 7 Temple Street, Suite A<br> + Cambridge, MA 02139-2403 USA</p> + + + <h3 style="margin-top:20px;">Donate via European Bank Transfer</h3> + <p><em>For European bank transfers, we have an arrangement with + <a href="http://www.ccc.de/">CCC in Germany</a> to provide + tax-deductible donations for Europeans:</em></p> + <p>Wau Holland Stiftung<br> + Commerzbank Kassel<br> + BLZ: 52040021<br> + Konto: 2772812-02<br> + IBAN: DE03 5204 0021 0277 2812 02<br> + BIC: COBADEFF520 *or* COBADEFFXXX</p> + <ul> + <li>Residents from any of the 31 <a + href="http://en.wikipedia.org/wiki/Single_Euro_Payments_Area">SEPA</a> + member states can wire up to 50.000 Euro at the cost of + a domestic transaction (i.e., usually free if submitted + electronically).</li> + <li>European citizens can make a charitable contribution that + is tax-deductible to a certain degree (Germany: max 20% of total income). + </li> + <li>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).</li> + </ul> + </div> + </div> + + +</div> + <div id = "sidecol"> +#include "side-donate.wmi" +#include "info.wmi" + </div> +  + +</div> +#include <foot.wmi> diff --git a/donate/en/donate.wml b/donate/en/donate.wml index b11cfd9..39729d1 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -18,19 +18,6 @@ charitable donations. Our tax ID number is 20-8096820. We are listed on <a href="http://www2.guidestar.org/organizations/20-8096820/tor-project.aspx">GuideStar</a>.</p> - <p>We're happy to have you shop and indirectly support us via -<a href="http://smile.amazon.com/ch/20-8096820">Amazon Smile</a>. A -portion of your purchase is donated to help keep us working.</p> - - We're happy to accept direct donations via:</p> - <ul class="hlist"> - <li><a href="#paypal">Paypal</a></li> - <li><a href="#amazon">Amazon Payments</a></li> - <li><a href="#dwolla">Dwolla</a></li> - <li><a href="#bitcoin">Bitcoins</a></li> - <li class="last"><a href="#cash">checks, money orders, or bank transfers</a></li> - </ul> - <p>Contact us at donations(a)torproject.org for more donation details.</p>  <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script> <script type="text/javascript"> @@ -72,9 +59,9 @@ jQuery(function(){ </script> <div class="hundred toptwenty"> - <div class="dbox donate"> <a name="paypal"></a> - <h3>Donate via PayPal</h3> + <h2>Donate via PayPal</h2> + <div class="dbox donate"> <form id="donate" action="https://www.paypal.com/cgi-bin/webscr" method="post"> <p class="type"> <label for="type">Donation Type:</label> @@ -87,6 +74,18 @@ Account</small> </p> <div class="drow"> <div> + <input style="float: right;" type="image" src="$(IMGROOT)/paypal-donate-button.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"> + <ul class="amounts"> + <li><input type="radio" class="radio" name="amount" value="5.00"><label for="5">5</label></li> + <li><input type="radio" class="radio" name="amount" value="10.00"><label for="10">10 </label></li> + <li><input type="radio" class="radio" name="amount" value="20.00"><label for="20">20 </label></li> + <li><input type="radio" class="radio" name="amount" value="50.00"><label for="50">50 </label></li> + <li><input type="radio" class="radio" name="amount" value="100.00" checked="checked"><label for="100">100 </label></li><br> + <li><input type="radio" class="radio" name="amount" value="250.00"><label for="250">250</label></li> + <li><input type="radio" class="radio" name="amount" value="500.00"><label for="500">500</label></li> + <li><input type="radio" class="radio" name="amount" value="1000.00"><label for="1000">1000</label></li> + <li><input type="text" id="amount" class="amount" name="amount"></li> + <li> <span> <select name="currency_code" class="cur"> <option value="USD" selected="selected">$</option> @@ -95,23 +94,12 @@ Account</small> <option value="YEN">¥</option> </select> </span> - <ul class="amounts"> - <li><input type="radio" class="radio" name="amount" value="2000.00"><label for="2000">2000</label></li> - <li><input type="radio" class="radio" name="amount" value="1000.00"><label for="1000">1000</label></li> - <li><input type="radio" class="radio" name="amount" value="500.00"><label for="500">500</label></li> - <li><input type="radio" class="radio" name="amount" value="250.00"><label for="250">250</label></li> - <li><input type="radio" class="radio" name="amount" value="100.00" checked="checked"><label for="100">100</label></li> - <li><input type="radio" class="radio" name="amount" value="50.00"><label for="50">50</label></li> - <li><input type="radio" class="radio" name="amount" value="20.00"><label for="20">20</label></li> - <li><input type="radio" class="radio" name="amount" value="10.00"><label for="10">10</label></li> - <li><input type="radio" class="radio" name="amount" value="5.00"><label for="5">5</label></li> + </li> </ul> </div> <div> - <label for="custom">or enter a donation amount:</label><input type="text" id="amount" class="amount" name="amount"> <input type="hidden" id="a3" name="a3" value="0">  - <input type="image" src="$(IMGROOT)/paypal-donate-button.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"> </div> <input type="hidden" id="p3" name="p3" value="1"> <input type="hidden" name="sra" value="1"> @@ -129,158 +117,9 @@ Account</small> </div>  <div class="hundred toptwenty"> - - <a name="amazon"></a> - <div class="dbox dsmall"> - <h3>Donate via Amazon Payments</h3> - <form action="https://authorize.payments.amazon.com/pba/paypipeline" method="post"> - <div class="drow toppad"> - <div> - <label for="amazon">$</label> - <input type="text" name="amount" size="6" value="20"> - <input class="donate-btn" type="image" src="$(IMGROOT)/golden_small_donate_withmsg_whitebg.gif"> - </div> - <input type="hidden" name="immediateReturn" value="1"> - <input type="hidden" name="collectShippingAddress" value="0"> - <input type="hidden" name="minimumDonationAmount" value="USD 5"> - <input type="hidden" name="isDonationWidget" value="1"> - <input type="hidden" name="description" value="Supporting Online Anonymity & Privacy"> - <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1"> - <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/thankyou.html"> - <input type="hidden" name="processImmediate" value="1"> - <input type="hidden" name="cobrandingStyle" value="logo"> - <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html"> - </div> - </form> - <small>Requires an Amazon Account</small> - </div> - - - <a id="dwolla"></a> - <div class="dbox dsmall dwolla"> - <h3>Donate via Dwolla</h3> - <p>Dwolla is a peer to peer payment platform which allows users to -exchange money quickly, safely, at a lower cost.</p> - <p style="text-align:center;"><strong><a -href="https://www.dwolla.com/hub/thetorproject">Continue to Dwolla -»</a></strong></p> - </div> - - - <a id="bitcoin"></a> - <div class="hundred toptwenty"> - <div class="dbox donate"> - <h3>Bitcoins</h3> - <p>Please consider a donation to - <a href="https://www.torservers.net/donate.html">Torservers.net</a>, - <a href="http://noisetor.net/#bitcoin">NoiseTor</a>, - or <a href="https://tails.boum.org/contribute/how/donate/#bitcoin">Tails</a> - which will turn your bitcoin donation into a faster, larger Tor - Network for all.</p> - <p>If you are committed to donating bitcoins to Tor, please complete the form below.</p> - <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));"> - <input name="action" type="hidden" value="checkout"> - <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;"> - <ul> - <li id="orderID" class="control-group"> - <label class="control-label" style="width: 40px">Email:</label> - <div class="controls" style="margin-left: 60px"> - <input name="orderID" type="email" class="input input-xlarge" placeholder="Email address (optional)" maxlength=50 autocapitalize=off autocorrect=off><br> - </div> - </li> - <li id="price" class="control-group"> - <label class="control-label" style="width: 40px">Amount:</label> - <div class="controls" style="margin-left: 60px"> - <input name="price" type="number" class="noscroll" value="10.00" placeholder="Amount" maxlength="10" min="0.01" step="0.01" style="width: 39%" /> - <select name="currency" value="" style="width: 49%" > - <option value="USD" selected="selected">USD</option> - <option value="BTC">BTC</option> - <option value="EUR">EUR</option> - <option value="GBP">GBP</option> - <option value="AUD">AUD</option> - <option value="BGN">BGN</option> - <option value="BRL">BRL</option> - <option value="CAD">CAD</option> - <option value="CHF">CHF</option> - <option value="CNY">CNY</option> - <option value="CZK">CZK</option> - <option value="DKK">DKK</option> - <option value="HKD">HKD</option> - <option value="HRK">HRK</option> - <option value="HUF">HUF</option> - <option value="IDR">IDR</option> - <option value="ILS">ILS</option> - <option value="INR">INR</option> - <option value="JPY">JPY</option> - <option value="KRW">KRW</option> - <option value="LTL">LTL</option> - <option value="LVL">LVL</option> - <option value="MXN">MXN</option> - <option value="MYR">MYR</option> - <option value="NOK">NOK</option> - <option value="NZD">NZD</option> - <option value="PHP">PHP</option> - <option value="PLN">PLN</option> - <option value="RON">RON</option> - <option value="RUB">RUB</option> - <option value="SEK">SEK</option> - <option value="SGD">SGD</option> - <option value="THB">THB</option> - <option value="TRY">TRY</option> - <option value="ZAR">ZAR</option> - </select/> - </div> - </li> - </ul> - <br> - <input type="hidden" name="data" value="iH+sCoKQo5J52hkEzWcMi8+PRt78/89lcSU9GnapWfWL6thyubtDCahTUqa2JTlj6RQrQySkZAoFvK05yifMwfx5V87JJuoaDlHUsZR9ppzkklmzHpKJ4TG5M0zNVcKfNBfyopdfTFbzpOXM2FDppqmU7njsRUF1EZPa0K7SIxpv4lNKSPn1PyjVKVxjnpFE0AZ1Qa75VwZnS+rBNNfwxPsgSz+Oa2Twe226FmJJrLtPuBteFfHAIWh6QS5JnpOn4ScMFph0zjixutmunMAjKw=="> - <div style="margin: auto; width: 100%; text-align: center"> - <input name="submit" src="$(IMGROOT)/bitpay-donate-md.png" type="image" style="width: auto" alt="BitPay" border="0"> - </div> - </fieldset> - </form> - </div> - </div> - - </div> - - <a id="cash"></a> - <div class="hundred toptwenty"> - <div class="dbox donate"> - <h3>Donate via Check, Cash, Money Order, Bank Transfer</h3> - <h4>You can send checks or money orders to:</h4> - <p>The Tor Project, Inc<br> - 7 Temple Street, Suite A<br> - Cambridge, MA 02139-2403 USA</p> - - - <h3 style="margin-top:20px;">Donate via European Bank Transfer</h3> - <p><em>For European bank transfers, we have an arrangement with - <a href="http://www.ccc.de/">CCC in Germany</a> to provide - tax-deductible donations for Europeans:</em></p> - <p>Wau Holland Stiftung<br> - Commerzbank Kassel<br> - BLZ: 52040021<br> - Konto: 2772812-02<br> - IBAN: DE03 5204 0021 0277 2812 02<br> - BIC: COBADEFF520 *or* COBADEFFXXX</p> - <ul> - <li>Residents from any of the 31 <a - href="http://en.wikipedia.org/wiki/Single_Euro_Payments_Area">SEPA</a> - member states can wire up to 50.000 Euro at the cost of - a domestic transaction (i.e., usually free if submitted - electronically).</li> - <li>European citizens can make a charitable contribution that - is tax-deductible to a certain degree (Germany: max 20% of total income). - </li> - <li>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).</li> - </ul> - </div> - </div> - + <h2>Other options</h2> + We have many other donation and sponsorship <a href="<page donate/donate-options>">options</a> available. + </div>  </div> <div id = "sidecol"> diff --git a/donate/en/info.wmi b/donate/en/info.wmi index e88d30d..c994586 100644 --- a/donate/en/info.wmi +++ b/donate/en/info.wmi @@ -13,20 +13,4 @@ are available for your review.</p> </div> </div> -<div class="img-shadow"> - <div class="important-infoblock"> - <h2>Mission Statement</h2> - <p>The Tor Project is organized and operated exclusively for - scientific, charitable and educational purposes within the meaning - of section 501(c)(3) of the Internal Revenue Code, including (a) - to develop, improve and distribute free, publicly available tools - and programs that promote free speech, free expression, civic - engagement and privacy rights online; (b) to conduct scientific - research regarding, and to promote the use of and knowledge about, - such tools, programs and related issues around the world; (c) to - educate the general public around the world about privacy rights - and anonymity issues connected to Internet use; and (d) to carry out - and conduct such other activities related to the stated mission.</p> - </div> -</div>  diff --git a/donate/en/side-donate.wmi b/donate/en/side-donate.wmi index 01d58e8..7f5448c 100644 --- a/donate/en/side-donate.wmi +++ b/donate/en/side-donate.wmi @@ -6,7 +6,7 @@ #use "versions.wmi" #use "sidenav.wmi" <div class="img-shadow"> - <div id="sidenav"> +  </div>

1 0

[webwml/master] New donate page draft
by sebastian＠torproject.org 20 Sep '15

20 Sep '15

commit d24a0047603816177e091a1cf59e8011778cd558 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 18 21:09:56 2015 +0200 New donate page draft --- css/layout.css | 1 - donate/en/donate.wml | 74 +++++++++++++++++----------------- en/navigation.wmi | 5 +++ images/paypal_logo.gif | Bin 0 -> 1916 bytes images/paypal_logo.png | Bin 0 -> 4196 bytes include/donatehead.wmi | 105 ++++++++++++++++++++++++++++++++++++++++++++++++ include/navigation.wmi | 5 +++ 7 files changed, 151 insertions(+), 39 deletions(-) diff --git a/css/layout.css b/css/layout.css index 54d225b..4908ee0 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1125,7 +1125,6 @@ small { .dbox.donate ul.amounts li { display: inline-block; - margin-left: 15px; } .dbox.donate ul.amounts li label { diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 39729d1..c0b857c 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -2,29 +2,32 @@ # Revision: $Revision$ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" +#include "donatehead.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" <div id="content" class="clearfix"> - <div id="breadcrumbs"> + <div id="maincol"> <h1>Make A Donation</h1> <p><strong>Your support is critical to our success.</strong> The - Tor Project is a US 501(c)(3) non-profit dedicated to research, - development, and education about online anonymity and privacy. Donations - to The Tor Project may be tax deductible to persons who are in the - US; or who pay taxes in countries with reciprocity with the US on - charitable donations. Our tax ID number is 20-8096820. We are listed on - <a href="http://www2.guidestar.org/organizations/20-8096820/tor-project.aspx">GuideStar</a>.</p> + Tor Project is a US non-profit organization dedicated to research, + development, and education about online anonymity and privacy. + </p>  <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script> <script type="text/javascript"> function displayVals() { + var radioVal = jQuery('input[@name="amount"]:checked').val(); + if (radioVal == 'other') { + jQuery('#amount').show(); + } else { + jQuery('#amount').val(""); + jQuery('#amount').hide(); + } var t3 = jQuery('#t3').val(); var amount = jQuery('#amount').val(); - var radioVal = jQuery('input[@name="amount"]:checked').val(); if(t3 != 0){ if( !amount ) { jQuery('#a3').val(radioVal); @@ -51,6 +54,7 @@ function displayVals() { jQuery(function(){ jQuery("input[@name='amount']:checked").change(displayVals); + jQuery("input[name='amount']").click(displayVals); jQuery("#amount").change(displayVals); jQuery("#t3").change(displayVals); displayVals(); @@ -59,12 +63,9 @@ jQuery(function(){ </script> <div class="hundred toptwenty"> - <a name="paypal"></a> - <h2>Donate via PayPal</h2> - <div class="dbox donate"> + <div class="dbox donate" style="text-align: center;"> <form id="donate" action="https://www.paypal.com/cgi-bin/webscr" method="post"> <p class="type"> - <label for="type">Donation Type:</label> <select id="t3" name="t3"> <option value="0">One-time Donation</option> <option value="M">Monthly Subscription</option> @@ -72,32 +73,27 @@ jQuery(function(){ <small id="ppinfo">Does Not Require a PayPal Account</small> </p> - <div class="drow"> - <div> - <input style="float: right;" type="image" src="$(IMGROOT)/paypal-donate-button.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"> + <div class="drow" style="text-align: center;"> + <div style="text-align: center;"> <ul class="amounts"> - <li><input type="radio" class="radio" name="amount" value="5.00"><label for="5">5</label></li> - <li><input type="radio" class="radio" name="amount" value="10.00"><label for="10">10 </label></li> - <li><input type="radio" class="radio" name="amount" value="20.00"><label for="20">20 </label></li> - <li><input type="radio" class="radio" name="amount" value="50.00"><label for="50">50 </label></li> - <li><input type="radio" class="radio" name="amount" value="100.00" checked="checked"><label for="100">100 </label></li><br> - <li><input type="radio" class="radio" name="amount" value="250.00"><label for="250">250</label></li> - <li><input type="radio" class="radio" name="amount" value="500.00"><label for="500">500</label></li> - <li><input type="radio" class="radio" name="amount" value="1000.00"><label for="1000">1000</label></li> - <li><input type="text" id="amount" class="amount" name="amount"></li> <li> - <span> <select name="currency_code" class="cur"> <option value="USD" selected="selected">$</option> <option value="EUR">€</option> <option value="GBP">£</option> <option value="YEN">¥</option> </select> - </span> - </li> + </li> + <li><input type="radio" class="radio" name="amount" value="5.00"><label for="5">5 </label></li> + <li><input type="radio" class="radio" name="amount" value="23.00"><label for="23">23 </label></li> + <li><input type="radio" class="radio" name="amount" value="100.00" checked="checked"><label for="100">100 </label></li> + <li><input type="radio" class="radio" name="amount" value="256.00"><label for="256">256</label></li> + <li><input type="radio" class="radio" name="amount" value="500.00"><label for="500">500</label></li> + <li><input id="other" type="radio" class="radio" name="amount" value="other"><label for="other">other</label></li> + <li><input style="display: none;" type="text" id="amount" class="amount" name="amount"></li> </ul> </div> - <div> + <div style="text-align: center;"> <input type="hidden" id="a3" name="a3" value="0">  </div> @@ -112,21 +108,23 @@ Account</small> <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> <input type="hidden" name="cancel_return" value="https://www.torproject.org/getinvolved/volunteer"> </div> + <div style="text-align: center;"> + <input type="image" src="$(IMGROOT)/paypal_logo.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"> + </div> </form> </div> </div>  - <div class="hundred toptwenty"> - <h2>Other options</h2> - We have many other donation and sponsorship <a href="<page donate/donate-options>">options</a> available. + <div class="hundred toptwenty" style="text-align: center;"> + <a href="<page donate/donate-options>">Other ways to donate</a> </div>  </div> - <div id = "sidecol"> -#include "side-donate.wmi" -#include "info.wmi" - </div> + +# include "side-donate.wmi" +# include "info.wmi" +   </div> -#include <foot.wmi> +# include <foot.wmi> diff --git a/en/navigation.wmi b/en/navigation.wmi index e90c8c8..ce8b001 100644 --- a/en/navigation.wmi +++ b/en/navigation.wmi @@ -14,6 +14,11 @@ '<blog>' , 'Blog', 'about/contact' , 'Contact', ); + my @donatenav = ( + 'index' , 'Home', + 'about/overview' , 'About Tor', + 'about/contact' , 'Contact', + ); my @calltoaction = ( 'download/download-easy' , 'Download', 'getinvolved/volunteer' , 'Volunteer', diff --git a/images/paypal_logo.gif b/images/paypal_logo.gif new file mode 100644 index 0000000..cd5f74b Binary files /dev/null and b/images/paypal_logo.gif differ diff --git a/images/paypal_logo.png b/images/paypal_logo.png new file mode 100644 index 0000000..aab877a Binary files /dev/null and b/images/paypal_logo.png differ diff --git a/include/donatehead.wmi b/include/donatehead.wmi new file mode 100644 index 0000000..5a371a3 --- /dev/null +++ b/include/donatehead.wmi @@ -0,0 +1,105 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "navigation.wmi" + +<!DOCTYPE html> + <html> + <head> + + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="author" content="The Tor Project, Inc."> + <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> + <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg"> + + <title>$(TITLE)</title> + + <link rel="icon" href="$(IMGROOT)/favicon.ico"> + <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> + <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> + + # begin WML to generate css/js paths + <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">"> + <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.css" rel="stylesheet">"> + + #<link href="css/master.css" rel="stylesheet"> +  +  +  + # <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> + # end WML to generate css/js paths + +</head> +<body> +<div id="wrap"> + <div id="header"> + <h1 id="logo"><a href="<page index>">Tor</a></h1> + # navigation menu generation + <div id="nav"> + <ul> + <:{ + # create a hash and maintain order of keys + my %donatenav; + my @keys; + while (@donatenav) { + my $key = shift @donatenav; + my $val = shift @donatenav; + push @keys, $key; + $donatenav{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory of active link, set class active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + + # translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$donatenav{$key}; + } + # english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $donatenav{$key}; + } + # full url + elsif ($key =~/^http/) { + printf '<li><a href="%s">%s</a></li>'."\n", $key, $donatenav{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to +docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> +  + # end navigation generation + </div> +  + +#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>."> +#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>."> diff --git a/include/navigation.wmi b/include/navigation.wmi index a6c84a7..3cfec53 100644 --- a/include/navigation.wmi +++ b/include/navigation.wmi @@ -14,6 +14,11 @@ '<blog>' , 'Blog', 'about/contact' , 'Contact', ); + my @donatenav = ( + 'index' , 'Home', + 'about/overview' , 'About Tor', + 'about/contact' , 'Contact', + ); my @calltoaction = ( 'download/download-easy' , 'Download', 'getinvolved/volunteer' , 'Get Involved',

1 0

[webwml/master] Make it more clear how to donate
by sebastian＠torproject.org 20 Sep '15

20 Sep '15

commit 506ffe86228692a658ac806e2e5beec01273df41 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Sep 19 15:48:52 2015 +0200 Make it more clear how to donate --- donate/en/donate.wml | 2 +- images/paypal_logo.jpg | Bin 0 -> 19598 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index c0b857c..e77a600 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -109,7 +109,7 @@ Account</small> <input type="hidden" name="cancel_return" value="https://www.torproject.org/getinvolved/volunteer"> </div> <div style="text-align: center;"> - <input type="image" src="$(IMGROOT)/paypal_logo.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"> + <input type="image" src="$(IMGROOT)/paypal_logo.jpg" height="55" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"> </div> </form> </div> diff --git a/images/paypal_logo.jpg b/images/paypal_logo.jpg new file mode 100644 index 0000000..ee9712c Binary files /dev/null and b/images/paypal_logo.jpg differ

1 0

[webwml/master] Merge remote-tracking branch 'origin/master' into staging
by sebastian＠torproject.org 20 Sep '15

20 Sep '15

commit 9aabcefb9a0d61b82344d9c9cfe83a0c1bdb86f7 Merge: b8ac55e 55334cd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 18 18:25:37 2015 +0200 Merge remote-tracking branch 'origin/master' into staging press/en/press.wml | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 20 Sep '15

20 Sep '15

commit 0a9d54c9f50e12289447fe8810f77019b3a24d66 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 20 15:46:26 2015 +0000 Update translations for tor-messenger-ircproperties --- nl/irc.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nl/irc.properties b/nl/irc.properties index bdb8925..afbf118 100644 --- a/nl/irc.properties +++ b/nl/irc.properties @@ -52,10 +52,10 @@ command.ctcp=%S <bijnaam> <bericht>: Verstuur een CTCP bericht naar command.chanserv=%S <commando>: Verstuur een commando naar ChanServ. command.deop=%S <nick1>[,<nick2>]*: Verwijder de kanaal beheerder status van iemand. U moet hiervoor een kanaal beheerder zijn. command.devoice=% S & lt; nick1 & gt; [& lt; nick2 & gt;] *: Verwijder channel voice-status van iemand, voorkom dat gesproken wordt wanneer het kanaal is gemodereerd (+ m). Je moet een channel operator zijn om dit te kunnen doen. -command.invite2=%S <nick>[ <nick>]* [<channel>]: Invite one or more nicks to join you in the current channel, or to join the specified channel. -command.join=%S <room1>[ <key1>][,<room2>[ <key2>]]*: Enter one or more channels, optionally providing a channel key for each if needed. -command.kick=%S <nick> [<message>]: Remove someone from a channel. You must be a channel operator to do this. -command.list=%S: Display a list of chat rooms on the network. Warning, some servers may disconnect you upon doing this. +command.invite2=%S <nick>[ <nick>]* [<channel>]: Nodig een of meerdere mensen uit om te komen naar jou in uw huidige kanaal, of een specifieke kanaal. +command.join=% S & lt; room1 & gt; [& lt; key1 & gt;] [& lt; room2 & gt; [& lt; key2 & gt;]] *: Betreedt één of meerdere kanalen, eventueel met het verstrekken van een kanaal sleutel voor elke indien gewenst. +command.kick=%S <nick> [<message>]:Verwijder iemand van een kanaal. U moet een channel operator zijn om dit te kunnen. +command.list=%S: Toont een lijst van chatrooms op het netwerk. Waarschuwing, sommige servers verbreken de verbinding om dit mogelijk te maken. command.memoserv=%S <command>: Stuur een command naar MemoServ. command.modeUser=%S (+|-)<new mode> [<nick>]: Set or unset a user's mode. command.modeChannel=%S <channel>[ (+|-)<new mode> [<parameter>][,<parameter>]*]: Get, set or unset a channel mode. @@ -74,12 +74,12 @@ command.topic=%S [<new topic>]: Onderwerp kanaal. command.umode=%S (+|-)<new mode>: Inschakelen/uitschakelen van user mode. command.version=%S <nick>: Request the version of a user's client. command.voice=%S <nick1>[,<nick2>]*: Grant channel voice status to someone. You must be a channel operator to do this. -command.whois2=%S [<nick>]: Get information on a user. +command.whois2=%S [<nick>]: Krijg informatie van een gebruiker. # LOCALIZATION NOTE (message.*): # These are shown as system messages in the conversation. # %1$S is the nick and %2$S is the nick and host of the user who joined. -message.join=%1$S [%2$S] entered the room. +message.join=%1$S [%2$S] is de room binnengekomen. message.rejoined=Je bent de chatroom opnieuw binnengetreden # %1$S is the nick of who kicked you. # %2$S is message.kicked.reason, if a kick message was given. @@ -91,11 +91,11 @@ message.kicked=%1$S is verwijderd door %2$S%3$S. message.kicked.reason=: %S # %1$S is the new mode, %2$S is the nickname of the user whose mode # was changed, and %3$S is who set the mode. -message.usermode=Mode %1$S for %2$S set by %3$S. +message.usermode=Mode %1$S voor %2$S ingesteld door %3$S. # %1$S is the new channel mode and %2$S is who set the mode. -message.channelmode=Channel mode %1$S set by %2$S. +message.channelmode=Kanaalmode %1$S ingesteld door %2$S. # %S is the user's mode. -message.yourmode=Your mode is %S. +message.yourmode=Uw mode is %S. # Could not change the nickname. %S is the user's nick. message.nick.fail=Je kunt de schuilnaam die je wilt niet gebruiken. Je schuilnaam blijft %S. # The parameter is the message.parted.reason, if a part message is given. @@ -129,7 +129,7 @@ message.whoisEntry=\\ua0\\ua0\\ua0\\ua0%1$S: %2$S message.unknownNick=%S is an onbekende nickname. # %1$S is the nickname of the user who changed the mode and %2$S is the new # channel key (password). -message.channelKeyAdded=%1$S changed the channel password to %2$S. +message.channelKeyAdded=%1$S heeft het wachtwoord van het kanaal veranderd naar %2$S. message.channelKeyRemoved=%S heeft het kanaalwachtwoord verwijderd. # This will be followed by a list of ban masks. message.banMasks=Users connected from the following locations are banned from %S:

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 20 Sep '15

20 Sep '15

commit a3f1f435644dba58dbd7847653a1708adf4b2917 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 20 15:16:26 2015 +0000 Update translations for tor-messenger-ircproperties --- nl/irc.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nl/irc.properties b/nl/irc.properties index 972dbbb..bdb8925 100644 --- a/nl/irc.properties +++ b/nl/irc.properties @@ -51,7 +51,7 @@ command.action=%S <uit te voeren actie>: Voer een actie uit. command.ctcp=%S <bijnaam> <bericht>: Verstuur een CTCP bericht naar de bijnaam. command.chanserv=%S <commando>: Verstuur een commando naar ChanServ. command.deop=%S <nick1>[,<nick2>]*: Verwijder de kanaal beheerder status van iemand. U moet hiervoor een kanaal beheerder zijn. -command.devoice=%S <nick1>[,<nick2>]*: Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this. +command.devoice=% S & lt; nick1 & gt; [& lt; nick2 & gt;] *: Verwijder channel voice-status van iemand, voorkom dat gesproken wordt wanneer het kanaal is gemodereerd (+ m). Je moet een channel operator zijn om dit te kunnen doen. command.invite2=%S <nick>[ <nick>]* [<channel>]: Invite one or more nicks to join you in the current channel, or to join the specified channel. command.join=%S <room1>[ <key1>][,<room2>[ <key2>]]*: Enter one or more channels, optionally providing a channel key for each if needed. command.kick=%S <nick> [<message>]: Remove someone from a channel. You must be a channel operator to do this. @@ -69,9 +69,9 @@ command.part=%S [message]: Leave the current channel with an optional message. command.ping=%S [<nick>]: Asks how much lag a user (or the server if no user specified) has. command.quit=%S <message>: Disconnect from the server, with an optional message. command.quote=%S <command>: Send a raw command to the server. -command.time=%S: Displays the current local time at the IRC server. -command.topic=%S [<new topic>]: Set this channel's topic. -command.umode=%S (+|-)<new mode>: Set or unset a user mode. +command.time=%S: Toont de lokale tijd in de IRC server. +command.topic=%S [<new topic>]: Onderwerp kanaal. +command.umode=%S (+|-)<new mode>: Inschakelen/uitschakelen van user mode. command.version=%S <nick>: Request the version of a user's client. command.voice=%S <nick1>[,<nick2>]*: Grant channel voice status to someone. You must be a channel operator to do this. command.whois2=%S [<nick>]: Get information on a user. @@ -99,13 +99,13 @@ message.yourmode=Your mode is %S. # Could not change the nickname. %S is the user's nick. message.nick.fail=Je kunt de schuilnaam die je wilt niet gebruiken. Je schuilnaam blijft %S. # The parameter is the message.parted.reason, if a part message is given. -message.parted.you=You have left the room (Part%1$S). +message.parted.you=Je hebt de room verlaten (Part%1$S). # %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given. -message.parted=%1$S has left the room (Part%2$S). +message.parted=%1$S heeft de room verlaten (Part%2$S) # %S is the part message supplied by the user. message.parted.reason=: %S # %1$S is the user's nick, %2$S is message.quit2 if a quit message is given. -message.quit=%1$S has left the room (Quit%2$S). +message.quit=%1$S heeft de room verlaten (Quit%2$S). # The parameter is the quit message given by the user. message.quit2=: %S # %1$S is the nickname of the user that invited us, %2$S is the conversation @@ -118,7 +118,7 @@ message.invited=%1$S is in goede orde uitgenodigd voor %2$S. # they were invited to but are already in message.alreadyInChannel=%1$S is al deelnemer aan %2$S. # %S is the nickname of the user who was summoned. -message.summoned=%S was summoned. +message.summoned=%S is gedagvaardigd # %S is the nickname of the user whose WHOIS information follows this message. message.whois=WHOIS-informatie voor %S: # %1$S is the nickname of the (offline) user whose WHOWAS information follows this message.

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 20 Sep '15

20 Sep '15

commit d334e8588a28f7664c098de8a736e8adc6de27ad Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 20 14:46:25 2015 +0000 Update translations for tor-messenger-ircproperties --- nl/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/irc.properties b/nl/irc.properties index d9f2474..972dbbb 100644 --- a/nl/irc.properties +++ b/nl/irc.properties @@ -56,7 +56,7 @@ command.invite2=%S <nick>[ <nick>]* [<channel>]: Invite one or command.join=%S <room1>[ <key1>][,<room2>[ <key2>]]*: Enter one or more channels, optionally providing a channel key for each if needed. command.kick=%S <nick> [<message>]: Remove someone from a channel. You must be a channel operator to do this. command.list=%S: Display a list of chat rooms on the network. Warning, some servers may disconnect you upon doing this. -command.memoserv=%S <command>: Send a command to MemoServ. +command.memoserv=%S <command>: Stuur een command naar MemoServ. command.modeUser=%S (+|-)<new mode> [<nick>]: Set or unset a user's mode. command.modeChannel=%S <channel>[ (+|-)<new mode> [<parameter>][,<parameter>]*]: Get, set or unset a channel mode. command.msg=%S <nick> <message>: Send a private message to a user (as opposed to a channel).

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 20 Sep '15

20 Sep '15

commit a2fb1ff0e278c9686f00990c7a1faca96172211e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 20 14:16:31 2015 +0000 Update translations for tor-messenger-ircproperties --- nl/irc.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nl/irc.properties b/nl/irc.properties index 8bc3c38..d9f2474 100644 --- a/nl/irc.properties +++ b/nl/irc.properties @@ -15,12 +15,12 @@ connection.error.lost=Verbinding verbroken met de server connection.error.timeOut=Verbindingstimeout connection.error.invalidUsername=%S is niet toegestaan als gebruikersnaam connection.error.invalidPassword=Verkeerd server wachtwoord -connection.error.passwordRequired=Wachtwoord noodzakelijk +connection.error.passwordRequired=Wachtwoord vereist # LOCALIZATION NOTE (joinChat.*): # These show up on the join chat menu. An underscore is for the access key. joinChat.channel=_Kanaal -joinChat.password=Wach_twoord +joinChat.password=_Wachtwoord # LOCALIZATION NOTE (options.*): # These are the protocol specific options shown in the account manager and @@ -171,7 +171,7 @@ error.wrongKey=kan niet deelnemen aan %S, door niet geldig kanaal paswoord error.sendMessageFailed=Er ging iets mis bij het versturen van je bericht. Probeer het zometeen gewoon nog een keer. # %1$S is the channel the user tried to join, %2$S is the channel # he was forwarded to. -error.channelForward=You may not join %1$S, and were automatically redirected to %2$S. +error.channelForward=U mag niet aansluiten bij %1$S, en werd automatisch doorgelinkt naar %2$S. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0