Commit 822f097a authored by emmapeel's avatar emmapeel Committed by Tails developers
Browse files

Weblate commit

parent a391c0c2
......@@ -9,8 +9,8 @@ msgstr ""
"POT-Creation-Date: 2018-02-11 09:39+0000\n"
"PO-Revision-Date: 2018-02-11 09:57+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
"contribute/es/>\n"
"Language-Team: Spanish "
"<http://translate.tails.boum.org/projects/tails/contribute/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -620,26 +620,7 @@ msgstr ""
"[[Documentar el progreso|contribute/working_together/document_progress]]"
#. type: Plain text
<<<<<<< HEAD
#, no-wrap
=======
#, fuzzy, no-wrap
#| msgid ""
#| " - Roles\n"
#| " - [[Debian maintainer|contribute/working_together/roles/debian_maintainer]]\n"
#| " - [[Foundations team|contribute/working_together/roles/foundations_team]]\n"
#| " - [[Help desk|contribute/working_together/roles/help_desk]]\n"
#| " - Sponsor deliverables:\n"
#| " - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
#| " - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
#| " - [[Release manager|contribute/working_together/roles/release_manager]]\n"
#| " - [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]\n"
#| " - [[Sysadmins|contribute/working_together/roles/sysadmins]]\n"
#| " - [[Technical writer|contribute/working_together/roles/technical_writer]]\n"
#| " - [[Test suite maintainers|contribute/working_together/roles/test_suite]]\n"
#| " - [[UX designer|contribute/working_together/roles/ux]]\n"
#| " - [[Reports sent to sponsors|contribute/reports]]\n"
>>>>>>> tails/master
#, no-wrap
msgid ""
" - Roles\n"
" - [[Accounting team|contribute/working_together/roles/accounting]]\n"
......@@ -664,7 +645,6 @@ msgstr ""
"\n"
" - [[Help desk|contribute/working_together/roles/help_desk]]\n"
" - Sponsor deliverables:\n"
<<<<<<< HEAD
" - [[Team "
"manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]"
"\n"
......@@ -678,15 +658,6 @@ msgstr ""
"\n"
" - [[Test suite maintainers|contribute/working_together/roles/test_suite]]"
"\n"
=======
" - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
" - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
" - [[Release manager|contribute/working_together/roles/release_manager]]\n"
" - [[Ticket gardener|contribute/working_together/roles/ticket_gardener]]\n"
" - [[Administradores de sistemas|contribute/working_together/roles/sysadmins]]\n"
" - [[Escritor técnico|contribute/working_together/roles/technical_writer]]\n"
" - [[Test suite maintainers|contribute/working_together/roles/test_suite]]\n"
>>>>>>> tails/master
" - [[UX designer|contribute/working_together/roles/ux]]\n"
" - [[Reportes enviados a los sponsors|contribute/reports]]\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2018-02-13 18:56+0100\n"
"POT-Creation-Date: 2018-01-30 12:41+0000\n"
"PO-Revision-Date: 2018-01-04 15:55+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2018-02-13 18:56+0100\n"
"POT-Creation-Date: 2018-01-30 12:41+0000\n"
"PO-Revision-Date: 2018-01-04 15:57+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2018-02-13 18:56+0100\n"
"POT-Creation-Date: 2018-01-30 12:41+0000\n"
"PO-Revision-Date: 2018-01-04 15:59+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2018-02-13 18:56+0100\n"
"POT-Creation-Date: 2018-01-30 12:41+0000\n"
"PO-Revision-Date: 2018-01-18 13:08+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
......
......@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-02-13 13:55+0000\n"
"POT-Creation-Date: 2018-01-17 16:52+0000\n"
"PO-Revision-Date: 2018-01-28 20:33+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
"known_issues/es/>\n"
"Language-Team: Spanish "
"<http://translate.tails.boum.org/projects/tails/known_issues/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -783,21 +783,6 @@ msgid ""
"running inside a virtual machine with *virt-manager*."
msgstr ""
<<<<<<< HEAD
=======
#. type: Title -
#, no-wrap
msgid "Virtual machines with *VMware*\n"
msgstr ""
#. type: Plain text
msgid ""
"To improve support of Tails running inside a virtual machine with *VMware*, "
"[[install|doc/advanced_topics/additional_software]] the `open-vm-tools-"
"desktop` software package in Tails."
msgstr ""
>>>>>>> tails/master
#. type: Plain text
#, no-wrap
msgid "<a id=\"wi-fi\"></a>\n"
......
......@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-02-13 18:57+0100\n"
"PO-Revision-Date: 2018-01-04 15:52+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
"POT-Creation-Date: 2018-01-30 12:41+0000\n"
"PO-Revision-Date: 2018-02-05 19:26+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: French <http://translate.tails.boum.org/projects/tails"
"/upgrade-tails-overview/fr/>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......
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