From 7e7a184c008a403d63cb1cfb685bbf4ef789599c Mon Sep 17 00:00:00 2001 From: Zambom Date: Wed, 7 Sep 2016 00:18:06 -0300 Subject: [PATCH] Resolving messages file conflict --- app/locale/pt_BR/LC_MESSAGES/django.po | 51 +++++++++++++++++++++++++++++++++------------------ core/locale/pt_BR/LC_MESSAGES/django.po | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- courses/locale/pt_BR/LC_MESSAGES/django.po | 462 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- users/locale/pt_BR/LC_MESSAGES/django.po | 274 ++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 4 files changed, 106 insertions(+), 729 deletions(-) diff --git a/app/locale/pt_BR/LC_MESSAGES/django.po b/app/locale/pt_BR/LC_MESSAGES/django.po index 236a4cd..7254c14 100644 --- a/app/locale/pt_BR/LC_MESSAGES/django.po +++ b/app/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-05 20:28-0300\n" +"POT-Creation-Date: 2016-09-07 00:13-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -62,7 +62,8 @@ msgstr "Usuários Online" msgid "You can:" msgstr "" -#: app/templates/app/index.html:24 app/templates/home_professor.html:23 +#: app/templates/app/index.html:24 app/templates/home_app.html:26 +#: app/templates/home_professor.html:23 msgid "Create Course" msgstr "Criar Curso" @@ -102,26 +103,48 @@ msgstr "" msgid "Most popular keywords:" msgstr "" -#: app/templates/home_professor.html:9 app/templates/home_student.html:9 +#: app/templates/home_app.html:14 app/templates/home_professor.html:9 +#: app/templates/home_student.html:9 msgid "Home" msgstr "Início" -#: app/templates/home_professor.html:18 app/templates/home_student.html:18 -msgid "Menu" -msgstr "Menu" - -#: app/templates/home_professor.html:22 +#: app/templates/home_app.html:22 app/templates/home_professor.html:22 msgid "Pending tasks" msgstr "Tarefas Pendentes" -#: app/templates/home_professor.html:24 +#: app/templates/home_app.html:23 +#, fuzzy +#| msgid "Users Online" +msgid "Users Online (1)" +msgstr "Usuários Online" + +#: app/templates/home_app.html:24 +#, fuzzy +#| msgid "Courses" +msgid "Course" +msgstr "Cursos" + +#: app/templates/home_app.html:27 app/templates/home_professor.html:24 msgid "Manage Course" msgstr "Gerenciar Curso" -#: app/templates/home_professor.html:31 +#: app/templates/home_app.html:35 app/templates/home_professor.html:31 msgid "Courses" msgstr "Cursos" +#: app/templates/home_app.html:51 app/templates/home_professor.html:48 +msgid "You didn't create any course yet." +msgstr "Você não criou nenhum curso ainda." + +#: app/templates/home_app.html:59 app/templates/home_professor.html:54 +#: app/templates/home_student.html:60 +msgid "Goals" +msgstr "Metas" + +#: app/templates/home_professor.html:18 app/templates/home_student.html:18 +msgid "Menu" +msgstr "Menu" + #: app/templates/home_professor.html:40 msgid "Students:" msgstr "Alunos" @@ -134,14 +157,6 @@ msgstr "Começo" msgid "End:" msgstr "Fim" -#: app/templates/home_professor.html:48 -msgid "You didn't create any course yet." -msgstr "Você não criou nenhum curso ainda." - -#: app/templates/home_professor.html:54 app/templates/home_student.html:60 -msgid "Goals" -msgstr "Metas" - #: app/templates/home_student.html:22 msgid "Profile" msgstr "Perfil" diff --git a/core/locale/pt_BR/LC_MESSAGES/django.po b/core/locale/pt_BR/LC_MESSAGES/django.po index 5754d0d..b7f45ff 100644 --- a/core/locale/pt_BR/LC_MESSAGES/django.po +++ b/core/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-05 20:28-0300\n" +"POT-Creation-Date: 2016-09-07 00:13-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: core/models.py:15 core/models.py:36 +msgid "Name" +msgstr "" + +#: core/models.py:16 core/models.py:37 +msgid "Created Date" +msgstr "" + +#: core/models.py:49 +msgid "Action_Applied" +msgstr "" + +#: core/models.py:50 +msgid "Resource" +msgstr "" + +#: core/models.py:61 +msgid "message" +msgstr "" + +#: core/models.py:62 +msgid "Actor" +msgstr "" + +#: core/models.py:63 +msgid "Read" +msgstr "" + +#: core/models.py:64 +msgid "Action_Resource" +msgstr "" + #: core/templates/base.html:56 msgid "Log out" msgstr "Sair" @@ -46,6 +78,14 @@ msgstr "Entrar" msgid "Sign Up" msgstr "Cadastrar" +#: core/templates/register_user.html:29 +msgid "User Register" +msgstr "" + +#: core/templates/register_user.html:53 +msgid "Save" +msgstr "" + #: core/templates/remember_password.html:18 msgid "E-mail" msgstr "E-mail" @@ -58,6 +98,10 @@ msgstr "" msgid "Send" msgstr "Enviar" -#: core/views.py:25 +#: core/views.py:31 +msgid "User successfully registered!" +msgstr "" + +#: core/views.py:54 msgid "E-mail or password are incorrect!" msgstr "O E-mail e/ou a senha estão incorretos" diff --git a/courses/locale/pt_BR/LC_MESSAGES/django.po b/courses/locale/pt_BR/LC_MESSAGES/django.po index 54b6c78..bb6dbdc 100644 --- a/courses/locale/pt_BR/LC_MESSAGES/django.po +++ b/courses/locale/pt_BR/LC_MESSAGES/django.po @@ -1,462 +1,3 @@ -<<<<<<< HEAD -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-01 22:44-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: courses/forms.py:11 courses/forms.py:25 courses/forms.py:55 -#: courses/models.py:7 courses/models.py:20 courses/models.py:44 -#: courses/templates/category/index.html:38 -msgid "Name" -msgstr "" - -#: courses/forms.py:14 -msgid "Category name" -msgstr "" - -#: courses/forms.py:26 -msgid "Objectives" -msgstr "" - -#: courses/forms.py:27 courses/models.py:23 -msgid "Content" -msgstr "" - -#: courses/forms.py:28 -msgid "Number of studets maximum" -msgstr "" - -#: courses/forms.py:29 -msgid "Course registration start date" -msgstr "" - -#: courses/forms.py:30 -msgid "Course registration end date" -msgstr "" - -#: courses/forms.py:31 -msgid "Course start date" -msgstr "" - -#: courses/forms.py:32 -msgid "Course end date" -msgstr "" - -#: courses/forms.py:33 courses/models.py:30 -msgid "Image" -msgstr "" - -#: courses/forms.py:34 courses/models.py:12 courses/models.py:31 -msgid "Category" -msgstr "" - -#: courses/forms.py:37 -msgid "Course name" -msgstr "" - -#: courses/forms.py:38 -msgid "Course objective" -msgstr "" - -#: courses/forms.py:39 -msgid "Course modules" -msgstr "" - -#: courses/forms.py:40 -msgid "Max number of students that a class can have" -msgstr "" - -#: courses/forms.py:41 -msgid "Date that starts the registration period of the course (dd/mm/yyyy)" -msgstr "" - -#: courses/forms.py:42 -msgid "Date that ends the registration period of the course (dd/mm/yyyy)" -msgstr "" - -#: courses/forms.py:43 -msgid "Date that the course starts (dd/mm/yyyy)" -msgstr "" - -#: courses/forms.py:44 -msgid "Date that the course ends (dd/mm/yyyy)" -msgstr "" - -#: courses/forms.py:45 -msgid "Representative image of the course" -msgstr "" - -#: courses/forms.py:46 -msgid "Category which the course belongs" -msgstr "" - -#: courses/forms.py:56 courses/models.py:46 -msgid "Description" -msgstr "" - -#: courses/forms.py:57 -msgid "Is it visible?" -msgstr "" - -#: courses/forms.py:60 -msgid "Module's name" -msgstr "" - -#: courses/forms.py:61 -msgid "Modules's description" -msgstr "" - -#: courses/forms.py:62 -msgid "Is the module visible?" -msgstr "" - -#: courses/models.py:8 courses/models.py:21 courses/models.py:45 -#: courses/templates/category/index.html:39 -msgid "Slug" -msgstr "" - -#: courses/models.py:9 courses/models.py:25 courses/models.py:48 -msgid "Creation Date" -msgstr "" - -#: courses/models.py:13 courses/templates/category/create.html:16 -#: courses/templates/category/delete.html:15 -#: courses/templates/category/index.html:15 -#: courses/templates/category/update.html:16 -#: courses/templates/category/view.html:15 -msgid "Categories" -msgstr "" - -#: courses/models.py:22 -msgid "Objectivies" -msgstr "" - -#: courses/models.py:24 -msgid "Maximum Students" -msgstr "" - -#: courses/models.py:26 -msgid "Register Date (Begin)" -msgstr "" - -#: courses/models.py:27 -msgid "Register Date (End)" -msgstr "" - -#: courses/models.py:28 -msgid "Begin of Course Date" -msgstr "" - -#: courses/models.py:29 -msgid "End of Course Date" -msgstr "" - -#: courses/models.py:32 -msgid "User" -msgstr "" - -#: courses/models.py:36 courses/models.py:49 -msgid "Course" -msgstr "" - -#: courses/models.py:37 courses/templates/course/create.html:16 -#: courses/templates/course/delete.html:15 -#: courses/templates/course/filtered.html:8 -#: courses/templates/course/index.html:15 -#: courses/templates/course/update.html:16 -#: courses/templates/course/view.html:15 -#: courses/templates/module/create.html:17 -#: courses/templates/module/delete.html:16 -#: courses/templates/module/index.html:16 -#: courses/templates/module/update.html:17 -msgid "Courses" -msgstr "" - -#: courses/models.py:47 courses/templates/module/index.html:107 -msgid "Visible" -msgstr "" - -#: courses/models.py:53 -msgid "Module" -msgstr "" - -#: courses/models.py:54 courses/templates/module/index.html:92 -msgid "Modules" -msgstr "" - -#: courses/templates/category/create.html:8 -#: courses/templates/category/delete.html:7 -#: courses/templates/category/index.html:7 -#: courses/templates/category/update.html:8 -#: courses/templates/category/view.html:7 -#: courses/templates/course/create.html:8 -#: courses/templates/course/delete.html:7 courses/templates/course/index.html:7 -#: courses/templates/course/update.html:8 courses/templates/course/view.html:7 -#: courses/templates/module/create.html:8 -#: courses/templates/module/delete.html:7 courses/templates/module/index.html:7 -#: courses/templates/module/update.html:8 -msgid "Home" -msgstr "" - -#: courses/templates/category/create.html:9 -#: courses/templates/category/delete.html:18 -#: courses/templates/category/index.html:18 -#: courses/templates/category/view.html:18 -msgid "Create Category" -msgstr "" - -#: courses/templates/category/create.html:26 -#: courses/templates/category/update.html:26 -#: courses/templates/course/create.html:26 -#: courses/templates/course/update.html:32 -#: courses/templates/module/create.html:52 -#: courses/templates/module/update.html:52 -msgid "All fields are required" -msgstr "" - -#: courses/templates/category/create.html:51 -#: courses/templates/category/update.html:51 -#: courses/templates/course/create.html:51 -#: courses/templates/course/update.html:57 -#: courses/templates/module/create.html:77 -#: courses/templates/module/update.html:77 -msgid "Save" -msgstr "" - -#: courses/templates/category/delete.html:8 -#: courses/templates/category/index.html:8 -msgid "Manage Categories" -msgstr "" - -#: courses/templates/category/delete.html:26 -msgid "Are you sure you want to delete the category" -msgstr "" - -#: courses/templates/category/delete.html:27 -#: courses/templates/course/delete.html:28 -#: courses/templates/module/delete.html:50 -msgid "Yes" -msgstr "" - -#: courses/templates/category/delete.html:28 -#: courses/templates/course/delete.html:29 -#: courses/templates/module/delete.html:51 -msgid "No" -msgstr "" - -#: courses/templates/category/index.html:40 -msgid "Actions" -msgstr "" - -#: courses/templates/category/index.html:59 -msgid "No categories found" -msgstr "" - -#: courses/templates/category/update.html:9 -#: courses/templates/category/view.html:21 -msgid "Edit Category" -msgstr "" - -#: courses/templates/category/view.html:24 -msgid "Remove Category" -msgstr "" - -#: courses/templates/category/view.html:32 -msgid "Name:" -msgstr "" - -#: courses/templates/category/view.html:33 -msgid "Slug:" -msgstr "" - -#: courses/templates/course/create.html:9 -#: courses/templates/course/delete.html:18 -#: courses/templates/course/filtered.html:11 -#: courses/templates/course/index.html:18 courses/templates/course/view.html:25 -#: courses/templates/module/create.html:20 -#: courses/templates/module/delete.html:19 -#: courses/templates/module/index.html:26 -#: courses/templates/module/update.html:20 -msgid "Create Course" -msgstr "" - -#: courses/templates/course/delete.html:27 -msgid "Are you sure you want to delete the couse" -msgstr "" - -#: courses/templates/course/filtered.html:19 -#: courses/templates/course/index.html:26 -msgid "Categories:" -msgstr "" - -#: courses/templates/course/index.html:8 -msgid "Manage Courses" -msgstr "" - -#: courses/templates/course/index.html:80 -msgid "students tops" -msgstr "" - -#: courses/templates/course/index.html:86 -msgid "Subscribe Period:" -msgstr "" - -#: courses/templates/course/index.html:88 courses/templates/course/view.html:59 -#: courses/templates/module/index.html:83 -msgid "Period:" -msgstr "" - -#: courses/templates/course/index.html:104 -msgid "No courses found" -msgstr "" - -#: courses/templates/course/update.html:9 courses/templates/course/view.html:28 -#: courses/templates/module/create.html:26 -#: courses/templates/module/delete.html:25 -#: courses/templates/module/index.html:29 -#: courses/templates/module/update.html:26 -msgid "Edit Course" -msgstr "" - -#: courses/templates/course/update.html:19 -#: courses/templates/course/view.html:21 -#: courses/templates/module/create.html:29 -#: courses/templates/module/delete.html:9 -#: courses/templates/module/delete.html:28 -#: courses/templates/module/index.html:9 courses/templates/module/index.html:22 -#: courses/templates/module/update.html:29 -msgid "Manage Modules" -msgstr "" - -#: courses/templates/course/update.html:22 -#: courses/templates/course/view.html:31 -#: courses/templates/module/create.html:32 -#: courses/templates/module/delete.html:31 -#: courses/templates/module/index.html:32 -#: courses/templates/module/update.html:32 -msgid "Participants" -msgstr "" - -#: courses/templates/course/view.html:18 -#: courses/templates/module/create.html:23 -#: courses/templates/module/delete.html:22 -#: courses/templates/module/index.html:19 -#: courses/templates/module/update.html:23 -msgid "Course Info" -msgstr "" - -#: courses/templates/course/view.html:34 -#: courses/templates/module/create.html:35 -#: courses/templates/module/delete.html:34 -#: courses/templates/module/index.html:35 -#: courses/templates/module/update.html:35 -msgid "Course avaliations" -msgstr "" - -#: courses/templates/course/view.html:37 -#: courses/templates/module/create.html:38 -#: courses/templates/module/delete.html:37 -#: courses/templates/module/index.html:38 -#: courses/templates/module/update.html:38 -msgid "Duplicate Course" -msgstr "" - -#: courses/templates/course/view.html:40 -#: courses/templates/module/create.html:41 -#: courses/templates/module/delete.html:40 -#: courses/templates/module/index.html:41 -#: courses/templates/module/update.html:41 -msgid "Delete Course" -msgstr "" - -#: courses/templates/course/view.html:56 -msgid "Subscribes:" -msgstr "" - -#: courses/templates/course/view.html:66 -msgid "Objectives:" -msgstr "" - -#: courses/templates/course/view.html:69 -msgid "Work Plan:" -msgstr "" - -#: courses/templates/module/create.html:10 -#: courses/templates/module/index.html:70 -msgid "Create Module" -msgstr "" - -#: courses/templates/module/delete.html:49 -msgid "Are you sure you want to delete the module" -msgstr "" - -#: courses/templates/module/index.html:80 -msgid "students maximum" -msgstr "" - -#: courses/templates/module/index.html:109 -msgid "Invisible" -msgstr "" - -#: courses/templates/module/index.html:125 -msgid "No modules found" -msgstr "" - -#: courses/templates/module/update.html:10 -msgid "Edit Module" -msgstr "" - -#: courses/views.py:48 -msgid "Course created successfully!" -msgstr "" - -#: courses/views.py:70 -msgid "Course edited successfully!" -msgstr "" - -#: courses/views.py:92 -msgid "Course deleted successfully!" -msgstr "" - -#: courses/views.py:142 -msgid "Category created successfully!" -msgstr "" - -#: courses/views.py:164 -msgid "Category edited successfully!" -msgstr "" - -#: courses/views.py:185 -msgid "Category deleted successfully!" -msgstr "" - -#: courses/views.py:237 -msgid "Module created successfully!" -msgstr "" - -#: courses/views.py:268 -msgid "Module edited successfully!" -msgstr "" - -#: courses/views.py:291 -msgid "Module deleted successfully!" -msgstr "" -======= # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -467,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-05 20:28-0300\n" +"POT-Creation-Date: 2016-09-07 00:13-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -920,4 +461,3 @@ msgstr "" #: courses/views.py:291 msgid "Module deleted successfully!" msgstr "" ->>>>>>> 6adb9412b8b77c81ef8cc33a0b481885dadb6012 diff --git a/users/locale/pt_BR/LC_MESSAGES/django.po b/users/locale/pt_BR/LC_MESSAGES/django.po index aaf76d4..5dd9fbd 100644 --- a/users/locale/pt_BR/LC_MESSAGES/django.po +++ b/users/locale/pt_BR/LC_MESSAGES/django.po @@ -1,234 +1,3 @@ -<<<<<<< HEAD -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-01 22:44-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: users/forms.py:10 -msgid "Password" -msgstr "" - -#: users/models.py:10 -msgid "Login" -msgstr "" - -#: users/models.py:13 -msgid "" -"Type a valid username. This fields should only contain letters, numbers and " -"the characteres: @/./+/-/_ ." -msgstr "" - -#: users/models.py:16 -msgid "" -"A short name that will be used to identify you in the platform and to access " -"it" -msgstr "" - -#: users/models.py:17 -msgid "Mail" -msgstr "" - -#: users/models.py:18 -msgid "Name" -msgstr "" - -#: users/models.py:19 -msgid "City" -msgstr "" - -#: users/models.py:20 -msgid "State" -msgstr "" - -#: users/models.py:21 -msgid "Gender" -msgstr "" - -#: users/models.py:21 -msgid "Male" -msgstr "" - -#: users/models.py:21 -msgid "Female" -msgstr "" - -#: users/models.py:22 -msgid "Image" -msgstr "" - -#: users/models.py:23 -msgid "Birth Date" -msgstr "" - -#: users/models.py:24 -msgid "Phone" -msgstr "" - -#: users/models.py:25 users/templates/users/profile.html:42 -msgid "Cpf" -msgstr "" - -#: users/models.py:26 -msgid "Type" -msgstr "" - -#: users/models.py:26 -msgid "Professor" -msgstr "" - -#: users/models.py:26 -msgid "Student" -msgstr "" - -#: users/models.py:27 -msgid "Create Date" -msgstr "" - -#: users/models.py:28 -msgid "Administrador" -msgstr "" - -#: users/models.py:29 -msgid "Active" -msgstr "" - -#: users/models.py:37 -msgid "User" -msgstr "" - -#: users/models.py:38 -msgid "Users" -msgstr "" - -#: users/templates/list_users.html:14 users/templates/users/create.html:8 -#: users/templates/users/edit_profile.html:8 users/templates/users/index.html:7 -#: users/templates/users/profile.html:8 users/templates/users/update.html:8 -#: users/templates/users/view.html:7 -msgid "Home" -msgstr "Início" - -#: users/templates/list_users.html:15 users/templates/users/index.html:8 -msgid "Manage Users" -msgstr "Gerenciar Usuários" - -#: users/templates/list_users.html:23 -msgid "Add user" -msgstr "Adicionar usuário" - -#: users/templates/list_users.html:24 -msgid "Send email" -msgstr "Enviar e-mail" - -#: users/templates/users/create.html:9 -msgid "New User" -msgstr "" - -#: users/templates/users/create.html:16 users/templates/users/index.html:15 -#: users/templates/users/update.html:16 users/templates/users/view.html:15 -msgid "System Users" -msgstr "" - -#: users/templates/users/create.html:19 users/templates/users/index.html:18 -#: users/templates/users/update.html:19 users/templates/users/view.html:18 -msgid "New Account" -msgstr "" - -#: users/templates/users/create.html:22 users/templates/users/index.html:21 -#: users/templates/users/update.html:22 users/templates/users/view.html:27 -msgid "Send Mail" -msgstr "" - -#: users/templates/users/create.html:32 -#: users/templates/users/edit_profile.html:29 -#: users/templates/users/update.html:32 -msgid "All fields are required" -msgstr "" - -#: users/templates/users/create.html:57 -#: users/templates/users/edit_profile.html:64 -#: users/templates/users/update.html:57 -msgid "Save" -msgstr "" - -#: users/templates/users/edit_profile.html:9 -#: users/templates/users/edit_profile.html:19 -#: users/templates/users/profile.html:19 -msgid "Edit Profile" -msgstr "" - -#: users/templates/users/edit_profile.html:16 -#: users/templates/users/profile.html:9 users/templates/users/profile.html:16 -msgid "Profile" -msgstr "" - -#: users/templates/users/index.html:56 users/templates/users/profile.html:32 -#: users/templates/users/view.html:39 -msgid "Administrator" -msgstr "" - -#: users/templates/users/index.html:74 -msgid "No users found" -msgstr "" - -#: users/templates/users/profile.html:36 users/templates/users/view.html:43 -msgid "Mail:" -msgstr "" - -#: users/templates/users/profile.html:39 users/templates/users/view.html:46 -msgid "Phone:" -msgstr "" - -#: users/templates/users/profile.html:45 -msgid "Birth date" -msgstr "" - -#: users/templates/users/update.html:9 -msgid "Edit user" -msgstr "" - -#: users/templates/users/view.html:21 -msgid "View User Account" -msgstr "" - -#: users/templates/users/view.html:24 -msgid "Edit User Account" -msgstr "" - -#: users/templates/users/view.html:49 -msgid "Cpf:" -msgstr "" - -#: users/templates/users/view.html:52 -msgid "Birth date:" -msgstr "" - -#: users/views.py:47 -msgid "User created successfully!" -msgstr "" - -#: users/views.py:76 -msgid "User edited successfully!" -msgstr "" - -#: users/views.py:125 -msgid "Profile edited successfully!" -msgstr "" -======= # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -239,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-05 20:28-0300\n" +"POT-Creation-Date: 2016-09-07 00:13-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -261,7 +30,9 @@ msgstr "Entrar" msgid "" "Type a valid username. This fields should only contain letters, numbers and " "the characteres: @/./+/-/_ ." -msgstr "Digite um nome de usuário válido. Esse campo deve conter apenas letras, números e os caracteres: @/./+/-/_ ." +msgstr "" +"Digite um nome de usuário válido. Esse campo deve conter apenas letras, " +"números e os caracteres: @/./+/-/_ ." #: users/models.py:16 msgid "" @@ -273,7 +44,7 @@ msgstr "" msgid "Mail" msgstr "Email" -#: users/models.py:18 users/templates/list_users.html:41 +#: users/models.py:18 users/templates/list_users.html:50 msgid "Name" msgstr "Nome" @@ -335,7 +106,7 @@ msgstr "Administrador" #: users/models.py:29 msgid "Active" -msgstr "" +msgstr "Ativo" #: users/models.py:37 msgid "User" @@ -364,28 +135,40 @@ msgstr "Adicionar usuário" msgid "Send email" msgstr "Enviar e-mail" -#: users/templates/list_users.html:42 +#: users/templates/list_users.html:34 +msgid "Search..." +msgstr "Pesquisar..." + +#: users/templates/list_users.html:37 +msgid "Search" +msgstr "Pesquisar" + +#: users/templates/list_users.html:51 #: users/templates/users/edit_profile.html:16 #: users/templates/users/profile.html:9 users/templates/users/profile.html:16 msgid "Profile" msgstr "Perfil" -#: users/templates/list_users.html:43 +#: users/templates/list_users.html:52 msgid "Email" msgstr "Email" -#: users/templates/list_users.html:44 +#: users/templates/list_users.html:53 msgid "Contact" msgstr "Contato" -#: users/templates/list_users.html:46 +#: users/templates/list_users.html:55 msgid "Edit" msgstr "Editar" -#: users/templates/list_users.html:47 +#: users/templates/list_users.html:56 msgid "Delete" msgstr "Apagar" +#: users/templates/list_users.html:66 users/templates/users/index.html:74 +msgid "No users found" +msgstr "Nenhum usuário encontrado" + #: users/templates/users/create.html:9 msgid "New User" msgstr "Novo usuário" @@ -428,10 +211,6 @@ msgstr "" msgid "Administrator" msgstr "" -#: users/templates/users/index.html:74 -msgid "No users found" -msgstr "" - #: users/templates/users/profile.html:36 users/templates/users/view.html:43 msgid "Mail:" msgstr "" @@ -464,15 +243,14 @@ msgstr "" msgid "Birth date:" msgstr "" -#: users/views.py:47 +#: users/views.py:54 msgid "User created successfully!" msgstr "" -#: users/views.py:76 +#: users/views.py:83 msgid "User edited successfully!" msgstr "" -#: users/views.py:125 +#: users/views.py:132 users/views.py:149 msgid "Profile edited successfully!" msgstr "" ->>>>>>> 6adb9412b8b77c81ef8cc33a0b481885dadb6012 -- libgit2 0.21.2