Download as
Browse Code »

Commit 5c5231bd323012cfabe30e9ff7ed9730c07f7911

Authored by Marco
Committed by Sergio Oliveira
1 parent 2a6c193f
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

Adding help link to the actived users

Showing 4 changed files with 26 additions and 13 deletions   Show diff stats
src/locale/pt_BR/LC_MESSAGES/django.mo
View file @5c5231b
No preview for this file type
src/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @5c5231b
... ... @@ -7,7 +7,7 @@ msgid ""
7 7 msgstr ""
8 8 "Project-Id-Version: PACKAGE VERSION\n"
9 9 "Report-Msgid-Bugs-To: \n"
10   -"POT-Creation-Date: 2014-06-11 13:17+0000\n"
  10 +"POT-Creation-Date: 2014-06-16 14:22+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"
... ... @@ -134,7 +134,7 @@ msgid &quot;Subscribe to groups&quot;
134 134 msgstr "Inscreva-se nos grupos"
135 135  
136 136 #: accounts/templates/accounts/user_create_form.html:60
137   -#: templates/base.html:101 templates/base.html.py:106
  137 +#: templates/base.html:106 templates/base.html.py:111
138 138 msgid "Register"
139 139 msgstr "Cadastre-se"
140 140  
... ... @@ -1021,37 +1021,42 @@ msgstr &quot;Códigos Fontes&quot;
1021 1021 msgid "Continuous Integration"
1022 1022 msgstr "Integração Contínua"
1023 1023  
1024   -#: templates/base.html:102 templates/base.html.py:107
  1024 +#: templates/base.html:95
  1025 +msgid "Help"
  1026 +msgstr "Ajuda"
  1027 +
  1028 +#: templates/base.html:107 templates/base.html.py:112
1025 1029 msgid "Login"
1026 1030 msgstr "Entrar"
1027 1031  
1028   -#: templates/base.html:121
  1032 +#: templates/base.html:126
1029 1033 msgid "My Profile"
1030 1034 msgstr "Meu Perfil"
1031 1035  
1032   -#: templates/base.html:122
  1036 +#: templates/base.html:127
1033 1037 msgid "Logout"
1034 1038 msgstr "Sair"
1035 1039  
1036   -#: templates/base.html:134 templates/base.html.py:137
  1040 +#: templates/base.html:139 templates/base.html.py:142
1037 1041 msgid "Search here..."
1038 1042 msgstr "Pesquise aqui..."
1039 1043  
1040   -#: templates/base.html:150
  1044 +#: templates/base.html:155
1041 1045 msgid "The login has failed. Please, try again."
1042 1046 msgstr "O login falhou. Por favor, tente novamente."
1043 1047  
1044   -#: templates/base.html:180
  1048 +#: templates/base.html:182
1045 1049 msgid "Last email imported at"
1046 1050 msgstr "Último e-mail importado em"
1047 1051  
1048   -#: templates/base.html:183
  1052 +#: templates/base.html:189
1049 1053 msgid "The contents of this site is published under license"
1050 1054 msgstr "O conteúdo deste site está publicado sob a licença"
1051 1055  
1052   -#: templates/base.html:185
1053   -msgid "Creative Commons - attribution, non-commercial"
1054   -msgstr "Creative Commons - atribuição e não-comercial"
  1056 +#: templates/base.html:192
  1057 +msgid ""
  1058 +"Creative Commons 3.0 Brasil - Atribuição - Não-Comercial - Compartilha-Igual"
  1059 +msgstr ""
1055 1060  
1056 1061 #: templates/home.html:21
1057 1062 msgid "Latest Collaborations"
... ... @@ -1483,6 +1488,9 @@ msgstr &quot;&quot;
1483 1488 msgid "INTERLEGIS COMMUNITIES"
1484 1489 msgstr "COMUNIDADES INTERLEGIS"
1485 1490  
  1491 +#~ msgid "Creative Commons - attribution, non-commercial"
  1492 +#~ msgstr "Creative Commons - atribuição e não-comercial"
  1493 +
1486 1494 #~ msgid "Willing to help"
1487 1495 #~ msgstr "Vontade de ajudar"
1488 1496  
... ...
src/super_archives/templates/superarchives/thread-dashboard.html
  Diff comments   View file @5c5231b
... ... @@ -9,7 +9,7 @@
9 9  
10 10 {% for listname, description, latest, most_relevant in lists %}
11 11 {% if latest or most_relevant %}
12   - <h3><b>{{ listname|title }} {% if description %} ({{ description }}){% endif %}</b></h3>
  12 + <h3><b>{{ listname|title|lower }} {% if description %} ({{ description }}){% endif %}</b></h3>
13 13 <hr/>
14 14  
15 15 <div class="row">
... ...
src/templates/base.html
  Diff comments   View file @5c5231b
... ... @@ -115,6 +115,11 @@
115 115 <li class="hidden-lg hidden-md">
116 116 <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
117 117 </li>
  118 + {% if user.is_active %}
  119 + <li>
  120 + <a href="/wiki/ComoUsarColab">{% trans "Help" %}</a>
  121 + </li>
  122 + {% endif %}
118 123 </ul>
119 124  
120 125 <ul class="nav navbar-nav navbar-right">
... ...