Merge branch 'master' of github.com:mozilla/addons-server into pyup-u…

…pdate-requests-2.20.1-to-2.21.0

locale/id/LC_MESSAGES/django.po

@@ -762,7 +762,7 @@ msgstr "Beranda Pengaya"
 #, python-format
 msgid "If you followed a link from somewhere, please %(open_bug_link)sfile an issue%(close_bug_link)s. Tell us where you came from and what you were looking for, and we'll do our best to fix it."
 msgstr ""
-"Jika Anda mengikuti tautan dari suatu tempat, harap%(open_bug_link)kirimkan masalah%(close_bug_link)s. Beritahu kami dari mana Anda berasal dan apa yang Anda cari, kami akan melakukan yang terbaik "
+"Jika Anda mengikuti tautan dari suatu tempat, harap %(open_bug_link)s kirimkan masalah%(close_bug_link)s. Beritahu kami dari mana Anda berasal dan apa yang Anda cari, kami akan melakukan yang terbaik "
 "untuk memperbaikinya."
 
 msgid "Not Found"

locale/pt_BR/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: REMORA 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2018-12-05 15:45+0000\n"
-"PO-Revision-Date: 2018-12-07 22:49+0000\n"
+"PO-Revision-Date: 2018-12-11 11:26+0000\n"
 "Last-Translator: Marcelo Ghelman <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: pt_BR\n"
@@ -1967,13 +1967,13 @@ msgid "Appearance"
 msgstr "Aparência"
 
 msgid "Download extensions that modify the appearance of websites and the browser Firefox. This category includes extensions for dark themes, tab management, and more."
-msgstr ""
+msgstr "Baixe extensões que modificam a aparência de sites e do navegador Firefox. Esta categoria inclui extensões de temas escuros, gerenciamento de abas e muito mais."
 
 msgid "Bookmarks"
 msgstr "Favoritos"
 
 msgid "Download extensions that enhance bookmarks by password-protecting them, searching for duplicates, finding broken bookmarks, and more."
-msgstr ""
+msgstr "Baixe extensões que melhoram os favoritos, protegendo-os com senha, procurando duplicidade, encontrando favoritos com erro e muito mais."
 
 msgid "Download Management"
 msgstr "Gerenciador de downloads"

src/olympia/amo/templates/amo/404-responsive.html

@@ -34,7 +34,7 @@ <h3>{{ _('Suggested Pages') }}</h3>
       <p>
         {% trans open_bug_link='<a href="https://github.com/mozilla/addons/issues/new">'|safe, close_bug_link='</a>'|safe %}
         If you followed a link from somewhere, please {{ open_bug_link }}file
-        an issue{{ close_bug_link }}. Tell us where you came from and what you
+        an issue {{ close_bug_link }}. Tell us where you came from and what you
         were looking for, and we'll do our best to fix it.
         {% endtrans %}
       </p>

src/olympia/amo/templates/amo/404.html

@@ -3,7 +3,8 @@
 {% block title %}{{ _('Not Found') }}{% endblock %}
 
 {% block content %}
-{% trans rec=url('browse.extensions')|urlparams(sort='featured'), search=url('search.search'), home=url('home') %}
+{% trans rec=url('browse.extensions')|urlparams(sort='featured'), search=url('search.search'), home=url('home'),
+         open_bug_link='<a href="https://github.com/mozilla/addons/issues/new">'|safe, close_bug_link='</a>'|safe %}%}
 <h1>We're sorry, but we can't find what you're looking for.</h1>
 
 <p>
@@ -14,8 +15,7 @@ <h1>We're sorry, but we can't find what you're looking for.</h1>
 <ul>
   <li>If you typed in the address, please double check the spelling.</li>
   <li>
-    If you followed a link from somewhere, please 
-    <a href="https://github.com/mozilla/addons-server/issues/new/">file an issue</a>.
+    If you followed a link from somewhere, please {{ open_bug_link }}file an issue{{ close_bug_link }}.
     Tell us where you came from and what you were looking for, and we'll do
     our best to fix it.
   </li>