Merge localization changes (Issue #5348)

diff --git a/CHANGES.md b/CHANGES.md
index 54ca86aa603acaf72a13045480010db766e153d8..3bd2e9678f3906351a2426d2a6d7755e8237a66a 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@ CHANGES - 2.2.9 - 2018-07-18
 Changes in CUPS v2.2.9
 ----------------------
 
+- Localization changes (Issue #5348)
 - The lpadmin command would create a non-working printer in some error cases
   (Issue #5305)
 - The scheduler would crash if an empty `AccessLog` directive was specified

diff --git a/templates/pt_BR/header.tmpl.in b/templates/pt_BR/header.tmpl.in
index d9124a635548f2d1fa9bd2066fbeeafafa5f95b1..e890b7c660e53b40b8c71ef3b5a796f8108f6c9f 100644 (file)
--- a/templates/pt_BR/header.tmpl.in
+++ b/templates/pt_BR/header.tmpl.in
@@ -31,7 +31,7 @@
       <ul>
        <li><a href="http://www.cups.org/" target="_blank">CUPS.org</a></li>
        <li><a href="/">In&iacute;cio</a></li>
-       <li><a {SECTION=admin?class="active" :}href="/admin">Administrar&ccedil;&atilde;o</a></li>
+       <li><a {SECTION=admin?class="active" :}href="/admin">Administra&ccedil;&atilde;o</a></li>
        <li><a {SECTION=classes?class="active" :}href="/classes/">Classes</a></li>
        <li><a {SECTION=help?class="active" :}href="/help/">Ajuda</a></li>
        <li><a {SECTION=jobs?class="active" :}href="/jobs/">Trabalhos</a></li>

diff --git a/templates/pt_BR/jobs-header.tmpl b/templates/pt_BR/jobs-header.tmpl
index 7b977193ff2d5f0324d966bd965a2afe119b26fe..91f061a13ec964a22b7c38de55e3bcc91ba8eb55 100644 (file)
--- a/templates/pt_BR/jobs-header.tmpl
+++ b/templates/pt_BR/jobs-header.tmpl
@@ -1,5 +1,5 @@
 {?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Mostrar trabalhos ativos"></FORM>}
-{?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="conclu&iacute;dos"><INPUT TYPE="SUBMIT" VALUE="Mostrar trabalhos conclu&iacute;dos"></FORM>}
+{?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Mostrar trabalhos conclu&iacute;dos"></FORM>}
 {?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Mostrar todos trabalhos"></FORM>}
 
 <P ALIGN="CENTER">{?which_jobs=?Jobs listed in print order; held jobs appear first.:{which_jobs=Jobs listed in ascending order.?:Jobs listed in descending order.}}</P>