From 7e1f3a41a3b636a2ccb5aec80ebc3bc88358c1d7 Mon Sep 17 00:00:00 2001 From: Bruno Martin Date: Thu, 14 Nov 2013 16:58:00 -0200 Subject: [PATCH 1/3] added command to colect messages to rosetta --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index e4bb7e158..1ec1714a0 100644 --- a/Makefile +++ b/Makefile @@ -85,3 +85,6 @@ reset_db: python manage.py reset_db --router=default --noinput -U $(USER) python manage.py syncdb --noinput python manage.py migrate --noinput + +messages: + python manage.py makemessages -a -d django From 29bf31fb4d77ef265da537a1303bea0578b70603 Mon Sep 17 00:00:00 2001 From: Bruno Martin Date: Thu, 14 Nov 2013 16:58:16 -0200 Subject: [PATCH 2/3] change labes in course page --- core/templates/course.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/templates/course.html b/core/templates/course.html index 37bb3d0e3..737ef92ab 100644 --- a/core/templates/course.html +++ b/core/templates/course.html @@ -55,13 +55,13 @@

{{course.name}}

-

{% trans "Course Application" %}

+

{% trans "Why do this course?" %}

{{ course.application|timtec_markdown }}

-

{% trans "Requirements" %}

+

{% trans "What do I have to know?" %}

{{ course.requirement|timtec_markdown }}

From b74ebe45118bcda79f730fb492866d941bb4c82a Mon Sep 17 00:00:00 2001 From: Bruno Martin Date: Thu, 14 Nov 2013 16:58:24 -0200 Subject: [PATCH 3/3] update some tranlations --- locale/pt_BR/LC_MESSAGES/django.po | 382 ++++++++++++++++++----------- 1 file changed, 235 insertions(+), 147 deletions(-) diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index dff16cccb..3f71a592c 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-08 15:03-0200\n" -"PO-Revision-Date: 2013-11-11 14:04-0200\n" -"Last-Translator: sdf df \n" +"POT-Creation-Date: 2013-11-14 16:35-0200\n" +"PO-Revision-Date: 2013-11-14 16:54-0200\n" +"Last-Translator: Primeiro Nome Silva \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,18 +24,23 @@ msgid "email" msgstr "email" #: accounts/forms.py:12 accounts/templates/profile-edit.html:140 -#: core/templates/header-guest.html:32 core/templates/header-guest.html:34 -#: core/templates/header-guest.html:76 +#: core/templates/header-guest.html:39 core/templates/header-guest.html:41 +#: core/templates/header-guest.html:92 #: timtec/templates/account/email_confirmed.html:20 #: timtec/templates/account/email_confirmed.html:22 -#: timtec/templates/account/login.html:24 #: timtec/templates/account/login.html:26 +#: timtec/templates/account/login.html:28 +#: timtec/templates/account/login.html:82 +#: timtec/templates/account/login.html:84 #: timtec/templates/account/login_modal.html:34 #: timtec/templates/account/login_modal.html:36 #: timtec/templates/account/login_modal.html:82 -#: timtec/templates/account/password_reset_from_key_done.html:23 -#: timtec/templates/account/password_reset_from_key_done.html:25 -#: timtec/templates/account/signup.html:34 +#: timtec/templates/account/password_reset_from_key_done.html:24 +#: timtec/templates/account/password_reset_from_key_done.html:26 +#: timtec/templates/account/password_reset_from_key_done.html:68 +#: timtec/templates/account/password_reset_from_key_done.html:70 +#: timtec/templates/account/signup.html:35 +#: timtec/templates/account/signup.html:95 msgid "Password" msgstr "Senha" @@ -60,17 +65,17 @@ msgid "Full Name" msgstr "Nome" #: accounts/templates/profile-edit.html:73 accounts/templates/profile.html:18 -#: core/models.py:39 +#: core/forms.py:10 core/models.py:40 msgid "Occupation" msgstr "Ocupação" #: accounts/templates/profile-edit.html:83 accounts/templates/profile.html:25 -#: core/models.py:40 +#: core/models.py:41 msgid "City" msgstr "Cidade" #: accounts/templates/profile-edit.html:93 accounts/templates/profile.html:32 -#: core/models.py:41 +#: core/models.py:42 msgid "Site" msgstr "Página" @@ -82,241 +87,262 @@ msgstr "Biografia" msgid "Account Settings" msgstr "Configurações da conta" -#: accounts/templates/profile-edit.html:120 core/models.py:24 -#: core/templates/header-guest.html:64 +#: accounts/templates/profile-edit.html:120 core/models.py:25 +#: core/templates/header-guest.html:27 core/templates/header-guest.html:76 +#: timtec/templates/account/login.html:16 +#: timtec/templates/account/login.html:72 #: timtec/templates/account/login_modal.html:70 -#: timtec/templates/account/signup.html:14 -#: timtec/templates/account/signup.html:16 +#: timtec/templates/account/password_reset_from_key_done.html:14 +#: timtec/templates/account/signup.html:15 +#: timtec/templates/account/signup.html:17 +#: timtec/templates/account/signup.html:75 +#: timtec/templates/account/signup.html:77 msgid "Username" msgstr "Nome de usuário" #: accounts/templates/profile-edit.html:130 -#: core/templates/header-guest.html:70 +#: core/templates/header-guest.html:84 #: timtec/templates/account/login_modal.html:76 -#: timtec/templates/account/signup.html:24 +#: timtec/templates/account/signup.html:25 +#: timtec/templates/account/signup.html:85 msgid "E-mail" msgstr "Email" #: accounts/templates/profile-edit.html:156 -#: timtec/templates/account/password_reset_from_key.html:31 +#: timtec/templates/account/password_reset_from_key.html:32 +#: timtec/templates/account/password_reset_from_key.html:71 msgid "Save" msgstr "Salvar" -#: core/models.py:25 +#: core/forms.py:11 +msgid "Subject" +msgstr "Assunto" + +#: core/forms.py:12 core/models.py:117 core/models.py:214 +msgid "Name" +msgstr "Nome" + +#: core/forms.py:13 +msgid "Email" +msgstr "Email" + +#: core/forms.py:14 +msgid "Message" +msgstr "Mensagem" + +#: core/models.py:26 msgid "" "Required. 30 characters or fewer. Letters, numbers and ./+/-/_ characters" msgstr "Obrigatório. 30 caracteres ou menos. Letras, números e . + - _" -#: core/models.py:28 +#: core/models.py:29 msgid "Enter a valid username." msgstr "Insira um nome válido." -#: core/models.py:31 +#: core/models.py:32 msgid "Email address" msgstr "Endereço de Email" -#: core/models.py:32 +#: core/models.py:33 msgid "First name" msgstr "Nome" -#: core/models.py:33 +#: core/models.py:34 msgid "Last name" msgstr "Sobrenome" -#: core/models.py:34 +#: core/models.py:35 msgid "Staff status" msgstr "Situação" -#: core/models.py:35 +#: core/models.py:36 msgid "Active" msgstr "Ativo" -#: core/models.py:36 +#: core/models.py:37 msgid "Date joined" msgstr "Data de inscrição" -#: core/models.py:38 +#: core/models.py:39 msgid "Picture" msgstr "Estrutura" -#: core/models.py:42 core/models.py:175 +#: core/models.py:43 core/models.py:193 msgid "Biography" msgstr "Biografia" -#: core/models.py:50 +#: core/models.py:51 msgid "user" msgstr "usuário" -#: core/models.py:51 +#: core/models.py:52 msgid "users" msgstr "usuários" -#: core/models.py:89 core/models.py:246 +#: core/models.py:102 core/models.py:282 msgid "Video" msgstr "Video" -#: core/models.py:90 +#: core/models.py:103 msgid "Videos" msgstr "Videos" -#: core/models.py:98 -msgid "New" -msgstr "Novo" +#: core/models.py:111 core/models.py:207 +msgid "Draft" +msgstr "Rascunho" -#: core/models.py:99 -msgid "Private" -msgstr "Privado" +#: core/models.py:112 core/models.py:208 +msgid "Listed" +msgstr "Listado" -#: core/models.py:100 -msgid "Public" +#: core/models.py:113 core/models.py:209 +msgid "Published" msgstr "Público" -#: core/models.py:103 core/models.py:188 forum/models.py:13 +#: core/models.py:116 core/models.py:217 forum/models.py:13 msgid "Slug" msgstr "Slug" -#: core/models.py:104 core/models.py:189 -msgid "Name" -msgstr "Nome" - -#: core/models.py:105 +#: core/models.py:118 msgid "Intro video" msgstr "Vídeo introdutório" -#: core/models.py:106 +#: core/models.py:119 msgid "Application" msgstr "Aplicação" -#: core/models.py:107 +#: core/models.py:120 msgid "Requirement" msgstr "Requisitos" -#: core/models.py:108 core/templates/course.html:130 +#: core/models.py:121 core/templates/course.html:75 +#: core/templates/course.html.py:175 msgid "Abstract" msgstr "Resumo" -#: core/models.py:109 +#: core/models.py:122 msgid "Structure" msgstr "Estrutura" -#: core/models.py:110 core/templates/course.html:137 +#: core/models.py:123 core/templates/course.html:82 +#: core/templates/course.html.py:182 msgid "Workload" msgstr "Carga horária" -#: core/models.py:111 +#: core/models.py:124 msgid "Pronatec" msgstr "Pronatec" -#: core/models.py:112 +#: core/models.py:125 core/models.py:218 msgid "Status" msgstr "Situação" -#: core/models.py:113 +#: core/models.py:126 msgid "Publication" msgstr "Publicação" -#: core/models.py:118 core/models.py:141 core/models.py:174 core/models.py:192 +#: core/models.py:131 core/models.py:159 core/models.py:192 core/models.py:212 #: forum/models.py:17 msgid "Course" msgstr "Curso" -#: core/models.py:119 core/templates/header-guest.html:16 +#: core/models.py:132 msgid "Courses" msgstr "Cursos" -#: core/models.py:140 core/models.py:277 core/models.py:306 +#: core/models.py:158 core/models.py:313 core/models.py:342 msgid "Student" msgstr "Estudante" -#: core/models.py:168 +#: core/models.py:186 msgid "Instructor" msgstr "Instrutor" -#: core/models.py:169 +#: core/models.py:187 msgid "Assistant" msgstr "Assistente" -#: core/models.py:170 +#: core/models.py:188 msgid "Pedagogy Assistant" msgstr "Assistente pedagógico" -#: core/models.py:173 +#: core/models.py:191 msgid "Professor" msgstr "Professor" -#: core/models.py:176 +#: core/models.py:194 msgid "Role" msgstr "Papel" -#: core/models.py:180 +#: core/models.py:198 msgid "Course Professor" msgstr "Professor do curso" -#: core/models.py:181 +#: core/models.py:199 msgid "Course Professors" msgstr "Professores do curso" -#: core/models.py:190 +#: core/models.py:213 msgid "Description" msgstr "Descrição" -#: core/models.py:191 core/templates/user-courses.html:31 +#: core/models.py:215 core/templates/user-courses.html:31 msgid "Notes" msgstr "Notas" -#: core/models.py:196 core/models.py:245 forum/models.py:18 +#: core/models.py:221 core/models.py:281 forum/models.py:18 msgid "Lesson" msgstr "Lição" -#: core/models.py:197 core/templates/course.html:62 +#: core/models.py:222 core/templates/course.html:94 msgid "Lessons" msgstr "Lições" -#: core/models.py:231 +#: core/models.py:267 msgid "Type" msgstr "Tipo" -#: core/models.py:232 +#: core/models.py:268 msgid "Data" msgstr "Dado" -#: core/models.py:233 +#: core/models.py:269 msgid "Expected answer" msgstr "Resposta esperada" -#: core/models.py:236 core/models.py:247 core/models.py:276 +#: core/models.py:272 core/models.py:283 core/models.py:312 msgid "Activity" msgstr "Atividade" -#: core/models.py:237 +#: core/models.py:273 msgid "Activities" msgstr "Atividades" -#: core/models.py:244 forum/models.py:11 +#: core/models.py:280 forum/models.py:11 msgid "Title" msgstr "Título" -#: core/models.py:251 core/models.py:307 +#: core/models.py:287 core/models.py:343 msgid "Unit" msgstr "Unidade" -#: core/models.py:252 +#: core/models.py:288 msgid "Units" msgstr "Unidades" -#: core/models.py:279 +#: core/models.py:315 msgid "Given answer" msgstr "Resposta fornecida" -#: core/models.py:301 forum/models.py:35 forum/models.py:62 +#: core/models.py:337 forum/models.py:35 forum/models.py:62 msgid "Answer" msgstr "Resposta" -#: core/models.py:302 +#: core/models.py:338 msgid "Answers" msgstr "Respostas" -#: core/models.py:313 +#: core/models.py:349 msgid "Student Progress" msgstr "Progresso do Estudante" @@ -324,122 +350,123 @@ msgstr "Progresso do Estudante" msgid "Resume" msgstr "Continuar curso" -#: core/templates/course.html:24 +#: core/templates/course.html:30 msgid "Take the Class" msgstr "Fazer o curso" -#: core/templates/course.html:47 -msgid "Course Application" -msgstr "Aplicação" +#: core/templates/course.html:58 +msgid "Why do this course?" +msgstr "Por que fazer esse curso?" -#: core/templates/course.html:53 -msgid "Requirements" -msgstr "Requisitos" +#: core/templates/course.html:64 +msgid "What do I have to know?" +msgstr "O que eu preciso saber?" + +#: core/templates/course.html:79 core/templates/course.html.py:179 +msgid "Course Structure" +msgstr "Estrutura" -#: core/templates/course.html:93 +#: core/templates/course.html:132 msgid "videos" msgstr "videos" -#: core/templates/course.html:93 +#: core/templates/course.html:132 msgid "activities" msgstr "atividades" -#: core/templates/course.html:105 +#: core/templates/course.html:148 msgid "Instructors" msgstr "Instrutores" -#: core/templates/course.html:134 -msgid "Course Structure" -msgstr "Estrutura" - -#: core/templates/header-authenticated.html:16 +#: core/templates/header-authenticated.html:20 msgid "Available Courses" msgstr "Cursos disponíveis" -#: core/templates/header-authenticated.html:17 +#: core/templates/header-authenticated.html:21 #: core/templates/user-courses.html:8 msgid "My Courses" msgstr "Meus cursos" -#: core/templates/header-authenticated.html:18 +#: core/templates/header-authenticated.html:22 msgid "My Notes" msgstr "Minhas notas" -#: core/templates/header-authenticated.html:25 +#: core/templates/header-authenticated.html:29 msgid "Profile" msgstr "Perfil" -#: core/templates/header-authenticated.html:26 +#: core/templates/header-authenticated.html:30 msgid "Edit Profile and Account Settings" msgstr "Editar Perfil e Configurações da conta" -#: core/templates/header-authenticated.html:27 +#: core/templates/header-authenticated.html:31 msgid "Settings" msgstr "Configurações" -#: core/templates/header-authenticated.html:29 +#: core/templates/header-authenticated.html:33 msgid "Logout" msgstr "Sair" -#: core/templates/header-guest.html:18 core/templates/header-guest.html:49 +#: core/templates/header-guest.html:22 core/templates/header-guest.html:56 #: timtec/templates/account/email_confirmed.html:29 -#: timtec/templates/account/login.html:9 -#: timtec/templates/account/login.html:39 +#: timtec/templates/account/login.html:11 +#: timtec/templates/account/login.html:41 +#: timtec/templates/account/login.html:64 +#: timtec/templates/account/login.html:96 #: timtec/templates/account/login_modal.html:18 #: timtec/templates/account/login_modal.html:51 -#: timtec/templates/account/password_reset_from_key_done.html:32 +#: timtec/templates/account/password_reset_from_key_done.html:33 +#: timtec/templates/account/password_reset_from_key_done.html:76 msgid "Sign In" msgstr "Entrar" -#: core/templates/header-guest.html:22 -#: timtec/templates/account/email_confirmed.html:14 -#: timtec/templates/account/login.html:14 -#: timtec/templates/account/login_modal.html:24 -#: timtec/templates/account/password_reset_from_key_done.html:13 -msgid "Login" -msgstr "Entrar" - -#: core/templates/header-guest.html:25 +#: core/templates/header-guest.html:30 #: timtec/templates/account/email_confirmed.html:16 -#: timtec/templates/account/login.html:17 +#: timtec/templates/account/login.html:19 +#: timtec/templates/account/login.html:75 #: timtec/templates/account/login_modal.html:27 -#: timtec/templates/account/password_reset_from_key_done.html:16 +#: timtec/templates/account/password_reset_from_key_done.html:17 +#: timtec/templates/account/password_reset_from_key_done.html:61 msgid "E-mail or username" msgstr "Nome de usuário ou email" -#: core/templates/header-guest.html:46 +#: core/templates/header-guest.html:53 #: timtec/templates/account/email_confirmed.html:28 -#: timtec/templates/account/login.html:38 +#: timtec/templates/account/login.html:40 +#: timtec/templates/account/login.html:99 #: timtec/templates/account/login_modal.html:48 -#: timtec/templates/account/password_reset.html:9 -#: timtec/templates/account/password_reset_from_key_done.html:31 +#: timtec/templates/account/password_reset.html:12 +#: timtec/templates/account/password_reset.html:49 +#: timtec/templates/account/password_reset_from_key_done.html:32 msgid "Forgot my password" msgstr "Esqueci minha senha" -#: core/templates/header-guest.html:60 core/templates/header-guest.html:83 +#: core/templates/header-guest.html:71 core/templates/header-guest.html:101 #: timtec/templates/account/login_modal.html:64 #: timtec/templates/account/login_modal.html:91 -#: timtec/templates/account/signup.html:9 -#: timtec/templates/account/signup.html:44 +#: timtec/templates/account/signup.html:10 +#: timtec/templates/account/signup.html:46 +#: timtec/templates/account/signup.html:68 +#: timtec/templates/account/signup.html:105 msgid "Sign Up" msgstr "Inscrever-se" -#: core/templates/header-guest.html:66 +#: core/templates/header-guest.html:78 #: timtec/templates/account/login_modal.html:72 msgid "Choose an username" msgstr "Escolha um nome de usuário" -#: core/templates/header-guest.html:72 +#: core/templates/header-guest.html:86 #: timtec/templates/account/login_modal.html:78 msgid "Insert your e-mail" msgstr "Insira seu email" -#: core/templates/header-guest.html:78 +#: core/templates/header-guest.html:94 #: timtec/templates/account/login_modal.html:84 msgid "A really strong password" msgstr "Uma senha muito forte" -#: core/templates/header-guest.html:79 +#: core/templates/header-guest.html:95 #: timtec/templates/account/login_modal.html:85 msgid "Confirm your password" msgstr "Confirme sua senha" @@ -462,6 +489,7 @@ msgid "Question" msgstr "Descrição" #: course_material/models.py:19 +#: course_material/templates/course-material-admin.html:94 #: course_material/templates/course-material.html:35 msgid "Files" msgstr "Arquivos" @@ -474,19 +502,23 @@ msgstr "Usuário" msgid "Correct answer" msgstr "Resposta esperada" -#: timtec/templates/account/activate.html:9 +#: timtec/templates/account/activate.html:10 +#: timtec/templates/account/activate.html:23 msgid "Sorry" msgstr "Desculpe" -#: timtec/templates/account/activate.html:11 +#: timtec/templates/account/activate.html:12 +#: timtec/templates/account/activate.html:25 msgid "You provided an invalid key" msgstr "Você forneceu uma chave inválida" -#: timtec/templates/account/activate.html:11 +#: timtec/templates/account/activate.html:12 +#: timtec/templates/account/activate.html:25 msgid "The registration failed" msgstr "O registro falhou" -#: timtec/templates/account/email_confirm.html:12 +#: timtec/templates/account/email_confirm.html:13 +#: timtec/templates/account/email_confirm.html:33 #, python-format msgid "" "Please confirm that %(email)s is an e-mail " @@ -495,11 +527,13 @@ msgstr "" "Por favor confirme que o endereço %(email)s" " é o email do usuário %(user_display)s." -#: timtec/templates/account/email_confirm.html:16 +#: timtec/templates/account/email_confirm.html:17 +#: timtec/templates/account/email_confirm.html:36 msgid "Confirm" msgstr "Confirmar" -#: timtec/templates/account/email_confirm.html:23 +#: timtec/templates/account/email_confirm.html:21 +#: timtec/templates/account/email_confirm.html:40 #, python-format msgid "" "This e-mail confirmation link expired or is invalid. Please nova redefinição de senha." -#: timtec/templates/account/password_reset_from_key.html:35 +#: timtec/templates/account/password_reset_from_key.html:36 +#: timtec/templates/account/password_reset_from_key.html:75 msgid "Your password is now changed." msgstr "Sua senha foi alterada." -#: timtec/templates/account/password_reset_from_key_done.html:9 +#: timtec/templates/account/password_reset_from_key_done.html:10 +#: timtec/templates/account/password_reset_from_key_done.html:54 msgid "Password reset complete" msgstr "Redefinição da senha completo" -#: timtec/templates/account/signup.html:36 +#: timtec/templates/account/signup.html:37 +#: timtec/templates/account/signup.html:97 msgid "Really strong password" msgstr "Senha realmente forte" -#: timtec/templates/account/signup.html:37 +#: timtec/templates/account/signup.html:38 +#: timtec/templates/account/signup.html:98 msgid "Password confirmation" msgstr "Confirmação de senha" -#: timtec/templates/account/verification_sent.html:9 +#: timtec/templates/account/verification_sent.html:10 +#: timtec/templates/account/verification_sent.html:22 msgid "Validation email sent" msgstr "Email de validação enviado" @@ -605,5 +658,40 @@ msgstr "" msgid "Password Reset E-mail" msgstr "Email de redefinição de senha" +#: timtec/templates/socialaccount/authentication_error.html:5 +#: timtec/templates/socialaccount/authentication_error.html:13 +msgid "Social Network Login Failure" +msgstr "" + +#: timtec/templates/socialaccount/authentication_error.html:16 +msgid "" +"An error occurred while attempting to login via your social network account." +msgstr "" + +#: timtec/templates/socialaccount/login_cancelled.html:6 +#: timtec/templates/socialaccount/login_cancelled.html:14 +msgid "Login Cancelled" +msgstr "" + +#: timtec/templates/socialaccount/login_cancelled.html:17 +#, python-format +msgid "" +"You decided to cancel logging in to our site using one of your existing " +"accounts. If this was a mistake, please proceed to sign in." +msgstr "" + +#~ msgid "New" +#~ msgstr "Novo" + +#~ msgid "Private" +#~ msgstr "Privado" + +#~ msgid "Course Application" +#~ msgstr "Aplicação" + +#~ msgid "Requirements" +#~ msgstr "Requisitos" + #~ msgid "Position" #~ msgstr "Posição"