Commit c752879e authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/master'

parents 34531658 fc7a17ef
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-05-31 15:54+0300\n"
"POT-Creation-Date: 2016-09-10 14:06+0300\n"
"PO-Revision-Date: 2014-04-18 23:25+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -553,6 +553,6 @@ msgstr "Mit uns reden\n"
#. type: Plain text
msgid ""
"To talk to other Tails contributors, subscribe to our [[tails-dev@boum.org|"
"about/contact#tails-dev]] mailing list."
"To talk to other Tails contributors, subscribe to [[the relevant mailing "
"lists|about/contact]]."
msgstr ""
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2016-05-31 15:54+0300\n"
"POT-Creation-Date: 2016-09-10 14:06+0300\n"
"PO-Revision-Date: 2015-10-15 15:23+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
......@@ -538,8 +538,8 @@ msgstr "با ما تماس بگیرید\n"
#. type: Plain text
msgid ""
"To talk to other Tails contributors, subscribe to our [[tails-dev@boum.org|"
"about/contact#tails-dev]] mailing list."
"To talk to other Tails contributors, subscribe to [[the relevant mailing "
"lists|about/contact]]."
msgstr ""
#~ msgid "[[contribute/Low-hanging_fruit_sessions]]"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2016-05-31 15:54+0300\n"
"POT-Creation-Date: 2016-09-10 14:06+0300\n"
"PO-Revision-Date: 2016-06-05 10:04-0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
......@@ -489,6 +489,6 @@ msgstr "Nous contacter\n"
#. type: Plain text
msgid ""
"To talk to other Tails contributors, subscribe to our [[tails-dev@boum.org|"
"about/contact#tails-dev]] mailing list."
"To talk to other Tails contributors, subscribe to [[the relevant mailing "
"lists|about/contact]]."
msgstr ""
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-05-31 15:54+0300\n"
"POT-Creation-Date: 2016-09-10 14:06+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -409,6 +409,6 @@ msgstr ""
#. type: Plain text
msgid ""
"To talk to other Tails contributors, subscribe to our [[tails-dev@boum.org|"
"about/contact#tails-dev]] mailing list."
"To talk to other Tails contributors, subscribe to [[the relevant mailing "
"lists|about/contact]]."
msgstr ""
......@@ -186,5 +186,5 @@ Collective process
Talk with us
============
To talk to other Tails contributors, subscribe to our
[[tails-dev@boum.org|about/contact#tails-dev]] mailing list.
To talk to other Tails contributors, subscribe to
[[the relevant mailing lists|about/contact]].
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2016-05-31 15:54+0300\n"
"POT-Creation-Date: 2016-09-10 14:06+0300\n"
"PO-Revision-Date: 2016-04-30 11:31-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
......@@ -548,9 +548,13 @@ msgid "Talk with us\n"
msgstr "Fale conosco\n"
#. type: Plain text
#, fuzzy
#| msgid ""
#| "To talk to other Tails contributors, subscribe to our [[tails-dev@boum."
#| "org|about/contact#tails-dev]] mailing list."
msgid ""
"To talk to other Tails contributors, subscribe to our [[tails-dev@boum.org|"
"about/contact#tails-dev]] mailing list."
"To talk to other Tails contributors, subscribe to [[the relevant mailing "
"lists|about/contact]]."
msgstr ""
"Para falar com outras pessoas que contribuem com o Tails, inscreva-se na "
"nossa lista de emails [[tails-dev@boum.org|about/contact#tails-dev]]."
......
......@@ -6,7 +6,8 @@ Git repository and branches
===========================
You will need to clone the Tails Git repository, and to checkout the
branch that you want to build (most likely, _not_ `master`): learn
branch that you want to build. This branch should be based on `stable`
or `devel` (most likely, _not_ `master`): learn
more about [[our Git branches layout|contribute/git#main-repo]].
<a id="vagrant"></a>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment