Commit 42c88253a0c9fb219c3084894addecb149eec992

Authored by Felipe Henrique de Almeida Bormann
2 parents 7bfdc4ee 2eb4bba0

fixed conflict

amadeus/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" @@ -8,7 +8,7 @@ msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2016-12-29 18:14-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:42-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,75 +18,79 @@ msgstr &quot;&quot; @@ -18,75 +18,79 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: amadeus/templates/base.html:80  
22 -msgid "Search Files (.pdf, others) and/or activities"  
23 -msgstr "Pesquisar arquivos (.pdf, outros) e/ou atividades" 21 +#: amadeus/templates/base.html:90
  22 +msgid "Search for subjects and resources"
  23 +msgstr "Buscar por assuntos ou recursos"
24 24
25 -#: amadeus/templates/base.html:93 25 +#: amadeus/templates/base.html:102
26 msgid "settings" 26 msgid "settings"
27 msgstr "configurações" 27 msgstr "configurações"
28 28
29 -#: amadeus/templates/base.html:96 29 +#: amadeus/templates/base.html:105
  30 +msgid "Settings"
  31 +msgstr "Configurações"
  32 +
  33 +#: amadeus/templates/base.html:108
30 msgid "Manage Users" 34 msgid "Manage Users"
31 msgstr "Gerenciar Usuários" 35 msgstr "Gerenciar Usuários"
32 36
33 -#: amadeus/templates/base.html:97 37 +#: amadeus/templates/base.html:109
34 msgid "Manage Categories" 38 msgid "Manage Categories"
35 msgstr "Gerenciar Categorias" 39 msgstr "Gerenciar Categorias"
36 40
37 -#: amadeus/templates/base.html:104 41 +#: amadeus/templates/base.html:116
38 msgid "System" 42 msgid "System"
39 msgstr "Sistema" 43 msgstr "Sistema"
40 44
41 -#: amadeus/templates/base.html:110 45 +#: amadeus/templates/base.html:123
42 msgid "Mail Sender" 46 msgid "Mail Sender"
43 msgstr "Remetente de Email" 47 msgstr "Remetente de Email"
44 48
45 -#: amadeus/templates/base.html:111 49 +#: amadeus/templates/base.html:124
46 msgid "Security" 50 msgid "Security"
47 msgstr "Segurança" 51 msgstr "Segurança"
48 52
49 -#: amadeus/templates/base.html:112 53 +#: amadeus/templates/base.html:125
50 msgid "Theme" 54 msgid "Theme"
51 msgstr "Temas" 55 msgstr "Temas"
52 56
53 -#: amadeus/templates/base.html:122  
54 -msgid "account"  
55 -msgstr "conta"  
56 -  
57 -#: amadeus/templates/base.html:127 57 +#: amadeus/templates/base.html:142
58 msgid "Profile" 58 msgid "Profile"
59 msgstr "Perfil" 59 msgstr "Perfil"
60 60
61 -#: amadeus/templates/base.html:128 61 +#: amadeus/templates/base.html:143
62 msgid "Edit Profile" 62 msgid "Edit Profile"
63 msgstr "Editar Perfil" 63 msgstr "Editar Perfil"
64 64
65 -#: amadeus/templates/base.html:129 65 +#: amadeus/templates/base.html:144
66 msgid "Change Password" 66 msgid "Change Password"
67 msgstr "Alterar Senha" 67 msgstr "Alterar Senha"
68 68
69 -#: amadeus/templates/base.html:130 69 +#: amadeus/templates/base.html:145
70 msgid "Delete Account" 70 msgid "Delete Account"
71 -msgstr "Deletar Conta" 71 +msgstr "Remover Conta"
72 72
73 -#: amadeus/templates/base.html:145 73 +#: amadeus/templates/base.html:146
  74 +msgid "Logout"
  75 +msgstr "Sair"
  76 +
  77 +#: amadeus/templates/base.html:159 amadeus/templates/base.html:203
74 msgid "Subjects" 78 msgid "Subjects"
75 msgstr "Assuntos" 79 msgstr "Assuntos"
76 80
77 -#: amadeus/templates/base.html:148 81 +#: amadeus/templates/base.html:164 amadeus/templates/base.html:208
78 msgid "Timeline" 82 msgid "Timeline"
79 msgstr "Timeline" 83 msgstr "Timeline"
80 84
81 -#: amadeus/templates/base.html:151 85 +#: amadeus/templates/base.html:167 amadeus/templates/base.html:211
82 msgid "Messages" 86 msgid "Messages"
83 msgstr "Mensagens" 87 msgstr "Mensagens"
84 88
85 -#: amadeus/templates/base.html:155 89 +#: amadeus/templates/base.html:170 amadeus/templates/base.html:214
86 msgid "Pendencias" 90 msgid "Pendencias"
87 msgstr "Pendências" 91 msgstr "Pendências"
88 92
89 -#: amadeus/templates/base.html:159 93 +#: amadeus/templates/base.html:173 amadeus/templates/base.html:217
90 msgid "Analytics" 94 msgid "Analytics"
91 msgstr "Analytics" 95 msgstr "Analytics"
92 96
@@ -96,12 +100,14 @@ msgid &quot;&quot; @@ -96,12 +100,14 @@ msgid &quot;&quot;
96 "You're receiving this email because you requested a password reset for your " 100 "You're receiving this email because you requested a password reset for your "
97 "user account at %(site_name)s." 101 "user account at %(site_name)s."
98 msgstr "" 102 msgstr ""
  103 +"Você está recebendo esse email porque você solicitou uma alteração de senha "
  104 +"para a sua conta em %(site_name)s."
99 105
100 #: amadeus/templates/recover_pass_email_template.html:9 106 #: amadeus/templates/recover_pass_email_template.html:9
101 msgid "Please go to the following page and choose a new password:" 107 msgid "Please go to the following page and choose a new password:"
102 -msgstr "" 108 +msgstr "Por favor vá até a seguinte página e escolha uma nova senha:"
103 109
104 #: amadeus/templates/recover_pass_email_template.html:15 110 #: amadeus/templates/recover_pass_email_template.html:15
105 #, python-format 111 #, python-format
106 msgid "The %(site_name)s team" 112 msgid "The %(site_name)s team"
107 -msgstr "" 113 +msgstr "Time %(site_name)s"
categories/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2016-12-29 18:14-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:42-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,19 +24,19 @@ msgstr &quot;Nome&quot; @@ -24,19 +24,19 @@ msgstr &quot;Nome&quot;
24 24
25 #: categories/models.py:10 25 #: categories/models.py:10
26 msgid "Slug" 26 msgid "Slug"
27 -msgstr "" 27 +msgstr "Slug"
28 28
29 #: categories/models.py:11 29 #: categories/models.py:11
30 msgid "description" 30 msgid "description"
31 -msgstr "descrição" 31 +msgstr "Descrição"
32 32
33 #: categories/models.py:12 33 #: categories/models.py:12
34 msgid "visible" 34 msgid "visible"
35 -msgstr "visivel" 35 +msgstr "Visível"
36 36
37 #: categories/models.py:13 37 #: categories/models.py:13
38 msgid "coordinators" 38 msgid "coordinators"
39 -msgstr "" 39 +msgstr "Coordenadores"
40 40
41 #: categories/models.py:14 41 #: categories/models.py:14
42 msgid "Creation Date" 42 msgid "Creation Date"
@@ -48,25 +48,41 @@ msgstr &quot;Data de modificação&quot; @@ -48,25 +48,41 @@ msgstr &quot;Data de modificação&quot;
48 48
49 #: categories/models.py:19 49 #: categories/models.py:19
50 msgid "Category" 50 msgid "Category"
51 -msgstr "" 51 +msgstr "Categoria"
52 52
53 -#: categories/models.py:20 categories/views.py:40 53 +#: categories/models.py:20 categories/views.py:48
54 msgid "Categories" 54 msgid "Categories"
55 msgstr "Categorias" 55 msgstr "Categorias"
56 56
  57 +#: categories/templates/categories/_form.html:21
  58 +msgid "Atribute coordinators role to users"
  59 +msgstr "Atribuir perfil de coordenadores a usuários"
  60 +
  61 +#: categories/templates/categories/_form.html:62
  62 +msgid "Save"
  63 +msgstr "Salvar"
  64 +
  65 +#: categories/templates/categories/_form.html:68
  66 +#: categories/templates/categories/_form.html:69
  67 +msgid "try an username"
  68 +msgstr "Tente um nome de usuário"
  69 +
57 #: categories/templates/categories/category_card.html:18 70 #: categories/templates/categories/category_card.html:18
58 -#: categories/templates/categories/list.html:56 71 +#: categories/templates/categories/list.html:69
  72 +#: categories/templates/categories/list.html:118
59 msgid "Replicate" 73 msgid "Replicate"
60 msgstr "Replicar" 74 msgstr "Replicar"
61 75
62 #: categories/templates/categories/category_card.html:19 76 #: categories/templates/categories/category_card.html:19
63 #: categories/templates/categories/home_admin_content.html:6 77 #: categories/templates/categories/home_admin_content.html:6
64 -#: categories/templates/categories/list.html:58 78 +#: categories/templates/categories/list.html:73
  79 +#: categories/templates/categories/list.html:120
65 msgid "Edit" 80 msgid "Edit"
66 msgstr "Editar" 81 msgstr "Editar"
67 82
68 #: categories/templates/categories/category_card.html:20 83 #: categories/templates/categories/category_card.html:20
69 -#: categories/templates/categories/list.html:59 84 +#: categories/templates/categories/list.html:74
  85 +#: categories/templates/categories/list.html:121
70 msgid "Remove" 86 msgid "Remove"
71 msgstr "Remover" 87 msgstr "Remover"
72 88
@@ -78,10 +94,6 @@ msgstr &quot;Tem certeza que você deseja se inscrever neste curso?&quot; @@ -78,10 +94,6 @@ msgstr &quot;Tem certeza que você deseja se inscrever neste curso?&quot;
78 msgid "Subscribe" 94 msgid "Subscribe"
79 msgstr "Inscrever-se" 95 msgstr "Inscrever-se"
80 96
81 -#: categories/templates/categories/create.html:53  
82 -msgid "Register"  
83 -msgstr "Registrar"  
84 -  
85 #: categories/templates/categories/delete.html:12 97 #: categories/templates/categories/delete.html:12
86 msgid "Are you sure you want to delete the category" 98 msgid "Are you sure you want to delete the category"
87 msgstr "Voce tem certeza que seja deletar esta categoria" 99 msgstr "Voce tem certeza que seja deletar esta categoria"
@@ -98,51 +110,71 @@ msgstr &quot;Cancelar&quot; @@ -98,51 +110,71 @@ msgstr &quot;Cancelar&quot;
98 msgid "Delete" 110 msgid "Delete"
99 msgstr "Deletar" 111 msgstr "Deletar"
100 112
101 -#: categories/templates/categories/home.html:17 113 +#: categories/templates/categories/home.html:26
102 msgid "categories" 114 msgid "categories"
103 -msgstr "categorias" 115 +msgstr "Categorias"
104 116
105 -#: categories/templates/categories/list.html:25 117 +#: categories/templates/categories/list.html:31 categories/views.py:105
106 msgid "Create Category" 118 msgid "Create Category"
107 msgstr "Criar Categoria" 119 msgstr "Criar Categoria"
108 120
109 -#: categories/templates/categories/list.html:30 121 +#: categories/templates/categories/list.html:39
110 msgid "My subjects" 122 msgid "My subjects"
111 -msgstr "" 123 +msgstr "Meus assuntos"
112 124
113 -#: categories/templates/categories/list.html:31 125 +#: categories/templates/categories/list.html:40
114 msgid "all subjects" 126 msgid "all subjects"
115 -msgstr "todos assuntos" 127 +msgstr "Todos os assuntos"
116 128
117 -#: categories/templates/categories/list.html:76  
118 -msgid "Coordinator(s): "  
119 -msgstr "Coordenadores" 129 +#: categories/templates/categories/list.html:90
  130 +#: categories/templates/categories/list.html:137
  131 +msgid "Coordinator(s) "
  132 +msgstr "Coordenador(es)"
  133 +
  134 +#: categories/templates/categories/list.html:94
  135 +#: categories/templates/categories/list.html:141
  136 +msgid "It doesn't possess coordinators"
  137 +msgstr "Não possui coordenadores"
120 138
121 #: categories/templates/categories/notifications_timeline.html:14 139 #: categories/templates/categories/notifications_timeline.html:14
122 msgid "at" 140 msgid "at"
123 -msgstr "" 141 +msgstr "em"
124 142
125 #: categories/templates/categories/notifications_timeline.html:15 143 #: categories/templates/categories/notifications_timeline.html:15
126 msgid "ago" 144 msgid "ago"
127 msgstr "atras" 145 msgstr "atras"
128 146
129 -#: categories/templates/categories/update.html:54  
130 -msgid "Update"  
131 -msgstr "" 147 +#: categories/templates/categories/update.html:8
  148 +msgid "Update: "
  149 +msgstr "Editar: "
  150 +
  151 +#: categories/views.py:103
  152 +msgid "Replicate Category"
  153 +msgstr "Replicar Categoria"
132 154
133 -#: categories/views.py:104 155 +#: categories/views.py:130
134 #, python-format 156 #, python-format
135 msgid "Category \"%s\" register successfully!" 157 msgid "Category \"%s\" register successfully!"
136 msgstr "Categoria \"%s\" foi registrada com sucesso!" 158 msgstr "Categoria \"%s\" foi registrada com sucesso!"
137 159
138 -#: categories/views.py:128  
139 -msgid "Category removed successfully!"  
140 -msgstr "Categoria removida com sucesso!" 160 +#: categories/views.py:150
  161 +msgid ""
  162 +"The category cannot be removed, it contains one or more virtual enviroments "
  163 +"attach."
  164 +msgstr ""
  165 +"A categoria não pode ser removida, ela contém um ou mais ambientes virtuais "
  166 +"vinculados."
  167 +
  168 +#: categories/views.py:163
  169 +#, python-format
  170 +msgid "Category \"%s\" removed successfully!"
  171 +msgstr "Categoria \"%s\" removida com sucesso!"
141 172
142 -#: categories/views.py:143 173 +#: categories/views.py:191
143 #, python-format 174 #, python-format
144 msgid "Category \"%s\" updated successfully!" 175 msgid "Category \"%s\" updated successfully!"
145 msgstr "Categoria \"%s\" atualizada com sucesso!" 176 msgstr "Categoria \"%s\" atualizada com sucesso!"
146 177
147 -#~ msgid "Delete Category"  
148 -#~ msgstr "Deletar categoria" 178 +#: categories/views.py:208
  179 +msgid "Update Category"
  180 +msgstr "Atualizar Categoria"
categories/templates/categories/update.html
@@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@
5 5
6 {% block breadcrumbs %} 6 {% block breadcrumbs %}
7 {{ block.super }} 7 {{ block.super }}
8 - {% with 'Update '|add:category.slug as bread_slug %} 8 + {% trans 'Update: ' as bread %}
  9 + {% with bread|add:category.name as bread_slug %}
9 {% breadcrumb bread_slug 'categories:update' %} 10 {% breadcrumb bread_slug 'categories:update' %}
10 {% endwith %} 11 {% endwith %}
11 {% endblock %} 12 {% endblock %}
log/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2016-12-29 18:14-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:42-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,13 +39,21 @@ msgid &quot;Actor&quot; @@ -39,13 +39,21 @@ msgid &quot;Actor&quot;
39 msgstr "" 39 msgstr ""
40 40
41 #: log/models.py:13 41 #: log/models.py:13
  42 +msgid "Actor id"
  43 +msgstr ""
  44 +
  45 +#: log/models.py:14
  46 +msgid "Actor Mail"
  47 +msgstr ""
  48 +
  49 +#: log/models.py:15
42 msgid "Date and Time of action" 50 msgid "Date and Time of action"
43 msgstr "" 51 msgstr ""
44 52
45 -#: log/models.py:16 53 +#: log/models.py:18
46 msgid "Log" 54 msgid "Log"
47 msgstr "" 55 msgstr ""
48 56
49 -#: log/models.py:17 57 +#: log/models.py:19
50 msgid "Logs" 58 msgid "Logs"
51 msgstr "" 59 msgstr ""
mailsender/locale/pt_BR/LC_MESSAGES/django.po 0 → 100644
@@ -0,0 +1,99 @@ @@ -0,0 +1,99 @@
  1 +# SOME DESCRIPTIVE TITLE.
  2 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
  3 +# This file is distributed under the same license as the PACKAGE package.
  4 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  5 +#
  6 +#, fuzzy
  7 +msgid ""
  8 +msgstr ""
  9 +"Project-Id-Version: PACKAGE VERSION\n"
  10 +"Report-Msgid-Bugs-To: \n"
  11 +"POT-Creation-Date: 2017-01-18 15:42-0300\n"
  12 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  13 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  14 +"Language-Team: LANGUAGE <LL@li.org>\n"
  15 +"Language: \n"
  16 +"MIME-Version: 1.0\n"
  17 +"Content-Type: text/plain; charset=UTF-8\n"
  18 +"Content-Transfer-Encoding: 8bit\n"
  19 +"Plural-Forms: nplurals=2; plural=(n > 1);\n"
  20 +
  21 +#: mailsender/models.py:5
  22 +msgid "Description"
  23 +msgstr "Descrição"
  24 +
  25 +#: mailsender/models.py:6
  26 +msgid "Host name"
  27 +msgstr "Nome do host"
  28 +
  29 +#: mailsender/models.py:7
  30 +msgid "Port Number"
  31 +msgstr "Porta"
  32 +
  33 +#: mailsender/models.py:8
  34 +msgid "Username"
  35 +msgstr "Nome de usuário"
  36 +
  37 +#: mailsender/models.py:9
  38 +msgid "Password"
  39 +msgstr "Senha"
  40 +
  41 +#: mailsender/models.py:10 mailsender/templates/mailsender/update.html:32
  42 +msgid "Criptografy"
  43 +msgstr "Criptografia"
  44 +
  45 +#: mailsender/models.py:10
  46 +msgid "No"
  47 +msgstr "Não"
  48 +
  49 +#: mailsender/models.py:10
  50 +msgid "SSL"
  51 +msgstr "SSL"
  52 +
  53 +#: mailsender/models.py:10
  54 +msgid "TLS"
  55 +msgstr "TLS"
  56 +
  57 +#: mailsender/models.py:10
  58 +msgid "TLS, if possible"
  59 +msgstr "TLS, se possível"
  60 +
  61 +#: mailsender/models.py:13
  62 +msgid "Mail sender configuration"
  63 +msgstr "Configuração de remetende de email"
  64 +
  65 +#: mailsender/models.py:14
  66 +msgid "Mail sender configurations"
  67 +msgstr "Configurações de remetende de email"
  68 +
  69 +#: mailsender/templates/mailsender/update.html:9
  70 +msgid "Settings: Mail Sender"
  71 +msgstr "Configurações: Remetente de Email"
  72 +
  73 +#: mailsender/templates/mailsender/update.html:19
  74 +msgid "General server settings"
  75 +msgstr "Configurações gerais do servidor"
  76 +
  77 +#: mailsender/templates/mailsender/update.html:21
  78 +msgid ""
  79 +"If your email host is Gmail make sure to turn on the option \"Allow less "
  80 +"secure apps\" in"
  81 +msgstr ""
  82 +"Se o seu host de email é Gmail certifique-se de ativar a opção \"Permitir "
  83 +"aplicativos menos seguros\" em"
  84 +
  85 +#: mailsender/templates/mailsender/update.html:29
  86 +msgid "Autentication"
  87 +msgstr "Autenticação"
  88 +
  89 +#: mailsender/templates/mailsender/update.html:60
  90 +msgid "Save"
  91 +msgstr "Salvar"
  92 +
  93 +#: mailsender/views.py:27
  94 +msgid "Mail Sender configuration updated successfully!"
  95 +msgstr "Configurações de remetente de email atualizadas com sucesso!"
  96 +
  97 +#: mailsender/views.py:34
  98 +msgid "Mail Sender"
  99 +msgstr "Remetente de Email"
mailsender/templates/mailsender/update.html
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 6
7 {% block breadcrumbs %} 7 {% block breadcrumbs %}
8 {{ block.super }} 8 {{ block.super }}
9 - {% breadcrumb 'Settings: Mail Sender' 'mailsender:update' %} 9 + {% trans 'Settings: Mail Sender' as bread %}
  10 + {% breadcrumb bread 'mailsender:update' %}
10 {% endblock %} 11 {% endblock %}
11 12
12 {% block content %} 13 {% block content %}
security/locale/pt_BR/LC_MESSAGES/django.po 0 → 100644
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
  1 +# SOME DESCRIPTIVE TITLE.
  2 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
  3 +# This file is distributed under the same license as the PACKAGE package.
  4 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  5 +#
  6 +#, fuzzy
  7 +msgid ""
  8 +msgstr ""
  9 +"Project-Id-Version: PACKAGE VERSION\n"
  10 +"Report-Msgid-Bugs-To: \n"
  11 +"POT-Creation-Date: 2017-01-18 15:42-0300\n"
  12 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  13 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  14 +"Language-Team: LANGUAGE <LL@li.org>\n"
  15 +"Language: \n"
  16 +"MIME-Version: 1.0\n"
  17 +"Content-Type: text/plain; charset=UTF-8\n"
  18 +"Content-Transfer-Encoding: 8bit\n"
  19 +"Plural-Forms: nplurals=2; plural=(n > 1);\n"
  20 +
  21 +#: security/models.py:5
  22 +msgid "Don't allow users to self-register"
  23 +msgstr "Não permiter usuários a se auto-cadastrem"
  24 +
  25 +#: security/models.py:6
  26 +msgid "Put system in maintenance mode"
  27 +msgstr "Colocar sistema em modo de manutenção"
  28 +
  29 +#: security/models.py:9
  30 +msgid "Security configuration"
  31 +msgstr "Configuração de Securação"
  32 +
  33 +#: security/models.py:10
  34 +msgid "Security configurations"
  35 +msgstr "Configurações de Segurança"
  36 +
  37 +#: security/templates/security/update.html:9
  38 +msgid "Settings: Security"
  39 +msgstr "Configurações: Segurança"
  40 +
  41 +#: security/templates/security/update.html:43
  42 +msgid "Save"
  43 +msgstr "Salvar"
  44 +
  45 +#: security/views.py:27
  46 +msgid "Security settings updated successfully!"
  47 +msgstr "Configurações de segurança atualizadas com sucesso!"
  48 +
  49 +#: security/views.py:34
  50 +msgid "Security"
  51 +msgstr "Segurança"
security/templates/security/update.html
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 6
7 {% block breadcrumbs %} 7 {% block breadcrumbs %}
8 {{ block.super }} 8 {{ block.super }}
9 - {% breadcrumb 'Settings: Security' 'security:update' %} 9 + {% trans 'Settings: Security' as bread %}
  10 + {% breadcrumb bread 'security:update' %}
10 {% endblock %} 11 {% endblock %}
11 12
12 {% block content %} 13 {% block content %}
subjects/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2016-12-29 18:14-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:42-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,46 +18,266 @@ msgstr &quot;&quot; @@ -18,46 +18,266 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: subjects/models.py:12 subjects/models.py:18 21 +#: subjects/forms.py:14
  22 +msgid "Tags"
  23 +msgstr "Tags"
  24 +
  25 +#: subjects/forms.py:78 subjects/forms.py:87 subjects/forms.py:95
  26 +#: subjects/forms.py:103
  27 +msgid "this date must be today or after"
  28 +msgstr "Essa data deve ser hoje ou depois disso"
  29 +
  30 +#: subjects/models.py:14 subjects/models.py:20
22 msgid "Name" 31 msgid "Name"
23 -msgstr "" 32 +msgstr "Nome"
24 33
25 -#: subjects/models.py:19 34 +#: subjects/models.py:21
26 msgid "Slug" 35 msgid "Slug"
27 -msgstr "" 36 +msgstr "Slug"
28 37
29 -#: subjects/models.py:21 38 +#: subjects/models.py:23
30 msgid "simpler_description" 39 msgid "simpler_description"
31 -msgstr "" 40 +msgstr "Descrição simples"
32 41
33 -#: subjects/models.py:22 42 +#: subjects/models.py:24
34 msgid "description" 43 msgid "description"
35 -msgstr "" 44 +msgstr "Descrição"
36 45
37 -#: subjects/models.py:23 46 +#: subjects/models.py:25
38 msgid "visible" 47 msgid "visible"
39 -msgstr "" 48 +msgstr "Visível"
40 49
41 -#: subjects/models.py:25 50 +#: subjects/models.py:27
42 msgid "Begin of Subject Date" 51 msgid "Begin of Subject Date"
43 -msgstr "" 52 +msgstr "Data de início"
44 53
45 -#: subjects/models.py:26 54 +#: subjects/models.py:28
46 msgid "End of Subject Date" 55 msgid "End of Subject Date"
47 -msgstr "" 56 +msgstr "Data de encerramento"
48 57
49 -#: subjects/models.py:30 58 +#: subjects/models.py:32
50 msgid "Creation Date" 59 msgid "Creation Date"
51 -msgstr "" 60 +msgstr "Data de criação"
52 61
53 -#: subjects/models.py:31 62 +#: subjects/models.py:33
54 msgid "Date of last update" 63 msgid "Date of last update"
55 -msgstr "" 64 +msgstr "Última Atualização"
  65 +
  66 +#: subjects/models.py:35
  67 +msgid "Begin Subscribe"
  68 +msgstr "Início de inscrição"
56 69
57 -#: subjects/models.py:34 70 +#: subjects/models.py:36
  71 +msgid "End Subscribe"
  72 +msgstr "Encerramento de inscrição"
  73 +
  74 +#: subjects/models.py:39
58 msgid "Students" 75 msgid "Students"
59 -msgstr "" 76 +msgstr "Estudantes"
60 77
61 -#: subjects/models.py:38 78 +#: subjects/models.py:43
62 msgid "Maximum upload size" 79 msgid "Maximum upload size"
  80 +msgstr "Tamanho máximo de upload"
  81 +
  82 +#: subjects/templates/subjects/_form.html:21
  83 +msgid "Attribute students to subject"
  84 +msgstr "Atribuir estudantes ao assunto"
  85 +
  86 +#: subjects/templates/subjects/_form.html:41
  87 +msgid "Attribute professors to subject"
  88 +msgstr "Atribuir professores ao assunto"
  89 +
  90 +#: subjects/templates/subjects/_form.html:87
  91 +msgid "Save"
  92 +msgstr "Salvar"
  93 +
  94 +#: subjects/templates/subjects/create.html:23
  95 +msgid "Replicate: "
  96 +msgstr "Replicar: "
  97 +
  98 +#: subjects/templates/subjects/delete.html:10
  99 +#: subjects/templates/subjects/subscribe.html:10
  100 +msgid "Delete Subject"
  101 +msgstr "Deletar Assunto"
  102 +
  103 +#: subjects/templates/subjects/delete.html:17
  104 +msgid "Are you sure you want to delete the subject"
  105 +msgstr "Tem certeza que deseja deletar o assunto"
  106 +
  107 +#: subjects/templates/subjects/delete.html:23
  108 +msgid "Close"
  109 +msgstr "Fechar"
  110 +
  111 +#: subjects/templates/subjects/delete.html:24
  112 +msgid "Delete"
  113 +msgstr "Deletar"
  114 +
  115 +#: subjects/templates/subjects/initial.html:17
  116 +msgid "Palavras-chave mais populares"
  117 +msgstr "Palavras-chave mais populares"
  118 +
  119 +#: subjects/templates/subjects/initial.html:29
  120 +msgid "Meus Assuntos"
  121 +msgstr "Meus Assuntos"
  122 +
  123 +#: subjects/templates/subjects/initial.html:42
  124 +#: subjects/templates/subjects/list.html:186
  125 +msgid "You still do not posses any subject in our platform"
  126 +msgstr "Você ainda não possui assuntos em nossa plataforma"
  127 +
  128 +#: subjects/templates/subjects/list.html:36
  129 +#: subjects/templates/subjects/list.html:39
  130 +msgid "My subjects"
  131 +msgstr "Meus assuntos"
  132 +
  133 +#: subjects/templates/subjects/list.html:37
  134 +#: subjects/templates/subjects/list.html:40
  135 +msgid "All subjects"
  136 +msgstr "Todos os assuntos"
  137 +
  138 +#: subjects/templates/subjects/list.html:75
  139 +#: subjects/templates/subjects/list.html:141
  140 +#: subjects/templates/subjects/subject_card.html:19
  141 +#: subjects/templates/subjects/subject_card.html:82
  142 +#: subjects/templates/subjects/view.html:49
  143 +msgid "Replicate"
  144 +msgstr "Replicar"
  145 +
  146 +#: subjects/templates/subjects/list.html:77
  147 +#: subjects/templates/subjects/list.html:143
  148 +#: subjects/templates/subjects/subject_card.html:20
  149 +#: subjects/templates/subjects/subject_card.html:83
  150 +#: subjects/templates/subjects/view.html:50
  151 +msgid "Edit"
  152 +msgstr "Editar"
  153 +
  154 +#: subjects/templates/subjects/list.html:79
  155 +#: subjects/templates/subjects/list.html:144
  156 +#: subjects/templates/subjects/subject_card.html:21
  157 +#: subjects/templates/subjects/subject_card.html:84
  158 +#: subjects/templates/subjects/view.html:51
  159 +msgid "Remove"
  160 +msgstr "Remover"
  161 +
  162 +#: subjects/templates/subjects/list.html:94
  163 +#: subjects/templates/subjects/list.html:159
  164 +msgid "Coordinator(s) "
  165 +msgstr "Coordenador(es) "
  166 +
  167 +#: subjects/templates/subjects/list.html:98
  168 +#: subjects/templates/subjects/list.html:163
  169 +msgid "It doesn't possess coordinators"
  170 +msgstr "Não possui coordenadores"
  171 +
  172 +#: subjects/templates/subjects/list.html:104
  173 +#: subjects/templates/subjects/list.html:169
  174 +msgid "Create new subject"
  175 +msgstr "Criar novo assunto"
  176 +
  177 +#: subjects/templates/subjects/subject_card.html:36
  178 +#: subjects/templates/subjects/subject_card.html:99
  179 +#: subjects/templates/subjects/view.html:66
  180 +msgid "Professor(s) "
  181 +msgstr "Professor(es) "
  182 +
  183 +#: subjects/templates/subjects/subject_card.html:40
  184 +#: subjects/templates/subjects/subject_card.html:103
  185 +#: subjects/templates/subjects/view.html:70
  186 +msgid "It doesn't possess professors"
  187 +msgstr "Não possui professores"
  188 +
  189 +#: subjects/templates/subjects/subject_card.html:44
  190 +#: subjects/templates/subjects/subject_card.html:107
  191 +#: subjects/templates/subjects/view.html:74
  192 +msgid "Beginning"
  193 +msgstr "Início"
  194 +
  195 +#: subjects/templates/subjects/subject_card.html:47
  196 +#: subjects/templates/subjects/subject_card.html:110
  197 +#: subjects/templates/subjects/view.html:77
  198 +msgid "End"
  199 +msgstr "Fim"
  200 +
  201 +#: subjects/templates/subjects/subject_card.html:57
  202 +#: subjects/templates/subjects/subject_card.html:118
  203 +msgid "Access Subject"
  204 +msgstr "Acessar Assunto"
  205 +
  206 +#: subjects/templates/subjects/subject_card.html:59
  207 +#: subjects/templates/subjects/subject_card.html:120
  208 +msgid "Subscribe to Subject"
  209 +msgstr "Inscrever-se no Assunto"
  210 +
  211 +#: subjects/templates/subjects/subscribe.html:17
  212 +msgid "Are you sure you want to subscribe to the subject"
  213 +msgstr "Tem certeza que deseja se inscrever no assunto"
  214 +
  215 +#: subjects/templates/subjects/subscribe.html:23
  216 +msgid "Cancel"
  217 +msgstr "Cancelar"
  218 +
  219 +#: subjects/templates/subjects/subscribe.html:24
  220 +msgid "Ok"
  221 +msgstr "Ok"
  222 +
  223 +#: subjects/templates/subjects/update.html:20
  224 +msgid "Update: "
  225 +msgstr "Editar: "
  226 +
  227 +#: subjects/templates/subjects/view.html:84
  228 +msgid "Create new topic"
  229 +msgstr "Criar novo tópico"
  230 +
  231 +#: subjects/views.py:52
  232 +msgid "Home"
  233 +msgstr "Início"
  234 +
  235 +#: subjects/views.py:115
  236 +msgid "My Subjects"
  237 +msgstr "Meus assuntos"
  238 +
  239 +#: subjects/views.py:122
  240 +msgid "All Subjects"
  241 +msgstr "Todos os assuntos"
  242 +
  243 +#: subjects/views.py:161
  244 +msgid "Create Subject"
  245 +msgstr "Criar Assunto"
  246 +
  247 +#: subjects/views.py:167
  248 +msgid "Replicate Subject"
  249 +msgstr "Replicar Assunto"
  250 +
  251 +#: subjects/views.py:195
  252 +#, python-format
  253 +msgid "Subject \"%s\" was registered on \"%s\" successfully!"
  254 +msgstr "Assunto \"%s\" foi registrado em \"%s\" com sucesso!"
  255 +
  256 +#: subjects/views.py:208
  257 +msgid "Update Subject"
  258 +msgstr "Atualizar Assunto"
  259 +
  260 +#: subjects/views.py:219
  261 +#, python-format
  262 +msgid "Subject \"%s\" was updated on \"%s\" successfully!"
  263 +msgstr "Assunto \"%s\" foi atualizado em \"%s\" com sucesso!"
  264 +
  265 +#: subjects/views.py:236
  266 +msgid ""
  267 +"Subject can't be removed. The subject still possess students and learning "
  268 +"objects associated"
63 msgstr "" 269 msgstr ""
  270 +"Assunto não pode ser removido. Ele ainda possui alunos e objetos de "
  271 +"aprendizado associados"
  272 +
  273 +#: subjects/views.py:256
  274 +msgid "Subject removed successfully!"
  275 +msgstr "Assunto removido com sucesso!"
  276 +
  277 +#: subjects/views.py:289
  278 +msgid "Subscription date is due!"
  279 +msgstr "O período de inscrição está encerrado!"
  280 +
  281 +#: subjects/views.py:293
  282 +msgid "Subscription was successfull!"
  283 +msgstr "Inscrição feita com sucesso!"
subjects/templates/subjects/create.html
@@ -13,17 +13,28 @@ @@ -13,17 +13,28 @@
13 {% endblock %} 13 {% endblock %}
14 14
15 {% block breadcrumbs %} 15 {% block breadcrumbs %}
16 - {% clear_breadcrumbs %}  
17 - {% breadcrumb 'Home' 'subjects:home' %} 16 + {% clear_breadcrumbs %}
  17 + {% breadcrumb 'Home' 'subjects:home' %}
18 18
19 - {% breadcrumb slug 'subjects:index' %}  
20 - {% breadcrumb 'Create Subject' 'subjects:create' %} 19 + {% if subject %}
  20 + {% breadcrumb subject.category 'subjects:index' %}
  21 + {% breadcrumb subject 'subjects:view' subject.slug %}
  22 +
  23 + {% trans 'Replicate: ' as bread %}
  24 +
  25 + {% with bread|add:subject.name as bread_slug %}
  26 + {% breadcrumb bread_slug 'subjects:create' %}
  27 + {% endwith %}
  28 + {% else %}
  29 + {% breadcrumb slug 'subjects:index' %}
  30 + {% breadcrumb 'Create Subject' 'subjects:create' %}
  31 + {% endif %}
21 {% endblock %} 32 {% endblock %}
22 33
23 {% block content %} 34 {% block content %}
24 <div class="card card-content"> 35 <div class="card card-content">
25 <div class="card-body"> 36 <div class="card-body">
26 - {% include 'subjects/_form.html' %} 37 + {% include 'subjects/_form.html' %}
27 </div> 38 </div>
28 </div> 39 </div>
29 <br clear="all" /> 40 <br clear="all" />
subjects/templates/subjects/update.html
@@ -15,9 +15,10 @@ @@ -15,9 +15,10 @@
15 15
16 {% block breadcrumbs %} 16 {% block breadcrumbs %}
17 {{ block.super }} 17 {{ block.super }}
  18 +
18 {% breadcrumb subject.category 'subjects:index' %} 19 {% breadcrumb subject.category 'subjects:index' %}
19 {% breadcrumb subject 'subjects:view' subject.slug %} 20 {% breadcrumb subject 'subjects:view' subject.slug %}
20 - {% with 'Edit '|add:object.slug as bread_slug %} 21 + {% with 'Edit '|add:object.slug as bread_slug %}
21 {% breadcrumb bread_slug 'subjects:update' %} 22 {% breadcrumb bread_slug 'subjects:update' %}
22 {% endwith %} 23 {% endwith %}
23 {% endblock %} 24 {% endblock %}
subjects/views.py
@@ -159,12 +159,21 @@ class SubjectCreateView(LoginRequiredMixin, CreateView): @@ -159,12 +159,21 @@ class SubjectCreateView(LoginRequiredMixin, CreateView):
159 def get_context_data(self, **kwargs): 159 def get_context_data(self, **kwargs):
160 context = super(SubjectCreateView, self).get_context_data(**kwargs) 160 context = super(SubjectCreateView, self).get_context_data(**kwargs)
161 context['title'] = _('Create Subject') 161 context['title'] = _('Create Subject')
  162 +
162 if self.kwargs.get('slug'): 163 if self.kwargs.get('slug'):
163 context['slug'] = self.kwargs['slug'] 164 context['slug'] = self.kwargs['slug']
  165 +
164 if self.kwargs.get('subject_slug'): 166 if self.kwargs.get('subject_slug'):
  167 + context['title'] = _('Replicate Subject')
  168 +
165 subject = get_object_or_404(Subject, slug = self.kwargs['subject_slug']) 169 subject = get_object_or_404(Subject, slug = self.kwargs['subject_slug'])
  170 +
166 context['slug'] = subject.category.slug 171 context['slug'] = subject.category.slug
167 context['replicate'] = True 172 context['replicate'] = True
  173 +
  174 + context['subject'] = subject
  175 +
  176 +
168 context['subjects_menu_active'] = 'subjects_menu_active' 177 context['subjects_menu_active'] = 'subjects_menu_active'
169 178
170 return context 179 return context
themes/locale/pt_BR/LC_MESSAGES/django.po 0 → 100644
@@ -0,0 +1,116 @@ @@ -0,0 +1,116 @@
  1 +# SOME DESCRIPTIVE TITLE.
  2 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
  3 +# This file is distributed under the same license as the PACKAGE package.
  4 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  5 +#
  6 +#, fuzzy
  7 +msgid ""
  8 +msgstr ""
  9 +"Project-Id-Version: PACKAGE VERSION\n"
  10 +"Report-Msgid-Bugs-To: \n"
  11 +"POT-Creation-Date: 2017-01-18 15:42-0300\n"
  12 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  13 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  14 +"Language-Team: LANGUAGE <LL@li.org>\n"
  15 +"Language: \n"
  16 +"MIME-Version: 1.0\n"
  17 +"Content-Type: text/plain; charset=UTF-8\n"
  18 +"Content-Transfer-Encoding: 8bit\n"
  19 +"Plural-Forms: nplurals=2; plural=(n > 1);\n"
  20 +
  21 +#: themes/forms.py:15 themes/forms.py:27 themes/forms.py:39
  22 +msgid "The image is too large. It should have less than 2MB."
  23 +msgstr "A imagem é muito grande. Ela deve ter menos de 2MB."
  24 +
  25 +#: themes/models.py:10
  26 +msgid "File not supported."
  27 +msgstr "Arquivo não suportado."
  28 +
  29 +#: themes/models.py:13
  30 +msgid "Title"
  31 +msgstr "Título"
  32 +
  33 +#: themes/models.py:14
  34 +msgid "Favicon"
  35 +msgstr "Favicon"
  36 +
  37 +#: themes/models.py:15
  38 +msgid "Small Logo"
  39 +msgstr "Logo Pequena"
  40 +
  41 +#: themes/models.py:16
  42 +msgid "Large Logo"
  43 +msgstr "Logo Grande"
  44 +
  45 +#: themes/models.py:17
  46 +msgid "Footer Note"
  47 +msgstr "Nota de Rodapé"
  48 +
  49 +#: themes/models.py:18
  50 +msgid "Css Style"
  51 +msgstr "Estilo CSS"
  52 +
  53 +#: themes/models.py:18
  54 +msgid "Green"
  55 +msgstr "Verde"
  56 +
  57 +#: themes/models.py:18
  58 +msgid "Red"
  59 +msgstr "Vermelho"
  60 +
  61 +#: themes/models.py:18
  62 +msgid "Black"
  63 +msgstr "Preto"
  64 +
  65 +#: themes/models.py:21
  66 +msgid "Theme"
  67 +msgstr "Tema"
  68 +
  69 +#: themes/models.py:22 themes/views.py:21
  70 +msgid "Themes"
  71 +msgstr "Temas"
  72 +
  73 +#: themes/templates/themes/basic_update.html:16
  74 +#: themes/templates/themes/css_update.html:16
  75 +#: themes/templates/themes/index.html:17 themes/views.py:48
  76 +msgid "Basic Elements"
  77 +msgstr "Elementos Básicos"
  78 +
  79 +#: themes/templates/themes/basic_update.html:32
  80 +msgid "Choose your photo..."
  81 +msgstr "Escolha a sua foto..."
  82 +
  83 +#: themes/templates/themes/basic_update.html:40
  84 +msgid "Click or drop files here"
  85 +msgstr "Clique ou solte os arquivos aqui"
  86 +
  87 +#: themes/templates/themes/basic_update.html:42
  88 +msgid "Recommended dimensions"
  89 +msgstr "Dimensões recomendads"
  90 +
  91 +#: themes/templates/themes/basic_update.html:46
  92 +msgid "It is recommended to be a white image"
  93 +msgstr "É recomendável ser uma imagem branca"
  94 +
  95 +#: themes/templates/themes/basic_update.html:89
  96 +#: themes/templates/themes/css_update.html:69
  97 +msgid "Save"
  98 +msgstr "Salvar"
  99 +
  100 +#: themes/templates/themes/basic_update.html:94
  101 +#: themes/templates/themes/css_update.html:17
  102 +#: themes/templates/themes/index.html:18 themes/views.py:76
  103 +msgid "CSS Selector"
  104 +msgstr "Seletor CSS"
  105 +
  106 +#: themes/templates/themes/css_update.html:45
  107 +msgid "Documentation"
  108 +msgstr "Documentação"
  109 +
  110 +#: themes/templates/themes/index.html:9
  111 +msgid "Settings: Themes"
  112 +msgstr "Configurações: Temas"
  113 +
  114 +#: themes/views.py:41 themes/views.py:69
  115 +msgid "Theme settings updated successfully!"
  116 +msgstr "Configurações de tema atualizadas com sucesso!"
themes/templates/themes/index.html
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 6
7 {% block breadcrumbs %} 7 {% block breadcrumbs %}
8 {{ block.super }} 8 {{ block.super }}
9 - {% breadcrumb 'Settings: Themes' 'themes:manage' %} 9 + {% trans 'Settings: Themes' as bread %}
  10 + {% breadcrumb bread 'themes:manage' %}
10 {% endblock %} 11 {% endblock %}
11 12
12 {% block content %} 13 {% block content %}
topics/locale/pt_BR/LC_MESSAGES/django.po 0 → 100644
@@ -0,0 +1,126 @@ @@ -0,0 +1,126 @@
  1 +# SOME DESCRIPTIVE TITLE.
  2 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
  3 +# This file is distributed under the same license as the PACKAGE package.
  4 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  5 +#
  6 +#, fuzzy
  7 +msgid ""
  8 +msgstr ""
  9 +"Project-Id-Version: PACKAGE VERSION\n"
  10 +"Report-Msgid-Bugs-To: \n"
  11 +"POT-Creation-Date: 2017-01-18 15:42-0300\n"
  12 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  13 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  14 +"Language-Team: LANGUAGE <LL@li.org>\n"
  15 +"Language: \n"
  16 +"MIME-Version: 1.0\n"
  17 +"Content-Type: text/plain; charset=UTF-8\n"
  18 +"Content-Transfer-Encoding: 8bit\n"
  19 +"Plural-Forms: nplurals=2; plural=(n > 1);\n"
  20 +
  21 +#: topics/forms.py:28
  22 +msgid "This subject already has a repository"
  23 +msgstr "Esse assunto já possui um repositório"
  24 +
  25 +#: topics/forms.py:30
  26 +msgid "This subject already has a topic with this name"
  27 +msgstr "Esse assunto já possui um tópico com esse nome"
  28 +
  29 +#: topics/models.py:8
  30 +msgid "Name"
  31 +msgstr "Nome"
  32 +
  33 +#: topics/models.py:9
  34 +msgid "Slug"
  35 +msgstr "Slug"
  36 +
  37 +#: topics/models.py:10
  38 +msgid "Description"
  39 +msgstr "Descrição"
  40 +
  41 +#: topics/models.py:11
  42 +msgid "Repository"
  43 +msgstr "Repositório"
  44 +
  45 +#: topics/models.py:12
  46 +msgid "Visible"
  47 +msgstr "Visível"
  48 +
  49 +#: topics/models.py:13
  50 +msgid "Subject"
  51 +msgstr "Assunto"
  52 +
  53 +#: topics/models.py:14
  54 +msgid "Order"
  55 +msgstr "Ordem"
  56 +
  57 +#: topics/models.py:15
  58 +msgid "Create Date"
  59 +msgstr "Data de criação"
  60 +
  61 +#: topics/models.py:16
  62 +msgid "Last Update"
  63 +msgstr "Última Atualização"
  64 +
  65 +#: topics/models.py:19
  66 +msgid "Topic"
  67 +msgstr "Tópico"
  68 +
  69 +#: topics/models.py:20
  70 +msgid "Topics"
  71 +msgstr "Tópicos"
  72 +
  73 +#: topics/templates/topics/_form.html:21
  74 +msgid "Only one topic per subject can be a repository"
  75 +msgstr "Apenas um tópico por asssunto pode ser um repositório"
  76 +
  77 +#: topics/templates/topics/_form.html:52
  78 +msgid "Save"
  79 +msgstr "Salvar"
  80 +
  81 +#: topics/templates/topics/create.html:7 topics/views.py:59
  82 +msgid "Create Topic"
  83 +msgstr "Criar Tópico"
  84 +
  85 +#: topics/templates/topics/delete.html:9
  86 +msgid "Are you sure you want delete the topic"
  87 +msgstr "Tem certeza que deseja deletar o tópico"
  88 +
  89 +#: topics/templates/topics/delete.html:10
  90 +msgid "All data will be lost and havent how recover it."
  91 +msgstr "Todas as informações serão perdidas e não poderão ser recuperadas."
  92 +
  93 +#: topics/templates/topics/delete.html:15
  94 +msgid "Close"
  95 +msgstr "Fechar"
  96 +
  97 +#: topics/templates/topics/delete.html:18
  98 +msgid "Delete"
  99 +msgstr "Deletar"
  100 +
  101 +#: topics/templates/topics/list.html:28
  102 +msgid "Edit"
  103 +msgstr "Editar"
  104 +
  105 +#: topics/templates/topics/list.html:29
  106 +msgid "Remove"
  107 +msgstr "Remover"
  108 +
  109 +#: topics/templates/topics/update.html:7 topics/views.py:103
  110 +msgid "Update Topic"
  111 +msgstr "Atualizar Tópico"
  112 +
  113 +#: topics/views.py:69
  114 +#, python-format
  115 +msgid "Topic \"%s\" was created on virtual enviroment \"%s\" successfully!"
  116 +msgstr "Tópico \"%s\" foi criado no ambiente virtual \"%s\" com sucesso!"
  117 +
  118 +#: topics/views.py:113
  119 +#, python-format
  120 +msgid "Topic \"%s\" was updated on virtual enviroment \"%s\" successfully!"
  121 +msgstr "Tópico \"%s\" foi atualizado no ambiente virtual \"%s\" com sucesso!"
  122 +
  123 +#: topics/views.py:135
  124 +#, python-format
  125 +msgid "Topic \"%s\" was removed from virtual enviroment \"%s\" successfully!"
  126 +msgstr "Tópico \"%s\" foi removido do ambiente virtual \"%s\" com sucesso!"
topics/templates/topics/_form.html
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 {% endfor %} 49 {% endfor %}
50 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12"> 50 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
51 <div class="text-center"> 51 <div class="text-center">
52 - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" /> 52 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
53 </div> 53 </div>
54 </div> 54 </div>
55 </form> 55 </form>
topics/templates/topics/create.html
@@ -4,7 +4,8 @@ @@ -4,7 +4,8 @@
4 4
5 {% block breadcrumbs %} 5 {% block breadcrumbs %}
6 {{ block.super }} 6 {{ block.super }}
7 - {% breadcrumb 'Create Topic' 'topics:create' subject.slug %} 7 + {% trans 'Create Topic' as bread %}
  8 + {% breadcrumb bread 'topics:create' subject.slug %}
8 {% endblock %} 9 {% endblock %}
9 10
10 {% block content %} 11 {% block content %}
topics/templates/topics/update.html
@@ -4,7 +4,8 @@ @@ -4,7 +4,8 @@
4 4
5 {% block breadcrumbs %} 5 {% block breadcrumbs %}
6 {{ block.super }} 6 {{ block.super }}
7 - {% breadcrumb 'Update Topic' 'topics:update' subject.slug topic.slug %} 7 + {% trans 'Update Topic' as bread %}
  8 + {% breadcrumb bread 'topics:update' subject.slug topic.slug %}
8 {% endblock %} 9 {% endblock %}
9 10
10 {% block content %} 11 {% block content %}
users/forms.py
@@ -46,8 +46,8 @@ class Validation(forms.ModelForm): @@ -46,8 +46,8 @@ class Validation(forms.ModelForm):
46 return password2 46 return password2
47 47
48 class RegisterUserForm(Validation): 48 class RegisterUserForm(Validation):
49 - new_password = forms.CharField(label=_('Password'), widget = forms.PasswordInput(render_value=True))  
50 - password2 = forms.CharField(label = _('Confirm Password'), widget = forms.PasswordInput(render_value=True)) 49 + new_password = forms.CharField(label=_('Password'), widget = forms.PasswordInput(render_value = True, attrs = {'placeholder': _('Password') + ' *'}))
  50 + password2 = forms.CharField(label = _('Confirm Password'), widget = forms.PasswordInput(render_value = True, attrs = {'placeholder': _('Confirm Password') + ' *'}))
51 51
52 is_edit = False 52 is_edit = False
53 53
@@ -63,6 +63,12 @@ class RegisterUserForm(Validation): @@ -63,6 +63,12 @@ class RegisterUserForm(Validation):
63 class Meta: 63 class Meta:
64 model = User 64 model = User
65 fields = ['email', 'username', 'last_name', 'social_name', 'image', 'show_email', ] 65 fields = ['email', 'username', 'last_name', 'social_name', 'image', 'show_email', ]
  66 + widgets = {
  67 + 'email': forms.TextInput(attrs = {'placeholder': _('Email') + ' *'}),
  68 + 'username': forms.TextInput(attrs = {'placeholder': _('Name') + ' *'}),
  69 + 'last_name': forms.TextInput(attrs = {'placeholder': _('Last Name') + ' *'}),
  70 + 'social_name': forms.TextInput(attrs = {'placeholder': _('Social Name')}),
  71 + }
66 72
67 class ProfileForm(Validation): 73 class ProfileForm(Validation):
68 is_edit = True 74 is_edit = True
@@ -157,7 +163,7 @@ class ChangePassForm(Validation): @@ -157,7 +163,7 @@ class ChangePassForm(Validation):
157 } 163 }
158 164
159 class PassResetRequest(forms.Form): 165 class PassResetRequest(forms.Form):
160 - email = forms.CharField(label = _('Email'), max_length = 254) 166 + email = forms.EmailField(label = _('Email'), max_length = 254, widget = forms.TextInput(attrs = {'placeholder': _('Email') + ' *'}))
161 167
162 def clean_email(self): 168 def clean_email(self):
163 email = self.cleaned_data.get('email', '') 169 email = self.cleaned_data.get('email', '')
users/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2016-12-29 18:14-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:42-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,38 +26,49 @@ msgstr &quot;Você deve inserir um endereço de email&quot; @@ -26,38 +26,49 @@ msgstr &quot;Você deve inserir um endereço de email&quot;
26 msgid "The image is too large. It should have less than 2MB." 26 msgid "The image is too large. It should have less than 2MB."
27 msgstr "A imagem é muito grande. Ela deve conter menos de 2MB." 27 msgstr "A imagem é muito grande. Ela deve conter menos de 2MB."
28 28
29 -#: users/forms.py:66 29 +#: users/forms.py:42
30 msgid "The confirmation password is incorrect." 30 msgid "The confirmation password is incorrect."
31 msgstr "A confirmação de senha está incorreta." 31 msgstr "A confirmação de senha está incorreta."
32 32
33 -#: users/forms.py:73 users/forms.py:125 users/templates/users/login.html:53  
34 -#: users/templates/users/login.html:54 33 +#: users/forms.py:49 users/forms.py:102 users/templates/users/login.html:51
35 msgid "Password" 34 msgid "Password"
36 msgstr "Senha" 35 msgstr "Senha"
37 36
38 -#: users/forms.py:74 users/forms.py:126 users/forms.py:155 users/forms.py:206 37 +#: users/forms.py:50 users/forms.py:103 users/forms.py:132 users/forms.py:183
39 msgid "Confirm Password" 38 msgid "Confirm Password"
40 msgstr "Confirmação de Senha" 39 msgstr "Confirmação de Senha"
41 40
42 -#: users/forms.py:154 users/forms.py:205 41 +#: users/forms.py:67 users/forms.py:166 users/templates/users/list.html:56
  42 +#: users/templates/users/login.html:46 users/templates/users/search.html:47
  43 +msgid "Email"
  44 +msgstr "Email"
  45 +
  46 +#: users/forms.py:68 users/models.py:26 users/templates/users/list.html:55
  47 +#: users/templates/users/search.html:46
  48 +msgid "Name"
  49 +msgstr "Nome"
  50 +
  51 +#: users/forms.py:69 users/models.py:27
  52 +msgid "Last Name"
  53 +msgstr "Sobrenome"
  54 +
  55 +#: users/forms.py:70 users/models.py:28
  56 +msgid "Social Name"
  57 +msgstr "Nome Social"
  58 +
  59 +#: users/forms.py:131 users/forms.py:182
43 msgid "New Password" 60 msgid "New Password"
44 msgstr "Nova Senha" 61 msgstr "Nova Senha"
45 62
46 -#: users/forms.py:161 63 +#: users/forms.py:138
47 msgid "The value inputed does not match with your actual password." 64 msgid "The value inputed does not match with your actual password."
48 msgstr "O valor inserido não corresponde à sua senha atual." 65 msgstr "O valor inserido não corresponde à sua senha atual."
49 66
50 -#: users/forms.py:182 67 +#: users/forms.py:159
51 msgid "Actual Password" 68 msgid "Actual Password"
52 msgstr "Senha Atual" 69 msgstr "Senha Atual"
53 70
54 -#: users/forms.py:189 users/templates/users/list.html:56  
55 -#: users/templates/users/login.html:47 users/templates/users/login.html:48  
56 -#: users/templates/users/search.html:47  
57 -msgid "Email"  
58 -msgstr "Email"  
59 -  
60 -#: users/forms.py:198 71 +#: users/forms.py:175
61 msgid "You must insert a valid email address" 72 msgid "You must insert a valid email address"
62 msgstr "Você deve inserir um endereço de email válido" 73 msgstr "Você deve inserir um endereço de email válido"
63 74
@@ -81,19 +92,6 @@ msgstr &quot;&quot; @@ -81,19 +92,6 @@ msgstr &quot;&quot;
81 msgid "Your email address that will be used to access the platform" 92 msgid "Your email address that will be used to access the platform"
82 msgstr "Seu endereço de email que será usado para acessar a plataforma" 93 msgstr "Seu endereço de email que será usado para acessar a plataforma"
83 94
84 -#: users/models.py:26 users/templates/users/list.html:55  
85 -#: users/templates/users/search.html:46  
86 -msgid "Name"  
87 -msgstr "Nome"  
88 -  
89 -#: users/models.py:27  
90 -msgid "Last Name"  
91 -msgstr "Sobrenome"  
92 -  
93 -#: users/models.py:28  
94 -msgid "Social Name"  
95 -msgstr "Nome Social"  
96 -  
97 #: users/models.py:29 users/templates/users/list.html:57 95 #: users/models.py:29 users/templates/users/list.html:57
98 #: users/templates/users/profile.html:60 users/templates/users/search.html:48 96 #: users/templates/users/profile.html:60 users/templates/users/search.html:48
99 msgid "Description" 97 msgid "Description"
@@ -151,19 +149,7 @@ msgstr &quot;Sim&quot; @@ -151,19 +149,7 @@ msgstr &quot;Sim&quot;
151 msgid "Is not an admin" 149 msgid "Is not an admin"
152 msgstr "Não é administrador" 150 msgstr "Não é administrador"
153 151
154 -#: users/models.py:66  
155 -msgid "Is not a coordinator"  
156 -msgstr "Não é coordenador"  
157 -  
158 -#: users/models.py:69  
159 -msgid "Is not a professor"  
160 -msgstr "Não é professor"  
161 -  
162 -#: users/models.py:72  
163 -msgid "Is not a student"  
164 -msgstr "Não é estudante"  
165 -  
166 -#: users/templates/users/_form.html:16 152 +#: users/templates/users/_form.html:16 users/templates/users/register.html:52
167 msgid "Choose your photo..." 153 msgid "Choose your photo..."
168 msgstr "Escolha sua foto..." 154 msgstr "Escolha sua foto..."
169 155
@@ -171,50 +157,56 @@ msgstr &quot;Escolha sua foto...&quot; @@ -171,50 +157,56 @@ msgstr &quot;Escolha sua foto...&quot;
171 msgid "Save" 157 msgid "Save"
172 msgstr "Salvar" 158 msgstr "Salvar"
173 159
174 -#: users/templates/users/_form.html:64 users/templates/users/delete.html:26  
175 -#: users/templates/users/delete_account.html:26 160 +#: users/templates/users/_form.html:64 users/templates/users/delete.html:27
  161 +#: users/templates/users/delete_account.html:27
176 msgid "Cancel" 162 msgid "Cancel"
177 msgstr "Cancelar" 163 msgstr "Cancelar"
178 164
179 -#: users/templates/users/delete.html:18 165 +#: users/templates/users/delete.html:9
  166 +msgid "Delete User"
  167 +msgstr "Deletar Usuário"
  168 +
  169 +#: users/templates/users/delete.html:19
180 msgid "Are you sure you want delete the user" 170 msgid "Are you sure you want delete the user"
181 msgstr "Tem certeza que deseja deletar o usuário" 171 msgstr "Tem certeza que deseja deletar o usuário"
182 172
183 -#: users/templates/users/delete.html:19  
184 -#: users/templates/users/delete_account.html:19 173 +#: users/templates/users/delete.html:20
  174 +#: users/templates/users/delete_account.html:20
185 msgid "All data will be lost and havent how recover it." 175 msgid "All data will be lost and havent how recover it."
186 msgstr "Toda informação será perdida e não poderá ser recuperada" 176 msgstr "Toda informação será perdida e não poderá ser recuperada"
187 177
188 -#: users/templates/users/delete.html:23  
189 -#: users/templates/users/delete_account.html:23 178 +#: users/templates/users/delete.html:24
  179 +#: users/templates/users/delete_account.html:24
190 msgid "Remove" 180 msgid "Remove"
191 msgstr "Deletar" 181 msgstr "Deletar"
192 182
193 -#: users/templates/users/delete_account.html:18 183 +#: users/templates/users/delete_account.html:9
  184 +msgid "Remove Account"
  185 +msgstr "Remover Conta"
  186 +
  187 +#: users/templates/users/delete_account.html:19
194 msgid "Are you sure you want delete your account?" 188 msgid "Are you sure you want delete your account?"
195 -msgstr "Tem certeeza que deseja deletar sua conta?" 189 +msgstr "Tem certeza que deseja deletar sua conta?"
196 190
197 -#: users/templates/users/forgot_password.html:39 users/views.py:306  
198 -#, fuzzy  
199 -#| msgid "Forgot your password?" 191 +#: users/templates/users/forgot_password.html:39 users/views.py:336
200 msgid "Forgot Password" 192 msgid "Forgot Password"
201 -msgstr "Esqueceu sua senha?" 193 +msgstr "Esqueceu Senha"
202 194
203 #: users/templates/users/forgot_password.html:40 195 #: users/templates/users/forgot_password.html:40
204 -#, fuzzy  
205 -#| msgid "Your email address that will be used to access the platform"  
206 msgid "" 196 msgid ""
207 "Enter your email below (the one used to access the platform) to recover your " 197 "Enter your email below (the one used to access the platform) to recover your "
208 "password" 198 "password"
209 -msgstr "Seu endereço de email que será usado para acessar a plataforma" 199 +msgstr ""
  200 +"Digite seu endereço de email abaixo (o utilizado para acessar a plataforma) "
  201 +"para recuperar sua senha"
210 202
211 -#: users/templates/users/forgot_password.html:74 203 +#: users/templates/users/forgot_password.html:72
212 msgid "Recover" 204 msgid "Recover"
213 msgstr "Recuperar" 205 msgstr "Recuperar"
214 206
215 -#: users/templates/users/forgot_password.html:77  
216 -#: users/templates/users/new_password.html:76  
217 -#: users/templates/users/register.html:97 207 +#: users/templates/users/forgot_password.html:75
  208 +#: users/templates/users/new_password.html:80
  209 +#: users/templates/users/register.html:91
218 msgid "Back" 210 msgid "Back"
219 msgstr "Voltar" 211 msgstr "Voltar"
220 212
@@ -243,29 +235,27 @@ msgstr &quot;Deletar&quot; @@ -243,29 +235,27 @@ msgstr &quot;Deletar&quot;
243 msgid "No users found" 235 msgid "No users found"
244 msgstr "Nenhum usuário encontrado" 236 msgstr "Nenhum usuário encontrado"
245 237
246 -#: users/templates/users/login.html:40 238 +#: users/templates/users/login.html:39
247 msgid "Sign in with your account to continue" 239 msgid "Sign in with your account to continue"
248 msgstr "Entre com a sua conta para continuar" 240 msgstr "Entre com a sua conta para continuar"
249 241
250 -#: users/templates/users/login.html:60 242 +#: users/templates/users/login.html:59 users/templates/users/login.html:66
251 msgid "Log in" 243 msgid "Log in"
252 msgstr "Entrar" 244 msgstr "Entrar"
253 245
254 -#: users/templates/users/login.html:63 users/views.py:288 246 +#: users/templates/users/login.html:62 users/views.py:310
255 msgid "Sign Up" 247 msgid "Sign Up"
256 msgstr "Cadastrar" 248 msgstr "Cadastrar"
257 249
258 -#: users/templates/users/login.html:68 250 +#: users/templates/users/login.html:75 users/templates/users/login.html:81
259 msgid "Forgot your password?" 251 msgid "Forgot your password?"
260 msgstr "Esqueceu sua senha?" 252 msgstr "Esqueceu sua senha?"
261 253
262 #: users/templates/users/new_password.html:39 254 #: users/templates/users/new_password.html:39
263 -#, fuzzy  
264 -#| msgid "New Password"  
265 msgid "Set new password" 255 msgid "Set new password"
266 -msgstr "Nova Senha" 256 +msgstr "Digite a nova senha"
267 257
268 -#: users/templates/users/new_password.html:73 258 +#: users/templates/users/new_password.html:77
269 msgid "Reset" 259 msgid "Reset"
270 msgstr "Restaurar" 260 msgstr "Restaurar"
271 261
@@ -285,51 +275,57 @@ msgstr &quot;Professor em&quot; @@ -285,51 +275,57 @@ msgstr &quot;Professor em&quot;
285 msgid "Student in" 275 msgid "Student in"
286 msgstr "Estudante em" 276 msgstr "Estudante em"
287 277
288 -#: users/templates/users/register.html:42 278 +#: users/templates/users/register.html:39
289 msgid "User Register" 279 msgid "User Register"
290 msgstr "Cadastro de Usuário" 280 msgstr "Cadastro de Usuário"
291 281
292 -#: users/templates/users/register.html:62  
293 -msgid "Choose your file..."  
294 -msgstr "Escolha seu arquivo..."  
295 -  
296 -#: users/templates/users/register.html:94 282 +#: users/templates/users/register.html:88
297 msgid "Register" 283 msgid "Register"
298 msgstr "Cadastrar" 284 msgstr "Cadastrar"
299 285
300 -#: users/views.py:44 286 +#: users/templatetags/profile_verifies.py:16
  287 +msgid "Is not a coordinator"
  288 +msgstr "Não é coordenador"
  289 +
  290 +#: users/templatetags/profile_verifies.py:25
  291 +msgid "Is not a professor"
  292 +msgstr "Não é professor"
  293 +
  294 +#: users/templatetags/profile_verifies.py:34
  295 +msgid "Is not a student"
  296 +msgstr "Não é estudante"
  297 +
  298 +#: users/views.py:51
301 msgid "Manage Users" 299 msgid "Manage Users"
302 msgstr "Gerenciar Usuários" 300 msgstr "Gerenciar Usuários"
303 301
304 -#: users/views.py:73  
305 -#, fuzzy  
306 -#| msgid "Create User" 302 +#: users/views.py:81
307 msgid "Search Users" 303 msgid "Search Users"
308 -msgstr "Criar Usuário" 304 +msgstr "Pesquisar Usuário"
309 305
310 -#: users/views.py:90 306 +#: users/views.py:99
311 #, python-format 307 #, python-format
312 msgid "User %s created successfully" 308 msgid "User %s created successfully"
313 msgstr "Usuário %s criado com sucesso" 309 msgstr "Usuário %s criado com sucesso"
314 310
315 -#: users/views.py:98 311 +#: users/views.py:107
316 msgid "Add User" 312 msgid "Add User"
317 msgstr "Cadastrar Usuário" 313 msgstr "Cadastrar Usuário"
318 314
319 -#: users/views.py:126 315 +#: users/views.py:136
320 #, python-format 316 #, python-format
321 msgid "User %s updated successfully" 317 msgid "User %s updated successfully"
322 msgstr "Usuário %s atualizado com sucesso" 318 msgstr "Usuário %s atualizado com sucesso"
323 319
324 -#: users/views.py:134 320 +#: users/views.py:144
325 msgid "Update User" 321 msgid "Update User"
326 msgstr "Atualizar Usuário" 322 msgstr "Atualizar Usuário"
327 323
328 -#: users/views.py:168 324 +#: users/views.py:189
329 msgid "User removed successfully!" 325 msgid "User removed successfully!"
330 msgstr "Usuário removido com sucesso!" 326 msgstr "Usuário removido com sucesso!"
331 327
332 -#: users/views.py:169 328 +#: users/views.py:190
333 msgid "" 329 msgid ""
334 "Could not remove the account. The user is attach to one or more functions " 330 "Could not remove the account. The user is attach to one or more functions "
335 "(administrator, coordinator, professor ou student) in the system." 331 "(administrator, coordinator, professor ou student) in the system."
@@ -337,74 +333,74 @@ msgstr &quot;&quot; @@ -337,74 +333,74 @@ msgstr &quot;&quot;
337 "Não é possível deletar a conta. O usuário está vinculado com uma ou mais " 333 "Não é possível deletar a conta. O usuário está vinculado com uma ou mais "
338 "funções (administrador, coordenador, professor ou estudante) no sistema." 334 "funções (administrador, coordenador, professor ou estudante) no sistema."
339 335
340 -#: users/views.py:184 336 +#: users/views.py:205
341 msgid "Delete Account" 337 msgid "Delete Account"
342 -msgstr "Deletar Conta" 338 +msgstr "Remover Conta"
343 339
344 -#: users/views.py:226 340 +#: users/views.py:248
345 msgid "Password changed successfully!" 341 msgid "Password changed successfully!"
346 msgstr "Senha alterada com sucesso!" 342 msgstr "Senha alterada com sucesso!"
347 343
348 -#: users/views.py:232 344 +#: users/views.py:254
349 msgid "Change Password" 345 msgid "Change Password"
350 msgstr "Alterar Senha" 346 msgstr "Alterar Senha"
351 347
352 -#: users/views.py:250 348 +#: users/views.py:272
353 msgid "Profile" 349 msgid "Profile"
354 msgstr "Perfil" 350 msgstr "Perfil"
355 351
356 -#: users/views.py:269 352 +#: users/views.py:291
357 msgid "Update Profile" 353 msgid "Update Profile"
358 msgstr "Atualizar Perfil" 354 msgstr "Atualizar Perfil"
359 355
360 -#: users/views.py:275 356 +#: users/views.py:297
361 msgid "Profile edited successfully!" 357 msgid "Profile edited successfully!"
362 msgstr "Perfil editado com sucesso!" 358 msgstr "Perfil editado com sucesso!"
363 359
364 -#: users/views.py:295 360 +#: users/views.py:317
365 msgid "User successfully registered!" 361 msgid "User successfully registered!"
366 msgstr "Usuário cadastrado com sucesso!" 362 msgstr "Usuário cadastrado com sucesso!"
367 363
368 -#: users/views.py:325  
369 -#, fuzzy  
370 -#| msgid "New Password" 364 +#: users/views.py:355
371 msgid "Recover Password" 365 msgid "Recover Password"
372 -msgstr "Nova Senha" 366 +msgstr "Recuperar Senha"
373 367
374 -#: users/views.py:344 368 +#: users/views.py:391
375 msgid "" 369 msgid ""
376 "Soon you'll receive an email with instructions to set your new password. If " 370 "Soon you'll receive an email with instructions to set your new password. If "
377 "you don't receive it in 24 hours, please check your spam box." 371 "you don't receive it in 24 hours, please check your spam box."
378 -msgstr "Em breve você receberá um email com instruções para cadastrar sua nova senha. Se você não recebê-lo em 24 hhoras, por favor olhe sua caixa de spam." 372 +msgstr ""
  373 +"Em breve você receberá um email com instruções para cadastrar sua nova "
  374 +"senha. Se você não recebê-lo em 24 hhoras, por favor olhe sua caixa de spam."
379 375
380 -#: users/views.py:349 376 +#: users/views.py:396
381 msgid "No user is associated with this email address" 377 msgid "No user is associated with this email address"
382 msgstr "Nenhum usuário associado com esse endereço de email." 378 msgstr "Nenhum usuário associado com esse endereço de email."
383 379
384 -#: users/views.py:360  
385 -#, fuzzy  
386 -#| msgid "New Password" 380 +#: users/views.py:407
387 msgid "Reset Password" 381 msgid "Reset Password"
388 msgstr "Recuperar Senha" 382 msgstr "Recuperar Senha"
389 383
390 -#: users/views.py:382  
391 -#, fuzzy  
392 -#| msgid "Password changed successfully!" 384 +#: users/views.py:429
393 msgid "Password reset successfully." 385 msgid "Password reset successfully."
394 msgstr "Senha alterada com sucesso!" 386 msgstr "Senha alterada com sucesso!"
395 387
396 -#: users/views.py:386 388 +#: users/views.py:433
397 msgid "We were not able to reset your password." 389 msgid "We were not able to reset your password."
398 msgstr "Não foi possível restaurar sua senha" 390 msgstr "Não foi possível restaurar sua senha"
399 391
400 -#: users/views.py:389 392 +#: users/views.py:436
401 msgid "The reset password link is no longer valid." 393 msgid "The reset password link is no longer valid."
402 msgstr "O link para restaurar senha não está mais válido." 394 msgstr "O link para restaurar senha não está mais válido."
403 395
404 -#: users/views.py:395 396 +#: users/views.py:442
405 msgid "Log In" 397 msgid "Log In"
406 msgstr "Entrar" 398 msgstr "Entrar"
407 399
408 -#: users/views.py:405 400 +#: users/views.py:457
  401 +msgid "System under maintenance. Try again later"
  402 +msgstr "Sistema em manutenção. Tente novamente mais tarde"
  403 +
  404 +#: users/views.py:459
409 msgid "E-mail or password are incorrect." 405 msgid "E-mail or password are incorrect."
410 -msgstr "Email ou senha incorretos."  
411 \ No newline at end of file 406 \ No newline at end of file
  407 +msgstr "Email ou senha incorretos."
users/templates/users/delete.html
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 6
7 {% block breadcrumbs %} 7 {% block breadcrumbs %}
8 {{ block.super }} 8 {{ block.super }}
9 - {% breadcrumb 'Delete User' 'users:delete' %} 9 + {% trans 'Delete User' as bread %}
  10 + {% breadcrumb bread 'users:delete' %}
10 {% endblock %} 11 {% endblock %}
11 12
12 {% block content %} 13 {% block content %}
users/templates/users/delete_account.html
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 6
7 {% block breadcrumbs %} 7 {% block breadcrumbs %}
8 {{ block.super }} 8 {{ block.super }}
9 - {% breadcrumb 'Remove Account' 'users:remove_acc' %} 9 + {% trans 'Remove Account' as bread %}
  10 + {% breadcrumb bread 'users:remove_acc' %}
10 {% endblock %} 11 {% endblock %}
11 12
12 {% block content %} 13 {% block content %}
users/templates/users/forgot_password.html
@@ -46,13 +46,7 @@ @@ -46,13 +46,7 @@
46 {% for field in form %} 46 {% for field in form %}
47 <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1"> 47 <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
48 <div class="form-group{% if form.has_error %} has-error {% endif %}"> 48 <div class="form-group{% if form.has_error %} has-error {% endif %}">
49 - {% if field.field.required %}  
50 - <label for="{{ field.auto_id }}" class="control-label">{{ field.label }} <span>*</span></label>  
51 - {% else %}  
52 - <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}</label>  
53 - {% endif %}  
54 -  
55 - {% render_field field class='form-control' %} 49 + {% render_field field class='form-control' %}
56 50
57 <span id="helpBlock" class="help-block">{{ field.help_text }}</span> 51 <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
58 52
users/templates/users/register.html
@@ -45,17 +45,11 @@ @@ -45,17 +45,11 @@
45 {% for field in form %} 45 {% for field in form %}
46 <div class="col-lg-12 col-md-12 col-sm-12"> 46 <div class="col-lg-12 col-md-12 col-sm-12">
47 <div class="form-group form-group-sm"> 47 <div class="form-group form-group-sm">
48 - {% if field.field.required %}  
49 - <label for="{{ field.auto_id }}" class="col-md-2 col-sm-2 col-xs-3 col-lg-2 control-label">{{ field.label }}<span>*</span></label>  
50 - {% else %}  
51 - <label for="{{ field.auto_id }}" class="col-md-2 col-sm-2 col-xs-3 col-lg-2 control-label">{{ field.label }}</label>  
52 - {% endif %}  
53 -  
54 - <div class="col-md-10 col-sm-10 col-xs-9 col-lg-10"> 48 + <div class="col-md-12 col-sm-12 col-xs-12 col-lg-12">
55 {% if field.auto_id == 'id_image' %} 49 {% if field.auto_id == 'id_image' %}
56 {% render_field field class='form-control' %} 50 {% render_field field class='form-control' %}
57 <div class="input-group"> 51 <div class="input-group">
58 - <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}"> 52 + <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
59 <span class="input-group-btn"> 53 <span class="input-group-btn">
60 <button type="button" class="btn btn-fab btn-fab-mini"> 54 <button type="button" class="btn btn-fab btn-fab-mini">
61 <i class="material-icons">attach_file</i> 55 <i class="material-icons">attach_file</i>
@@ -63,6 +57,10 @@ @@ -63,6 +57,10 @@
63 </span> 57 </span>
64 </div> 58 </div>
65 {% else %} 59 {% else %}
  60 + {% if field.auto_id == 'id_show_email' %}
  61 + <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}</label>
  62 + {% endif %}
  63 +
66 {% render_field field class='form-control' %} 64 {% render_field field class='form-control' %}
67 {% endif %} 65 {% endif %}
68 <span class="help-block">{{ field.help_text }}</span> 66 <span class="help-block">{{ field.help_text }}</span>