Download as
Browse Code »

Commit 1302101d92fb11a509ccb3d61a53b5197c080398

Authored by Luan
1 parent 87417a3d
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 a few words and updating translations - #98

Showing 4 changed files with 30 additions and 19 deletions   Show diff stats
src/accounts/templates/accounts/manage_subscriptions.html
  Diff comments   View file @1302101
... ... @@ -3,7 +3,7 @@
3 3  
4 4 {% block main-content %}
5 5  
6   - <h2>{% blocktrans %}Mailing List Subscriptions{% endblocktrans %}</h2>
  6 + <h2>{% blocktrans %}Group Subscriptions{% endblocktrans %}</h2>
7 7 <h3>{% gravatar user_.email 50 %} {{ user_.get_full_name }} ({{ user_.username }})</h3>
8 8 <br>
9 9  
... ...
src/accounts/templates/accounts/user_detail.html
  Diff comments   View file @1302101
... ... @@ -22,8 +22,8 @@
22 22 </h1>
23 23  
24 24 {% if request.user == user_ or request.user.is_superuser %}
25   - <a class="btn btn-info" href="{% url 'user_profile_update' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{% trans "profile"|title %}</a>
26   - <a class="btn btn-info" href="{% url 'user_list_subscriptions' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{% trans "list membership"|title %}</a>
  25 + <a class="btn btn-info" href="{% url 'user_profile_update' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{% trans "edit profile"|title %}</a>
  26 + <a class="btn btn-info" href="{% url 'user_list_subscriptions' user_ %}"><span class="glyphicon glyphicon-pencil"></span>&nbsp;&nbsp;{% trans "group membership"|title %}</a>
27 27 {% endif %}
28 28  
29 29 <div class="divider"></div>
... ... @@ -76,7 +76,7 @@
76 76 <div class="col-lg-4 col-md-4 col-sm-7">
77 77 <div class="panel panel-default">
78 78 <div class="panel-heading">
79   - <h3 class="panel-title">{% trans "Contributions by Area" %}</h3>
  79 + <h3 class="panel-title">{% trans "Contributions by Type" %}</h3>
80 80 </div>
81 81 <div class="panel-body">
82 82 <div id="collabs"></div>
... ... @@ -88,7 +88,7 @@
88 88 <div class="col-lg-4 col-md-4 col-sm-7">
89 89 <div class="panel panel-default">
90 90 <div class="panel-heading">
91   - <h3 class="panel-title">{% trans "Groups Inscriptions" %}</h3>
  91 + <h3 class="panel-title">{% trans "Participation by Group" %}</h3>
92 92 </div>
93 93 <div class="panel-body">
94 94 <div id="collabs2"></div>
... ...
src/locale/pt_BR/LC_MESSAGES/django.mo
View file @1302101
No preview for this file type
src/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @1302101
... ... @@ -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-09 15:48+0000\n"
  10 +"POT-Creation-Date: 2013-12-10 11:38+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"
... ... @@ -53,6 +53,14 @@ msgstr &quot;Digite a mesma senha que acima, para verificação.&quot;
53 53 msgid "Password mismatch"
54 54 msgstr "Senhas diferentes"
55 55  
  56 +#: accounts/models.py:56
  57 +msgid "Required. 30 characters or fewer. Letters, digits and ./+/-/_ only."
  58 +msgstr ""
  59 +
  60 +#: accounts/models.py:61
  61 +msgid "Enter a valid username."
  62 +msgstr ""
  63 +
56 64 #: accounts/views.py:144
57 65 msgid "Your profile has been created!"
58 66 msgstr "Seu perfil foi criado!"
... ... @@ -89,8 +97,8 @@ msgid &quot;Change Password&quot;
89 97 msgstr "Trocar senha"
90 98  
91 99 #: accounts/templates/accounts/manage_subscriptions.html:6
92   -msgid "Mailing List Subscriptions"
93   -msgstr "Inscrições em listas de e-mails"
  100 +msgid "Group Subscriptions"
  101 +msgstr "Inscrições em grupos"
94 102  
95 103 #: accounts/templates/accounts/manage_subscriptions.html:36
96 104 msgid "Update subscriptions"
... ... @@ -121,12 +129,12 @@ msgid &quot;Register&quot;
121 129 msgstr "Cadastre-se"
122 130  
123 131 #: accounts/templates/accounts/user_detail.html:25
124   -msgid "profile"
125   -msgstr "perfil"
  132 +msgid "edit profile"
  133 +msgstr "editar perfil"
126 134  
127 135 #: accounts/templates/accounts/user_detail.html:26
128   -msgid "list membership"
129   -msgstr "participação em listas"
  136 +msgid "group membership"
  137 +msgstr "Inscrições nos grupos"
130 138  
131 139 #: accounts/templates/accounts/user_detail.html:49
132 140 msgid "Twitter account"
... ... @@ -145,12 +153,12 @@ msgid &quot;Groups: &quot;
145 153 msgstr "Grupos: "
146 154  
147 155 #: accounts/templates/accounts/user_detail.html:79
148   -msgid "Contributions by Area"
149   -msgstr "Contribuições por área"
  156 +msgid "Contributions by Type"
  157 +msgstr "Contribuições por tipo"
150 158  
151 159 #: accounts/templates/accounts/user_detail.html:91
152   -msgid "Groups Inscriptions"
153   -msgstr "Inscrições em grupos"
  160 +msgid "Participation by Group"
  161 +msgstr "Participação por grupo"
154 162  
155 163 #: accounts/templates/accounts/user_detail.html:104 badger/models.py:70
156 164 msgid "Badges"
... ... @@ -747,7 +755,7 @@ msgstr &quot;Lista de e-mail não existe&quot;
747 755 msgid "Unknown error trying to connect to Mailman API"
748 756 msgstr "Erro desconhecido na conexão com a API do Mailman"
749 757  
750   -#: super_archives/views.py:146
  758 +#: super_archives/views.py:148
751 759 msgid ""
752 760 "The email address you are trying to verify either has already been verified "
753 761 "or does not exist."
... ... @@ -755,7 +763,7 @@ msgstr &quot;&quot;
755 763 "O endereço de e-mail que você está tentando verificar ou já foi verificado "
756 764 "ou não existe."
757 765  
758   -#: super_archives/views.py:157
  766 +#: super_archives/views.py:159
759 767 msgid ""
760 768 "The email address you are trying to verify is already an active email "
761 769 "address."
... ... @@ -763,7 +771,7 @@ msgstr &quot;&quot;
763 771 "O endereço de e-mail que você está tentando verificar já é um endereço de e-"
764 772 "mail ativo"
765 773  
766   -#: super_archives/views.py:167
  774 +#: super_archives/views.py:169
767 775 msgid "Email address verified!"
768 776 msgstr "Endereço de e-mail verificado!"
769 777  
... ... @@ -1031,6 +1039,9 @@ msgstr &quot;Vontade de ajudar&quot;
1031 1039 msgid "INTERLEGIS COMMUNITIES"
1032 1040 msgstr "COMUNIDADES INTERLEGIS"
1033 1041  
  1042 +#~ msgid "Mailing List Subscriptions"
  1043 +#~ msgstr "Inscrições em listas de e-mails"
  1044 +
1034 1045 #~ msgid "Change SVN and XMPP Client password"
1035 1046 #~ msgstr "Trocar a senha do SVN e do Mensageiro"
1036 1047  
... ...