Commit 4a06c9ad authored by Tails developers's avatar Tails developers

merging master

parent aabb2a6b
......@@ -7,11 +7,7 @@ msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-01-30 12:41+0000\n"
<<<<<<< HEAD
"PO-Revision-Date: 2018-02-13 18:29+0000\n"
=======
"PO-Revision-Date: 2018-02-03 23:38+0000\n"
>>>>>>> tails/master
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Spanish "
"<http://translate.tails.boum.org/projects/tails/index/es/>\n"
......@@ -100,11 +96,7 @@ msgstr ""
#. type: Content of: <div><p>
msgid "See [[News]] for more."
<<<<<<< HEAD
msgstr "Lee [[Noticias|news]] por más."
=======
msgstr "Lee [[Noticias|News]] por más."
>>>>>>> tails/master
#. type: Content of: <div><h1>
msgid "Security"
......@@ -124,11 +116,7 @@ msgstr ""
#. type: Content of: <div><p>
msgid "See [[Security]] for more."
<<<<<<< HEAD
msgstr "Lee [[Seguridad|Security]] por más."
=======
msgstr "Lee [[Seguridad]] por más."
>>>>>>> tails/master
#. type: Content of: <div><div>
msgid ""
......
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