From b52145ed9168022614d281f74744544b46a1f9b0 Mon Sep 17 00:00:00 2001
From: Luan <luanpab@gmail.com>
Date: Thu, 5 Dec 2013 16:18:50 -0200
Subject: [PATCH] Changing message, updating position and translations - closes #107

---
 src/accounts/templates/accounts/user_update_form.html | 26 +++++++++++++++-----------
 src/locale/pt_BR/LC_MESSAGES/django.mo                | Bin 14073 -> 0 bytes
 src/locale/pt_BR/LC_MESSAGES/django.po                | 45 +++++++++++++++++++++++++++++++++------------
 3 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/src/accounts/templates/accounts/user_update_form.html b/src/accounts/templates/accounts/user_update_form.html
index d9b59dc..2a11cc9 100644
--- a/src/accounts/templates/accounts/user_update_form.html
+++ b/src/accounts/templates/accounts/user_update_form.html
@@ -178,22 +178,26 @@ $(function() {
           </div>
         </div>
       </div>
+    </div>
 
-      <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            <h3 class="panel-title">{% trans "Change SVN and XMPP Client password" %}</h3>
-          </div>
-          <div class="panel-body">
-            <div class="form-group">
-            {% trans "You don't need to change this password. Change it only if you really know what you are doing." %}
-            </div>
-            <a href="{% url 'change_password' %}" class="btn btn-primary pull-right">{% trans "Change Password" %}</a>
+    <div class="row">
+      <div class="col-lg-12">
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <h3 class="panel-title">
+            {% blocktrans %}Change <a href="http://repositorio.interlegis.gov.br/">SVN</a> and <a href="http://mensageiro.interlegis.gov.br/">XMPP Client</a> password{% endblocktrans %}
+          </h3>
+        </div>
+        <div class="panel-body">
+          <div class="form-group">
+          {% trans "This feature is available only for who needs to change the password for some reason as having an old user with the same username, forgot your password to commit, usage of other XMPP Client for connection. Usually, you won't need to change this password. Only change it if you are sure about what you are doing." %}
           </div>
+          <a href="{% url 'change_password' %}" class="btn btn-default pull-right"><span class="icon-warning-sign"></span> {% trans "Change Password" %}</a>
         </div>
       </div>
-
+      </div>
     </div>
+
     <div class="row">
       <div class="submit">
         <button type="submit" class="btn btn-primary btn-lg btn-block">{% trans "Update" %}</button>
diff --git a/src/locale/pt_BR/LC_MESSAGES/django.mo b/src/locale/pt_BR/LC_MESSAGES/django.mo
index 71d2961..dd4055d 100644
Binary files a/src/locale/pt_BR/LC_MESSAGES/django.mo and b/src/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/src/locale/pt_BR/LC_MESSAGES/django.po b/src/locale/pt_BR/LC_MESSAGES/django.po
index df7068d..b085a40 100644
--- a/src/locale/pt_BR/LC_MESSAGES/django.po
+++ b/src/locale/pt_BR/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-05 17:12+0000\n"
+"POT-Creation-Date: 2013-12-05 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -81,10 +81,10 @@ msgstr "%(count)s usuários deletados."
 
 #: accounts/templates/accounts/change_password.html:8
 msgid "Change XMPP Client and SVN Password"
-msgstr "Trocar senha do SVN e do Mensageiro"
+msgstr "Trocar senha do Repositório e do Mensageiro"
 
 #: accounts/templates/accounts/change_password.html:17
-#: accounts/templates/accounts/user_update_form.html:191
+#: accounts/templates/accounts/user_update_form.html:195
 msgid "Change Password"
 msgstr "Trocar senha"
 
@@ -229,19 +229,30 @@ msgstr "Adicionar outro endereço de e-mail"
 msgid "Add"
 msgstr "Adicionar"
 
-#: accounts/templates/accounts/user_update_form.html:185
-msgid "Change SVN and XMPP Client password"
-msgstr "Trocar a senha do SVN e do Mensageiro"
+#: accounts/templates/accounts/user_update_form.html:188
+msgid ""
+"Change <a href=\"http://repositorio.interlegis.gov.br/\">SVN</a> and <a href="
+"\"http://mensageiro.interlegis.gov.br/\">XMPP Client</a> password"
+msgstr ""
+"Trocar a senha do <a href=\"http://repositorio.interlegis.gov.br/"
+"\">Repositório</a> e do <a href=\"http://mensageiro.interlegis.gov.br/"
+"\">Mensageiro</a>"
 
-#: accounts/templates/accounts/user_update_form.html:189
+#: accounts/templates/accounts/user_update_form.html:193
 msgid ""
-"You don't need to change this password. Change it only if you really know "
-"what you are doing."
+"This feature is available only for who needs to change the password for some "
+"reason as having an old user with the same username, forgot your password to "
+"commit, usage of other XMPP Client for connection. Usually, you won't need "
+"to change this password. Only change it if you are sure about what you are "
+"doing."
 msgstr ""
-"Você não precisa trocar essa senha. Troque-a somente se tem certeza do que "
-"está fazendo."
+"Este recurso está disponível para quem precisa trocar a senha por algum "
+"motivo como ter um usuário antigo com mesmo nome de usuário, esqueceu da "
+"senha antiga para commit, uso de outro cliente XMPP para conexão. "
+"Normalmente, você não terá que trocar essa senha. Somente troque essa senha "
+"se tiver certeza do que está fazendo."
 
-#: accounts/templates/accounts/user_update_form.html:199
+#: accounts/templates/accounts/user_update_form.html:203
 msgid "Update"
 msgstr "Atualizar"
 
@@ -975,6 +986,16 @@ msgstr "Vontade de ajudar"
 msgid "INTERLEGIS COMMUNITIES"
 msgstr "COMUNIDADES INTERLEGIS"
 
+#~ msgid "Change SVN and XMPP Client password"
+#~ msgstr "Trocar a senha do SVN e do Mensageiro"
+
+#~ msgid ""
+#~ "You don't need to change this password. Change it only if you really know "
+#~ "what you are doing."
+#~ msgstr ""
+#~ "Você não precisa trocar essa senha. Troque-a somente se tem certeza do "
+#~ "que está fazendo."
+
 #~ msgid "Subscribes: "
 #~ msgstr "Inscrições: "
 
--
libgit2 0.21.2