Quoting intrigeri (2018-03-26 06:31:09)
> Hi,
>
> drebs@???:
> > Hi! Please pull pt-br translation updates for 3.6.1 release notes.
>
> I wanted to merge this but it conflicts with current master.
> Can you please merge current master, resolve conflicts and resubmit
> your merge request?
Done.
Question: why did you chose to remove the inline page inclusion?
Thanks!
----------------------------------------------------------------
The following changes since commit 26465622ba67bebdd2c344ff9b97247ccbf4d242:
Merge remote-tracking branch 'origin/master' (2018-03-26 08:14:32 +0000)
are available in the git repository at:
https://0xacab.org/drebs/tails pt-br
for you to fetch changes up to b49a1840bcc82bf086e1f5df3a2991e36568cad6:
Update pt-br translation of release notes for Tails 3.6.1. (2018-03-26 08:28:33 -0300)
----------------------------------------------------------------
Tails developers (1):
Update pt-br translation of release notes for Tails 3.6.1.
wiki/src/news/version_3.6.1.pt.po | 73 ++++++++++++++----------
wiki/src/news/version_3.6.pt.po | 33 +++++++----
wiki/src/security/Numerous_security_holes_in_3.5.pt.po | 58 +++++++++++--------
wiki/src/security/Numerous_security_holes_in_3.6.pt.po | 43 ++++++++------
4 files changed, 124 insertions(+), 83 deletions(-)