Download as
Browse Code »

Commit 08059f102f3e645738f8bba1775c186ca1bf4282

Authored by Sergio Oliveira
2 parents 006aca6f e5df6bf3
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

Merge branch 'master' of github.com:TracyWebTech/colab

Showing 4 changed files with 11 additions and 12 deletions   Show diff stats
src/accounts/templates/accounts/user_detail.html
  Diff comments   View file @08059f1
@@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
133 </div> 133 </div>
134 134
135 <div class="col-lg-6 col-md-6 col-sm-12"> 135 <div class="col-lg-6 col-md-6 col-sm-12">
136 - <h3>{% trans "Community inside participations" %}</h3> 136 + <h3>{% trans "Contributions" %}</h3>
137 <ul class="message-list"> 137 <ul class="message-list">
138 {% for result in results %} 138 {% for result in results %}
139 {% include "message-preview.html" %} 139 {% include "message-preview.html" %}
src/locale/pt_BR/LC_MESSAGES/django.mo
View file @08059f1
No preview for this file type
src/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @08059f1
@@ -7,7 +7,7 @@ msgid &quot;&quot; @@ -7,7 +7,7 @@ msgid &quot;&quot;
7 msgstr "" 7 msgstr ""
8 "Project-Id-Version: PACKAGE VERSION\n" 8 "Project-Id-Version: PACKAGE VERSION\n"
9 "Report-Msgid-Bugs-To: \n" 9 "Report-Msgid-Bugs-To: \n"
10 -"POT-Creation-Date: 2013-11-19 13:05-0200\n" 10 +"POT-Creation-Date: 2013-11-19 14:05-0200\n"
11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -92,7 +92,7 @@ msgstr &quot;perfil&quot; @@ -92,7 +92,7 @@ msgstr &quot;perfil&quot;
92 92
93 #: accounts/templates/accounts/user_detail.html:26 93 #: accounts/templates/accounts/user_detail.html:26
94 msgid "list membership" 94 msgid "list membership"
95 -msgstr "membros da lista" 95 +msgstr "participação em listas"
96 96
97 #: accounts/templates/accounts/user_detail.html:51 97 #: accounts/templates/accounts/user_detail.html:51
98 msgid "Twitter account" 98 msgid "Twitter account"
@@ -130,9 +130,9 @@ msgstr &quot;Últimas postagens&quot; @@ -130,9 +130,9 @@ msgstr &quot;Últimas postagens&quot;
130 msgid "There are no posts by this user so far." 130 msgid "There are no posts by this user so far."
131 msgstr "Não há posts deste usuário até agora." 131 msgstr "Não há posts deste usuário até agora."
132 132
133 -#: accounts/templates/accounts/user_detail.html:136  
134 -msgid "Community inside participations"  
135 -msgstr "Participações em comunidades internas" 133 +#: accounts/templates/accounts/user_detail.html:136 badger/models.py:24
  134 +msgid "Contributions"
  135 +msgstr "Contribuições"
136 136
137 #: accounts/templates/accounts/user_detail.html:141 137 #: accounts/templates/accounts/user_detail.html:141
138 msgid "No contributions of this user so far." 138 msgid "No contributions of this user so far."
@@ -227,10 +227,6 @@ msgstr &quot;Manual&quot; @@ -227,10 +227,6 @@ msgstr &quot;Manual&quot;
227 msgid "Messages" 227 msgid "Messages"
228 msgstr "Mensagens" 228 msgstr "Mensagens"
229 229
230 -#: badger/models.py:24  
231 -msgid "Contributions"  
232 -msgstr "Contribuições"  
233 -  
234 #: badger/models.py:25 230 #: badger/models.py:25
235 msgid "Wikis" 231 msgid "Wikis"
236 msgstr "Wikis" 232 msgstr "Wikis"
@@ -812,7 +808,7 @@ msgstr &quot;Inscrição na lista de e-mail&quot; @@ -812,7 +808,7 @@ msgstr &quot;Inscrição na lista de e-mail&quot;
812 msgid "Not found. Keep searching! :)" 808 msgid "Not found. Keep searching! :)"
813 msgstr "Não encontrado. Continue procurando! :)" 809 msgstr "Não encontrado. Continue procurando! :)"
814 810
815 -#: templates/500.html:5 811 +#: templates/500.html:2
816 msgid "Ooopz... something went wrong!" 812 msgid "Ooopz... something went wrong!"
817 msgstr "Opa... algo saiu errado!" 813 msgstr "Opa... algo saiu errado!"
818 814
@@ -908,6 +904,9 @@ msgstr &quot;Vontade de ajudar&quot; @@ -908,6 +904,9 @@ msgstr &quot;Vontade de ajudar&quot;
908 msgid "INTERLEGIS COMMUNITIES" 904 msgid "INTERLEGIS COMMUNITIES"
909 msgstr "COMUNIDADES INTERLEGIS" 905 msgstr "COMUNIDADES INTERLEGIS"
910 906
  907 +#~ msgid "Community inside participations"
  908 +#~ msgstr "Participações internas da comunidade"
  909 +
911 #~ msgid "documents found in" 910 #~ msgid "documents found in"
912 #~ msgstr "documentos encontrados em" 911 #~ msgstr "documentos encontrados em"
913 912
src/templates/home.html
  Diff comments   View file @08059f1
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 {% endfor %} 26 {% endfor %}
27 </ul> 27 </ul>
28 <a class="column-align" 28 <a class="column-align"
29 - href="{% url 'haystack_search' %}?order=latest&type=thread"> 29 + href="{% url 'haystack_search' %}?order=latest">
30 {% trans "View more collaborations..." %} 30 {% trans "View more collaborations..." %}
31 </a> 31 </a>
32 <div>&nbsp;</div> 32 <div>&nbsp;</div>