Download as
Browse Code »

Commit b52145ed9168022614d281f74744544b46a1f9b0

Authored by Luan
1 parent e1998fe7
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Changing message, updating position and translations - closes #107

Showing 3 changed files with 48 additions and 23 deletions   Show diff stats
src/accounts/templates/accounts/user_update_form.html
  Diff comments   View file @b52145e
... ... @@ -178,22 +178,26 @@ $(function() {
178 178 </div>
179 179 </div>
180 180 </div>
  181 + </div>
181 182  
182   - <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
183   - <div class="panel panel-default">
184   - <div class="panel-heading">
185   - <h3 class="panel-title">{% trans "Change SVN and XMPP Client password" %}</h3>
186   - </div>
187   - <div class="panel-body">
188   - <div class="form-group">
189   - {% trans "You don't need to change this password. Change it only if you really know what you are doing." %}
190   - </div>
191   - <a href="{% url 'change_password' %}" class="btn btn-primary pull-right">{% trans "Change Password" %}</a>
  183 + <div class="row">
  184 + <div class="col-lg-12">
  185 + <div class="panel panel-default">
  186 + <div class="panel-heading">
  187 + <h3 class="panel-title">
  188 + {% blocktrans %}Change <a href="http://repositorio.interlegis.gov.br/">SVN</a> and <a href="http://mensageiro.interlegis.gov.br/">XMPP Client</a> password{% endblocktrans %}
  189 + </h3>
  190 + </div>
  191 + <div class="panel-body">
  192 + <div class="form-group">
  193 + {% 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." %}
192 194 </div>
  195 + <a href="{% url 'change_password' %}" class="btn btn-default pull-right"><span class="icon-warning-sign"></span> {% trans "Change Password" %}</a>
193 196 </div>
194 197 </div>
195   -
  198 + </div>
196 199 </div>
  200 +
197 201 <div class="row">
198 202 <div class="submit">
199 203 <button type="submit" class="btn btn-primary btn-lg btn-block">{% trans "Update" %}</button>
... ...
src/locale/pt_BR/LC_MESSAGES/django.mo
View file @b52145e
No preview for this file type
src/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @b52145e
... ... @@ -7,7 +7,7 @@ msgid &quot;&quot;
7 7 msgstr ""
8 8 "Project-Id-Version: PACKAGE VERSION\n"
9 9 "Report-Msgid-Bugs-To: \n"
10   -"POT-Creation-Date: 2013-12-05 17:12+0000\n"
  10 +"POT-Creation-Date: 2013-12-05 18:14+0000\n"
11 11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -81,10 +81,10 @@ msgstr &quot;%(count)s usuários deletados.&quot;
81 81  
82 82 #: accounts/templates/accounts/change_password.html:8
83 83 msgid "Change XMPP Client and SVN Password"
84   -msgstr "Trocar senha do SVN e do Mensageiro"
  84 +msgstr "Trocar senha do Repositório e do Mensageiro"
85 85  
86 86 #: accounts/templates/accounts/change_password.html:17
87   -#: accounts/templates/accounts/user_update_form.html:191
  87 +#: accounts/templates/accounts/user_update_form.html:195
88 88 msgid "Change Password"
89 89 msgstr "Trocar senha"
90 90  
... ... @@ -229,19 +229,30 @@ msgstr &quot;Adicionar outro endereço de e-mail&quot;
229 229 msgid "Add"
230 230 msgstr "Adicionar"
231 231  
232   -#: accounts/templates/accounts/user_update_form.html:185
233   -msgid "Change SVN and XMPP Client password"
234   -msgstr "Trocar a senha do SVN e do Mensageiro"
  232 +#: accounts/templates/accounts/user_update_form.html:188
  233 +msgid ""
  234 +"Change <a href=\"http://repositorio.interlegis.gov.br/\">SVN</a> and <a href="
  235 +"\"http://mensageiro.interlegis.gov.br/\">XMPP Client</a> password"
  236 +msgstr ""
  237 +"Trocar a senha do <a href=\"http://repositorio.interlegis.gov.br/"
  238 +"\">Repositório</a> e do <a href=\"http://mensageiro.interlegis.gov.br/"
  239 +"\">Mensageiro</a>"
235 240  
236   -#: accounts/templates/accounts/user_update_form.html:189
  241 +#: accounts/templates/accounts/user_update_form.html:193
237 242 msgid ""
238   -"You don't need to change this password. Change it only if you really know "
239   -"what you are doing."
  243 +"This feature is available only for who needs to change the password for some "
  244 +"reason as having an old user with the same username, forgot your password to "
  245 +"commit, usage of other XMPP Client for connection. Usually, you won't need "
  246 +"to change this password. Only change it if you are sure about what you are "
  247 +"doing."
240 248 msgstr ""
241   -"Você não precisa trocar essa senha. Troque-a somente se tem certeza do que "
242   -"está fazendo."
  249 +"Este recurso está disponível para quem precisa trocar a senha por algum "
  250 +"motivo como ter um usuário antigo com mesmo nome de usuário, esqueceu da "
  251 +"senha antiga para commit, uso de outro cliente XMPP para conexão. "
  252 +"Normalmente, você não terá que trocar essa senha. Somente troque essa senha "
  253 +"se tiver certeza do que está fazendo."
243 254  
244   -#: accounts/templates/accounts/user_update_form.html:199
  255 +#: accounts/templates/accounts/user_update_form.html:203
245 256 msgid "Update"
246 257 msgstr "Atualizar"
247 258  
... ... @@ -975,6 +986,16 @@ msgstr &quot;Vontade de ajudar&quot;
975 986 msgid "INTERLEGIS COMMUNITIES"
976 987 msgstr "COMUNIDADES INTERLEGIS"
977 988  
  989 +#~ msgid "Change SVN and XMPP Client password"
  990 +#~ msgstr "Trocar a senha do SVN e do Mensageiro"
  991 +
  992 +#~ msgid ""
  993 +#~ "You don't need to change this password. Change it only if you really know "
  994 +#~ "what you are doing."
  995 +#~ msgstr ""
  996 +#~ "Você não precisa trocar essa senha. Troque-a somente se tem certeza do "
  997 +#~ "que está fazendo."
  998 +
978 999 #~ msgid "Subscribes: "
979 1000 #~ msgstr "Inscrições: "
980 1001  
... ...