November 2014 - tor-commits - lists.torproject.org

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 17 Nov '14

17 Nov '14

commit bfb3ff5c377f48470fe3adb01e260b4b4b4b53db Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 17 05:45:17 2014 +0000 Update translations for whisperback --- cy_GB/cy_GB.po | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/cy_GB/cy_GB.po b/cy_GB/cy_GB.po new file mode 100644 index 0000000..a8f0673 --- /dev/null +++ b/cy_GB/cy_GB.po @@ -0,0 +1,199 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-17 17:40+0100\n" +"PO-Revision-Date: 2012-02-26 16:11+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/cy_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: cy_GB\n" +"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" + +#. XXX use a better exception +#: ../whisperBack/whisperback.py:63 +#, python-format +msgid "Invalid contact email: %s" +msgstr "" + +#: ../whisperBack/whisperback.py:80 +#, python-format +msgid "Invalid contact OpenPGP key: %s" +msgstr "" + +#: ../whisperBack/whisperback.py:82 +msgid "Invalid contact OpenPGP public key block" +msgstr "" + +#: ../whisperBack/exceptions.py:41 +#, python-format +msgid "" +"The %s variable was not found in any of the configuration files " +"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "" + +#: ../whisperBack/gui.py:154 +msgid "Unable to load a valid configuration." +msgstr "" + +#: ../whisperBack/gui.py:220 +msgid "Sending mail..." +msgstr "" + +#: ../whisperBack/gui.py:221 +msgid "Sending mail" +msgstr "" + +#. pylint: disable=C0301 +#: ../whisperBack/gui.py:223 +msgid "This could take a while..." +msgstr "" + +#: ../whisperBack/gui.py:237 +msgid "The contact email adress doesn't seem valid." +msgstr "" + +#: ../whisperBack/gui.py:254 +msgid "Unable to send the mail: SMTP error." +msgstr "" + +#: ../whisperBack/gui.py:256 +msgid "Unable to connect to the server." +msgstr "" + +#: ../whisperBack/gui.py:258 +msgid "Unable to create or to send the mail." +msgstr "" + +#: ../whisperBack/gui.py:261 +msgid "" +"\n" +"\n" +"The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" +"\n" +"If it does not work, you will be offered to save the bug report." +msgstr "" + +#: ../whisperBack/gui.py:274 +msgid "Your message has been sent." +msgstr "" + +#: ../whisperBack/gui.py:281 +msgid "An error occured during encryption." +msgstr "" + +#: ../whisperBack/gui.py:301 +#, python-format +msgid "Unable to save %s." +msgstr "" + +#. XXX: fix string +#: ../whisperBack/gui.py:325 +#, python-format +msgid "" +"The bug report could not be sent, likely due to network problems.\n" +"\n" +"As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" +"\n" +"Do you want to save the bug report to a file?" +msgstr "" + +#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 +msgid "WhisperBack" +msgstr "" + +#: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2 +msgid "Send feedback in an encrypted mail." +msgstr "" + +#: ../whisperBack/gui.py:393 +msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" +msgstr "" + +#: ../whisperBack/gui.py:394 +msgid "Tails developers <tails(a)boum.org>" +msgstr "" + +#: ../whisperBack/gui.py:395 +msgid "translator-credits" +msgstr "" + +#: ../whisperBack/gui.py:422 +msgid "This doesn't seem to be a valid URL or OpenPGP key." +msgstr "" + +#: ../data/whisperback.ui.h:1 +msgid "Copyright © 2009-2012 tails(a)boum.org" +msgstr "" + +#: ../data/whisperback.ui.h:3 +msgid "https://tails.boum.org/" +msgstr "" + +#: ../data/whisperback.ui.h:4 +msgid "" +"WhisperBack - Send feedback in an encrypted mail\n" +"Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" +"\n" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 3 of the License, or (at\n" +"your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" +"General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "" + +#: ../data/whisperback.ui.h:20 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "" + +#: ../data/whisperback.ui.h:22 +msgid "Summary" +msgstr "" + +#: ../data/whisperback.ui.h:23 +msgid "Bug description" +msgstr "" + +#: ../data/whisperback.ui.h:24 +msgid "Optional email address to contact you" +msgstr "" + +#: ../data/whisperback.ui.h:25 +msgid "optional PGP key" +msgstr "" + +#: ../data/whisperback.ui.h:26 +msgid "Technical details to include" +msgstr "" + +#: ../data/whisperback.ui.h:27 +msgid "headers" +msgstr "" + +#: ../data/whisperback.ui.h:28 +msgid "debugging info" +msgstr "" + +#: ../data/whisperback.ui.h:29 +msgid "Help" +msgstr "" + +#: ../data/whisperback.ui.h:30 +msgid "Send" +msgstr ""

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 17 Nov '14

17 Nov '14

commit f470f0f210e7dd07c8d20dd1f7fede4e53945439 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 17 05:45:13 2014 +0000 Update translations for torcheck --- cy_GB/torcheck.po | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/cy_GB/torcheck.po b/cy_GB/torcheck.po new file mode 100644 index 0000000..dfd970d --- /dev/null +++ b/cy_GB/torcheck.po @@ -0,0 +1,96 @@ +# TorCheck gettext template +# Copyright (C) 2008-2013 The Tor Project, Inc +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2010-11-30 04:59+0000\n" +"Last-Translator: Appelbaum <jacob(a)appelbaum.net>\n" +"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/cy_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Language: cy_GB\n" +"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" + +msgid "Congratulations. This browser is configured to use Tor." +msgstr "" + +msgid "" +"Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "" + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "" + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "" + +msgid "Sorry. You are not using Tor." +msgstr "" + +msgid "" +"If you are attempting to use a Tor client, please refer to the <a " +"href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "" + +msgid "Sorry, your query failed or an unexpected response was received." +msgstr "" + +msgid "" +"A temporary service outage prevents us from determining if your source IP " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "" + +msgid "Your IP address appears to be: " +msgstr "" + +msgid "Are you using Tor?" +msgstr "" + +msgid "This page is also available in the following languages:" +msgstr "" + +msgid "For more information about this exit relay, see:" +msgstr "" + +msgid "" +"The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " +"development, and education of online anonymity and privacy." +msgstr "" + +msgid "Learn More »" +msgstr "" + +msgid "Go" +msgstr "" + +msgid "Short User Manual" +msgstr "" + +msgid "Donate to Support Tor" +msgstr "" + +msgid "Tor Q&A Site" +msgstr "" + +msgid "Volunteer" +msgstr "" + +msgid "JavaScript is enabled." +msgstr "" + +msgid "JavaScript is disabled." +msgstr "" + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 17 Nov '14

17 Nov '14

commit d37d61b299509526fc8e49e7c8088a9288e3bfd9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 17 05:45:08 2014 +0000 Update translations for gettor --- cy_GB/gettor.po | 502 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 502 insertions(+) diff --git a/cy_GB/gettor.po b/cy_GB/gettor.po new file mode 100644 index 0000000..a884335 --- /dev/null +++ b/cy_GB/gettor.po @@ -0,0 +1,502 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +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: 2010-11-30 05:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/cy_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: cy_GB\n" +"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "" + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "" + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "" + +#: lib/gettor/i18n.py:35 +msgid "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." +msgstr "" + +#: lib/gettor/i18n.py:39 +msgid "" +"(We apologize if you didn't ask for this mail. Since your email is from\n" +"a service that doesn't use DKIM, we're sending a short explanation,\n" +"and then we'll ignore this email address for the next day or so.)" +msgstr "" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" obfs-windows\n" +" obfs-macos-i386\n" +" obfs-macos-x86_64\n" +" obfs-linux-i386\n" +" obfs-linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:61 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:64 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:72 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:76 +msgid " List of supported locales:" +msgstr "" + +#: lib/gettor/i18n.py:78 +msgid "Here is a list of all available languages:" +msgstr "" + +#: lib/gettor/i18n.py:80 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr "" + +#: lib/gettor/i18n.py:92 +msgid "If you select no language, you will receive the English version." +msgstr "" + +#: lib/gettor/i18n.py:94 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:97 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:101 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:107 +msgid "" +"Sending this text in an email to GetTor will cause it to send you \n" +"the Tor Browser Bundle in a number of 1,4MB attachments." +msgstr "" + +#: lib/gettor/i18n.py:110 +msgid "" +"After having received all parts, you need to re-assemble them to \n" +"one package again. This is done as follows:" +msgstr "" + +#: lib/gettor/i18n.py:113 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "" + +#: lib/gettor/i18n.py:115 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:119 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" + +#: lib/gettor/i18n.py:122 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:126 +msgid "" +"5.) After unpacking is finished, you should find a newly created \n" +"\".exe\" file in your destination folder. Simply doubleclick\n" +"that and Tor Browser Bundle should start within a few seconds." +msgstr "" + +#: lib/gettor/i18n.py:130 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" + +#: lib/gettor/i18n.py:132 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" + +#: lib/gettor/i18n.py:138 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:141 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:148 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:157 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:160 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "" + +#: lib/gettor/i18n.py:167 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:172 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:175 +msgid "" +"Another censorship circumvention tool you can request from GetTor is\n" +"the Tor Obfsproxy Browser Bundle. Please read the package descriptions for\n" +"which package you should request to receive this." +msgstr "" + +#: lib/gettor/i18n.py:179 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:188 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:191 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:194 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:197 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:211 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:214 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:219 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:227 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "" + +#: lib/gettor/i18n.py:231 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:244 +msgid "" +"obfs-windows:\n" +"The Tor Obfsproxy Browser Bundle for Windows operating systems. If you need\n" +"strong censorship circumvention and you are running some version of the \n" +"Windows, like Windows XP, Windows Vista or Windows 7, this is the package\n" +"you should get." +msgstr "" + +#: lib/gettor/i18n.py:250 +msgid "" +"obfs-macos-i386:\n" +"The Tor Obfsproxy Browser Bundle package for OS X, 32bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:254 +msgid "" +"obfs-macos-x86_64:\n" +"The Tor Obfsproxy Browser Bundle package for OS X, 64bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:258 +msgid "" +"obfs-linux-i386:\n" +"The Tor Obfsproxy Browser Bundle package for Linux, 32bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:262 +msgid "" +"obfs-linux-x86_64:\n" +"The Tor Obfsproxy Browser Bundle package for Linux, 64bit Intel CPU \n" +"architecture." +msgstr "" + +#: lib/gettor/i18n.py:266 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:269 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:274 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:276 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:286 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:288 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:292 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:294 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:299 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:301 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:303 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:305 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 17 Nov '14

17 Nov '14

commit 8910f40b573f5ddb2cbe5be425131bab86832b51 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 17 05:45:03 2014 +0000 Update translations for bridgedb --- cy_GB/LC_MESSAGES/bridgedb.po | 356 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+) diff --git a/cy_GB/LC_MESSAGES/bridgedb.po b/cy_GB/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..ab37c43 --- /dev/null +++ b/cy_GB/LC_MESSAGES/bridgedb.po @@ -0,0 +1,356 @@ +# Translations template for BridgeDB. +# Copyright (C) 2014 'The Tor Project, Inc.' +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-07-26 02:11+0000\n" +"PO-Revision-Date: 2011-02-19 16:53+0000\n" +"Last-Translator: Isis Lovecruft <isis(a)torproject.org>\n" +"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/cy_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: cy_GB\n" +"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" + +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:121 +msgid "Sorry! Something went wrong with your request." +msgstr "" + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "" + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 +msgid "Public Keys" +msgstr "" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:37 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "" + +#: lib/bridgedb/strings.py:76 +msgid "What are bridges?" +msgstr "" + +#: lib/bridgedb/strings.py:77 +#, python-format +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "" + +#: lib/bridgedb/strings.py:82 +msgid "I need an alternative way of getting bridges!" +msgstr "" + +#: lib/bridgedb/strings.py:83 +#, python-format +msgid "" +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s, %s or %s." +msgstr "" + +#: lib/bridgedb/strings.py:90 +msgid "My bridges don't work! I need help!" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 +#, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 +msgid "" +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "" + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "" + +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "" + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "" + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format +msgid "" +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "" + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +msgstr "" + +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 +msgid "Request vanilla bridges." +msgstr "" + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "" + +#: lib/bridgedb/templates/base.html:92 +msgid "Report a Bug" +msgstr "" + +#: lib/bridgedb/templates/base.html:94 +msgid "Source Code" +msgstr "" + +#: lib/bridgedb/templates/base.html:97 +msgid "Changelog" +msgstr "" + +#: lib/bridgedb/templates/base.html:99 +msgid "Contact" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: lib/bridgedb/templates/bridges.html:72 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: lib/bridgedb/templates/bridges.html:73 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: lib/bridgedb/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: lib/bridgedb/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: lib/bridgedb/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:130 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:154 +#, python-format +msgid "%sG%set Bridges" +msgstr ""

1 0

[webwml/master] Update and rename README to README.md
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit 331982f836416ecff70a64c941c0e0f6c263460a Author: Nima Fatemi <mrphs(a)riseup.net> Date: Fri Nov 14 23:40:26 2014 +0000 Update and rename README to README.md - Applying markdown format and some prettifying. - Adding a note to arma's instruction. --- README | 79 ---------------------------------------------------------- README.md | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 79 deletions(-) diff --git a/README b/README deleted file mode 100644 index 80afdc5..0000000 --- a/README +++ /dev/null @@ -1,79 +0,0 @@ -To quickly get set up simply do the following... - - 1. Get the website's build dependencies. - - % sudo apt-get install wml asciidoc - - 2. Configure where to find your tor git repository. It needs this to make the - manual page. - - % git clone https://git.torproject.org/project/web/webwml.git - % cd webwml - % cp Makefile.local.sample Makefile.local - [ change the TORGIT in Makefile.local to point to your tor git repo ] - - 3. Make the website. - - % make - -You should now be able to point your browser at the locally generated site... - - file:///home/atagar/Desktop/tor/webwml/getinvolved/volunteer.html.en - --------------------------------------------------------------------------------- -Troubleshooting --------------------------------------------------------------------------------- - -* The build fails with "Invalid object name". - - If you get an error like... - - ---- Contents of STDERR channel: --------- - fatal: Invalid object name 'tor-0.2.6.1-alpha'. - asciidoc: FAILED: manpage document title is mandatory - No manpage because of asciidoc error or file not available from git at /tmp/wml.zwcq0q/wml.30867.tmp1.wml line 415. - - This means your tor repository is out of date. Update your tor git repository. - --------------------------------------------------------------------------------- -More detailed instructions from Roger --------------------------------------------------------------------------------- - -Here are the instructions I sent David Fifield when he asked about -editing the website. I hope they are useful for you too! --Roger - -Copy Makefile.local.sample to Makefile.local in your webwml/ directory. -Point TORGIT to a tor git. - -Then apt-get install wml and (alas) probably a shocking number of other -debs. Then you can type 'make' and it will build the website for you -locally. It's probably a smart move to see whether 'make' works before -you git commit any changes to the wml files. - -You can edit docs/en/pluggable-transports.wml (and that is -the right source file to edit, not the html). But go take a -look at that file. You'll notice it has a bunch of tags like -<version-torbrowserbundle>. If you're just bumping version -numbers, you probably just want to change the definition of those tags. -They're in include/versions.wmi - -(Every once in a while you may need to edit pluggable-transports.wml -too -- generally when you change the file name so drastically that just -changing the versions.wmi tags isn't enough.) - -Pushes to the master branch of the git repository will cause the -website to get re-built and published. Pushing to the staging branch -will update www-staging.torproject.org. - -Alas, https://www.torproject.org/dist/ isn't in version control. You -write to it by ssh'ing to dist-master.torproject.org and going to -/srv/dist-master.torproject.org/htdocs/ and then sticking your stuff -there. When you want it to go live, you run -"static-update-component dist.torproject.org" on dist-master. - -Weasel has hopes that somebody will write some scripts to make maintaining -packages in dist/ less awful -- automatically check that they have -signatures and that the sigs match, that the items on the website are in -fact in dist, only allow certain people to put files in certain places, -etc. One day! :) - diff --git a/README.md b/README.md new file mode 100644 index 0000000..173f97e --- /dev/null +++ b/README.md @@ -0,0 +1,82 @@ +# Building website locally + +To quickly get set up simply do the following + + __Step 1:__ Get the website's build dependencies. + + sudo apt-get install wml asciidoc + + __Step 2:__ Configure where to find your tor git repository. It needs this to make the + manual page. + + git clone https://git.torproject.org/project/web/webwml.git + cd webwml + cp Makefile.local.sample Makefile.local + +Note: Change the `TORGIT` in Makefile.local to point to your tor git repo. + + __Step 3:__ Make the website. + + make + +You should now be able to point your browser at the locally generated site... + + file:///home/atagar/Desktop/tor/webwml/getinvolved/volunteer.html.en + + +### Troubleshooting the build + +The build fails with "Invalid object name". + + If you get an error like... + + ---- Contents of STDERR channel: --------- + fatal: Invalid object name 'tor-0.2.6.1-alpha'. + asciidoc: FAILED: manpage document title is mandatory + No manpage because of asciidoc error or file not available from git at /tmp/wml.zwcq0q/wml.30867.tmp1.wml line 415. + + This means your tor repository is out of date. Update your tor git repository. + + +### More detailed instructions from Roger + +_Note: This section was written when website repo was still on svn, and it wasn't built automatically._ + +Here are the instructions I sent David Fifield when he asked about +editing the website. I hope they are useful for you too! --Roger + +Copy Makefile.local.sample to Makefile.local in your webwml/ directory. +Point TORGIT to a tor git. + +Then apt-get install wml and (alas) probably a shocking number of other +debs. Then you can type 'make' and it will build the website for you +locally. It's probably a smart move to see whether 'make' works before +you git commit any changes to the wml files. + +You can edit docs/en/pluggable-transports.wml (and that is +the right source file to edit, not the html). But go take a +look at that file. You'll notice it has a bunch of tags like +<version-torbrowserbundle>. If you're just bumping version +numbers, you probably just want to change the definition of those tags. +They're in include/versions.wmi + +(Every once in a while you may need to edit pluggable-transports.wml +too -- generally when you change the file name so drastically that just +changing the versions.wmi tags isn't enough.) + +Pushes to the master branch of the git repository will cause the +website to get re-built and published. Pushing to the staging branch +will update www-staging.torproject.org. + +Alas, https://www.torproject.org/dist/ isn't in version control. You +write to it by ssh'ing to dist-master.torproject.org and going to +/srv/dist-master.torproject.org/htdocs/ and then sticking your stuff +there. When you want it to go live, you run +"static-update-component dist.torproject.org" on dist-master. + +Weasel has hopes that somebody will write some scripts to make maintaining +packages in dist/ less awful -- automatically check that they have +signatures and that the sigs match, that the items on the website are in +fact in dist, only allow certain people to put files in certain places, +etc. One day! :) +

1 0

[webwml/master] Update README.md
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit eac5838540e53d0c506d883ba947b9e786a28566 Author: Nima Fatemi <mrphs(a)riseup.net> Date: Sat Nov 15 00:52:44 2014 +0000 Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 173f97e..7372063 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Building website locally - -To quickly get set up simply do the following +# Building website +Torproject website is being built and published automatically. +To quickly get set up and build website locally, simply follow these steps: __Step 1:__ Get the website's build dependencies.

1 0

[webwml/master] Update README.md
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit 3d0e13aaf37a0050f6158a719803f248c6f2d933 Author: Nima Fatemi <mrphs(a)riseup.net> Date: Sat Nov 15 01:43:25 2014 +0000 Update README.md Add how to contribute --- README.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/README.md b/README.md index 7372063..0295897 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,33 @@ +# How to contribute + +Thanks for being interested to work on the website, I tried to make a simple how-to for you to quickly get you setup: + +__Step 1:__ Clone the git repo. + + git clone https://git.torproject.org/project/web/webwml.git + cd webwml + +__Step 1b:__ Create a bare public repository (i.e on Github), where you'd push your commits to. Make sure you're in `webwml` directory, and run: + + git remote add pick-a-name your-git-url + +_Example:_ + `git remote tpo-gh git@github.com:mrphs/tpo.git` + +__Step 2:__ Create and switch to a new branch. + +_In the following example, I've named my branch "docs" as I'm planning to work on the documentations._ + + git checkout -b docs + +__Step 3:__ Now you can start working on website and make changes. Once you're done, commit and push it to your public repo. + +_Example:_ + + git push tpo-gh docs + +__Step 4:__ Open a new ticket on [trac](https://trac.torproject.org) with a link to your shiny new repo/branch. + # Building website Torproject website is being built and published automatically. To quickly get set up and build website locally, simply follow these steps:

1 0

[webwml/master] fix tails logo size
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit 08bc424e615dfc844d1ae8ea5dd61ab7c4816d3f Author: Nima Fatemi <mrphs(a)riseup.net> Date: Fri Nov 14 20:03:57 2014 +0000 fix tails logo size resizing png to 75x75. --- images/tails_logo.png | Bin 38306 -> 4375 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/tails_logo.png b/images/tails_logo.png index 926ba9b..811315c 100644 Binary files a/images/tails_logo.png and b/images/tails_logo.png differ

1 0

[webwml/master] Update README.md
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit e547d2e21cc2bf7a2430a2d26fc1826e9768edcd Author: Nima Fatemi <mrphs(a)riseup.net> Date: Mon Nov 17 01:10:00 2014 +0000 Update README.md wrapping the text at 79 chars per line --- README.md | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 0295897..9c6adc4 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,15 @@ # How to contribute -Thanks for being interested to work on the website, I tried to make a simple how-to for you to quickly get you setup: +Thanks for being interested to work on the website, I tried to make a simple +how-to for you to quickly get you setup: __Step 1:__ Clone the git repo. git clone https://git.torproject.org/project/web/webwml.git cd webwml -__Step 1b:__ Create a bare public repository (i.e on Github), where you'd push your commits to. Make sure you're in `webwml` directory, and run: +__Step 1b:__ Create a bare public repository (i.e on Github), where you'd push +your commits to. Make sure you're in `webwml` directory, and run: git remote add pick-a-name your-git-url @@ -16,17 +18,20 @@ _Example:_ __Step 2:__ Create and switch to a new branch. -_In the following example, I've named my branch "docs" as I'm planning to work on the documentations._ +_In the following example, I've named my branch "docs" as I'm planning to work +on the documentations._ git checkout -b docs -__Step 3:__ Now you can start working on website and make changes. Once you're done, commit and push it to your public repo. +__Step 3:__ Now you can start working on website and make changes. Once you're +done, commit and push it to your public repo. _Example:_ git push tpo-gh docs -__Step 4:__ Open a new ticket on [trac](https://trac.torproject.org) with a link to your shiny new repo/branch. +__Step 4:__ Open a new ticket on [trac](https://trac.torproject.org) with a +link to your shiny new repo/branch. # Building website Torproject website is being built and published automatically. @@ -36,7 +41,8 @@ To quickly get set up and build website locally, simply follow these steps: sudo apt-get install wml asciidoc - __Step 2:__ Configure where to find your tor git repository. It needs this to make the + __Step 2:__ Configure where to find your tor git repository. It needs this +to make the manual page. git clone https://git.torproject.org/project/web/webwml.git @@ -63,14 +69,17 @@ The build fails with "Invalid object name". ---- Contents of STDERR channel: --------- fatal: Invalid object name 'tor-0.2.6.1-alpha'. asciidoc: FAILED: manpage document title is mandatory - No manpage because of asciidoc error or file not available from git at /tmp/wml.zwcq0q/wml.30867.tmp1.wml line 415. + No manpage because of asciidoc error or file not available from git at + /tmp/wml.zwcq0q/wml.30867.tmp1.wml line 415. - This means your tor repository is out of date. Update your tor git repository. + This means your tor repository is out of date. Update your tor git +repository. ### More detailed instructions from Roger -_Note: This section was written when website repo was still on svn, and it wasn't built automatically._ +_Note: This section was written when website repo was still on svn, and it +wasn't built automatically._ Here are the instructions I sent David Fifield when he asked about editing the website. I hope they are useful for you too! --Roger @@ -109,4 +118,3 @@ packages in dist/ less awful -- automatically check that they have signatures and that the sigs match, that the items on the website are in fact in dist, only allow certain people to put files in certain places, etc. One day! :) -

1 0

[webwml/master] Update README.md
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit c48c6e365a0b18635fb4395d3c1b4000ebd794a7 Author: Nima Fatemi <mrphs(a)riseup.net> Date: Mon Nov 17 01:10:33 2014 +0000 Update README.md typo in one of the examples --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c6adc4..974188d 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ your commits to. Make sure you're in `webwml` directory, and run: git remote add pick-a-name your-git-url _Example:_ - `git remote tpo-gh git@github.com:mrphs/tpo.git` + `git remote add tpo-gh git@github.com:mrphs/tpo.git` __Step 2:__ Create and switch to a new branch.

1 0