aboutsummaryrefslogtreecommitdiff
path: root/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po
diff options
context:
space:
mode:
Diffstat (limited to 'rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po')
-rw-r--r--rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po3065
1 files changed, 1612 insertions, 1453 deletions
diff --git a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po
index dacd5b69..5b605ba1 100644
--- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RhodeCode 1.2.0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-01-28 00:24+0100\n"
+"POT-Creation-Date: 2013-04-05 10:19-0700\n"
"PO-Revision-Date: 2012-05-22 16:47-0300\n"
"Last-Translator: Augusto Herrmann <augusto.herrmann@gmail.com>\n"
"Language-Team: pt_BR <LL@li.org>\n"
@@ -22,11 +22,13 @@ msgid "All Branches"
msgstr "Todos os Ramos"
#: rhodecode/controllers/changeset.py:83
-msgid "show white space"
+#, fuzzy
+msgid "Show white space"
msgstr "mostrar espaços em branco"
#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
-msgid "ignore white space"
+#, fuzzy
+msgid "Ignore white space"
msgstr "ignorar espaços em branco"
#: rhodecode/controllers/changeset.py:163
@@ -35,7 +37,7 @@ msgid "%s line context"
msgstr "contexto de %s linhas"
#: rhodecode/controllers/changeset.py:329
-#: rhodecode/controllers/pullrequests.py:416
+#: rhodecode/controllers/pullrequests.py:438
#, fuzzy, python-format
msgid "Status change -> %s"
msgstr "Última alteração"
@@ -46,8 +48,8 @@ msgid ""
"not allowed"
msgstr ""
-#: rhodecode/controllers/compare.py:75
-#: rhodecode/controllers/pullrequests.py:121
+#: rhodecode/controllers/compare.py:74
+#: rhodecode/controllers/pullrequests.py:167
#: rhodecode/controllers/shortlog.py:100
#, fuzzy
msgid "There are no changesets yet"
@@ -94,109 +96,118 @@ msgid "%s %s feed"
msgstr "%s - feed %s"
#: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:137
-#: rhodecode/templates/changeset/changeset.html:149
-#: rhodecode/templates/compare/compare_diff.html:62
-#: rhodecode/templates/compare/compare_diff.html:73
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
-#: rhodecode/templates/pullrequests/pullrequest_show.html:171
+#: rhodecode/templates/changeset/changeset.html:134
+#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/compare/compare_diff.html:58
+#: rhodecode/templates/compare/compare_diff.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:195
msgid "Changeset was too big and was cut off..."
msgstr "Conjunto de mudanças era grande demais e foi cortado..."
-#: rhodecode/controllers/feed.py:92
-#, fuzzy
-msgid "commited on"
+#: rhodecode/controllers/feed.py:91
+#, fuzzy, python-format
+msgid "%s committed on %s"
msgstr "commit"
-#: rhodecode/controllers/files.py:86
+#: rhodecode/controllers/files.py:88
#, fuzzy
-msgid "click here to add new file"
+msgid "Click here to add new file"
msgstr "adicionar novo arquivo"
-#: rhodecode/controllers/files.py:87
+#: rhodecode/controllers/files.py:89
#, python-format
msgid "There are no files yet %s"
msgstr "Ainda não há arquivos %s"
-#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338
+#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335
#, python-format
msgid "This repository is has been locked by %s on %s"
msgstr ""
-#: rhodecode/controllers/files.py:281
+#: rhodecode/controllers/files.py:279
msgid "You can only edit files with revision being a valid branch "
msgstr ""
-#: rhodecode/controllers/files.py:295
+#: rhodecode/controllers/files.py:293
#, fuzzy, python-format
msgid "Edited file %s via RhodeCode"
msgstr "Editado %s via RhodeCode"
-#: rhodecode/controllers/files.py:311
+#: rhodecode/controllers/files.py:309
msgid "No changes"
msgstr "Sem alterações"
-#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384
+#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388
#, python-format
msgid "Successfully committed to %s"
msgstr "Commit realizado com sucesso para %s"
-#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390
+#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394
msgid "Error occurred during commit"
msgstr "Ocorreu um erro ao realizar commit"
-#: rhodecode/controllers/files.py:350
+#: rhodecode/controllers/files.py:347
#, fuzzy
msgid "Added file via RhodeCode"
msgstr "Adicionado %s via RhodeCode"
-#: rhodecode/controllers/files.py:370
+#: rhodecode/controllers/files.py:364
msgid "No content"
msgstr "Nenhum conteúdo"
-#: rhodecode/controllers/files.py:374
+#: rhodecode/controllers/files.py:368
msgid "No filename"
msgstr "Nenhum nomes de arquivo"
-#: rhodecode/controllers/files.py:416
-msgid "downloads disabled"
+#: rhodecode/controllers/files.py:372
+msgid "Location must be relative path and must not contain .. in path"
+msgstr ""
+
+#: rhodecode/controllers/files.py:420
+#, fuzzy
+msgid "Downloads disabled"
msgstr "downloads desabilitados"
-#: rhodecode/controllers/files.py:427
+#: rhodecode/controllers/files.py:431
#, python-format
msgid "Unknown revision %s"
msgstr "Revisão desconhecida %s"
-#: rhodecode/controllers/files.py:429
+#: rhodecode/controllers/files.py:433
msgid "Empty repository"
msgstr "Repositório vazio"
-#: rhodecode/controllers/files.py:431
+#: rhodecode/controllers/files.py:435
msgid "Unknown archive type"
msgstr "Arquivo de tipo desconhecido"
-#: rhodecode/controllers/files.py:576
-#: rhodecode/templates/changeset/changeset_range.html:13
-#: rhodecode/templates/changeset/changeset_range.html:31
+#: rhodecode/controllers/files.py:617
+#: rhodecode/templates/changeset/changeset_range.html:9
msgid "Changesets"
msgstr "Conjuntos de mudanças"
-#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564
+#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131
+#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606
+#: rhodecode/templates/switch_to_list.html:3
+#: rhodecode/templates/branches/branches.html:10
msgid "Branches"
msgstr "Ramos"
-#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78
-#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575
+#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132
+#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617
+#: rhodecode/templates/switch_to_list.html:15
+#: rhodecode/templates/shortlog/shortlog_data.html:10
+#: rhodecode/templates/tags/tags.html:10
msgid "Tags"
msgstr "Etiquetas"
-#: rhodecode/controllers/forks.py:165
-#, python-format
-msgid "forked %s repository as %s"
+#: rhodecode/controllers/forks.py:175
+#, fuzzy, python-format
+msgid "Forked repository %s as %s"
msgstr "bifurcado repositório %s como %s"
-#: rhodecode/controllers/forks.py:179
+#: rhodecode/controllers/forks.py:189
#, python-format
msgid "An error occurred during repository forking %s"
msgstr "Ocorreu um erro ao bifurcar o repositório %s"
@@ -207,20 +218,20 @@ msgid "public journal"
msgstr "Diário público"
#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
-#: rhodecode/templates/base/base.html:238
#: rhodecode/templates/journal/journal.html:12
msgid "journal"
msgstr "diário"
-#: rhodecode/controllers/login.py:142
-msgid "You have successfully registered into rhodecode"
+#: rhodecode/controllers/login.py:138
+#, fuzzy
+msgid "You have successfully registered into RhodeCode"
msgstr "Você se registrou com sucesso no rhodecode"
-#: rhodecode/controllers/login.py:163
+#: rhodecode/controllers/login.py:159
msgid "Your password reset link was sent"
msgstr "Seu link de reinicialização de senha foi enviado"
-#: rhodecode/controllers/login.py:183
+#: rhodecode/controllers/login.py:179
msgid ""
"Your password reset was successful, new password has been sent to your "
"email"
@@ -228,35 +239,56 @@ msgstr ""
"Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao "
"seu e-mail"
-#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570
+#: rhodecode/controllers/pullrequests.py:118
+#: rhodecode/templates/changeset/changeset.html:10
+#: rhodecode/templates/email_templates/changeset_comment.html:15
+msgid "Changeset"
+msgstr "Conjunto de Mudanças"
+
+#: rhodecode/controllers/pullrequests.py:128
+msgid "Special"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:129
+#, fuzzy
+msgid "Peer branches"
+msgstr "ramos"
+
+#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612
+#: rhodecode/templates/switch_to_list.html:28
+#: rhodecode/templates/bookmarks/bookmarks.html:10
msgid "Bookmarks"
msgstr "Marcadores"
-#: rhodecode/controllers/pullrequests.py:190
+#: rhodecode/controllers/pullrequests.py:228
msgid "Pull request requires a title with min. 3 chars"
msgstr ""
-#: rhodecode/controllers/pullrequests.py:192
+#: rhodecode/controllers/pullrequests.py:230
#, fuzzy
-msgid "error during creation of pull request"
+msgid "Error creating pull request"
msgstr "ocorreu um erro ao criar o usuário %s"
-#: rhodecode/controllers/pullrequests.py:224
+#: rhodecode/controllers/pullrequests.py:251
#, fuzzy
msgid "Successfully opened new pull request"
msgstr "usuário excluído com sucesso"
-#: rhodecode/controllers/pullrequests.py:227
+#: rhodecode/controllers/pullrequests.py:254
#, fuzzy
msgid "Error occurred during sending pull request"
msgstr "ocorreu um erro ao criar o repositório %s"
-#: rhodecode/controllers/pullrequests.py:260
+#: rhodecode/controllers/pullrequests.py:287
#, fuzzy
msgid "Successfully deleted pull request"
msgstr "usuário excluído com sucesso"
-#: rhodecode/controllers/pullrequests.py:451
+#: rhodecode/controllers/pullrequests.py:441
+msgid "Closing with"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:478
msgid "Closing pull request on other statuses than rejected or approved forbidden"
msgstr ""
@@ -272,58 +304,12 @@ msgstr "Não há índice onde pesquisa. Por favor execute o indexador whoosh"
msgid "An error occurred during this search operation"
msgstr "Ocorreu um erro durante essa operação de busca"
-#: rhodecode/controllers/settings.py:120
-#: rhodecode/controllers/admin/repos.py:254
-#, python-format
-msgid "Repository %s updated successfully"
-msgstr "Repositório %s atualizado com sucesso"
-
-#: rhodecode/controllers/settings.py:138
-#: rhodecode/controllers/admin/repos.py:272
-#, python-format
-msgid "error occurred during update of repository %s"
-msgstr "ocorreu um erro ao atualizar o repositório %s"
-
-#: rhodecode/controllers/settings.py:163
-#: rhodecode/controllers/admin/repos.py:297
-#, python-format
-msgid "deleted repository %s"
-msgstr "excluído o repositório %s"
-
-#: rhodecode/controllers/settings.py:167
-#: rhodecode/controllers/admin/repos.py:307
-#: rhodecode/controllers/admin/repos.py:313
-#, python-format
-msgid "An error occurred during deletion of %s"
-msgstr "Ocorreu um erro durante a exclusão de %s"
-
-#: rhodecode/controllers/settings.py:186
-#, fuzzy
-msgid "unlocked"
-msgstr "destravar"
-
-#: rhodecode/controllers/settings.py:189
-#, fuzzy
-msgid "locked"
-msgstr "destravar"
-
-#: rhodecode/controllers/settings.py:191
-#, fuzzy, python-format
-msgid "Repository has been %s"
-msgstr "bifurcado repositório %s como %s"
-
-#: rhodecode/controllers/settings.py:195
-#: rhodecode/controllers/admin/repos.py:405
-#, fuzzy
-msgid "An error occurred during unlocking"
-msgstr "Ocorreu um erro durante essa operação"
-
-#: rhodecode/controllers/summary.py:140
+#: rhodecode/controllers/summary.py:141
msgid "No data loaded yet"
msgstr "Ainda não há dados carregados"
-#: rhodecode/controllers/summary.py:144
-#: rhodecode/templates/summary/summary.html:157
+#: rhodecode/controllers/summary.py:147
+#: rhodecode/templates/summary/summary.html:149
msgid "Statistics are disabled for this repository"
msgstr "As estatísticas estão desabillitadas para este repositório"
@@ -334,7 +320,7 @@ msgstr "Configurações de LDAP atualizadas com sucesso"
#: rhodecode/controllers/admin/defaults.py:110
#, fuzzy
-msgid "error occurred during update of defaults"
+msgid "Error occurred during update of defaults"
msgstr "ocorreu um erro ao atualizar o usuário %s"
#: rhodecode/controllers/admin/ldap_settings.py:50
@@ -390,7 +376,8 @@ msgid "Unable to activate ldap. The \"python-ldap\" library is missing."
msgstr "Não foi possível ativar LDAP. A biblioteca \"python-ldap\" está faltando."
#: rhodecode/controllers/admin/ldap_settings.py:147
-msgid "error occurred during update of ldap settings"
+#, fuzzy
+msgid "Error occurred during update of ldap settings"
msgstr "ocorreu um erro ao atualizar as configurações de LDAP"
#: rhodecode/controllers/admin/permissions.py:60
@@ -413,45 +400,46 @@ msgstr "Gravar"
#: rhodecode/templates/admin/defaults/defaults.html:9
#: rhodecode/templates/admin/ldap/ldap.html:9
#: rhodecode/templates/admin/permissions/permissions.html:9
-#: rhodecode/templates/admin/repos/repo_add.html:9
-#: rhodecode/templates/admin/repos/repo_edit.html:9
+#: rhodecode/templates/admin/repos/repo_add.html:10
+#: rhodecode/templates/admin/repos/repo_add.html:14
#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13
#: rhodecode/templates/admin/settings/hooks.html:9
#: rhodecode/templates/admin/settings/settings.html:9
#: rhodecode/templates/admin/users/user_add.html:8
#: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:130
+#: rhodecode/templates/admin/users/user_edit.html:133
#: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users/users.html:85
#: rhodecode/templates/admin/users_groups/users_group_add.html:8
#: rhodecode/templates/admin/users_groups/users_group_edit.html:9
#: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:203
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:326
-#: rhodecode/templates/base/base.html:328
+#: rhodecode/templates/base/base.html:292
+#: rhodecode/templates/base/base.html:293
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:300
msgid "Admin"
msgstr "Administrador"
#: rhodecode/controllers/admin/permissions.py:70
-msgid "disabled"
-msgstr "desabilitado"
+#: rhodecode/controllers/admin/permissions.py:76
+#: rhodecode/controllers/admin/permissions.py:79
+msgid "Disabled"
+msgstr "Desabilitado"
#: rhodecode/controllers/admin/permissions.py:72
-msgid "allowed with manual account activation"
+#, fuzzy
+msgid "Allowed with manual account activation"
msgstr "permitido com ativação manual de conta"
#: rhodecode/controllers/admin/permissions.py:74
-msgid "allowed with automatic account activation"
+#, fuzzy
+msgid "Allowed with automatic account activation"
msgstr "permitido com ativação automática de conta"
-#: rhodecode/controllers/admin/permissions.py:76
-#: rhodecode/controllers/admin/permissions.py:79
-msgid "Disabled"
-msgstr "Desabilitado"
-
#: rhodecode/controllers/admin/permissions.py:77
#: rhodecode/controllers/admin/permissions.py:80
msgid "Enabled"
@@ -462,156 +450,233 @@ msgid "Default permissions updated successfully"
msgstr "Permissões padrões atualizadas com sucesso"
#: rhodecode/controllers/admin/permissions.py:142
-msgid "error occurred during update of permissions"
+#, fuzzy
+msgid "Error occurred during update of permissions"
msgstr "ocorreu um erro ao atualizar as permissões"
-#: rhodecode/controllers/admin/repos.py:123
+#: rhodecode/controllers/admin/repos.py:127
msgid "--REMOVE FORK--"
msgstr "--REMOVER BIFURCAÇÂO--"
-#: rhodecode/controllers/admin/repos.py:162
-#, python-format
-msgid "created repository %s from %s"
+#: rhodecode/controllers/admin/repos.py:168
+#, fuzzy, python-format
+msgid "Created repository %s from %s"
msgstr "repositório %s criado a partir de %s"
-#: rhodecode/controllers/admin/repos.py:166
-#, python-format
-msgid "created repository %s"
+#: rhodecode/controllers/admin/repos.py:174
+#, fuzzy, python-format
+msgid "Created repository %s"
msgstr "repositório %s criado"
#: rhodecode/controllers/admin/repos.py:197
+#, fuzzy, python-format
+msgid "Error creating repository %s"
+msgstr "repositório %s criado"
+
+#: rhodecode/controllers/admin/repos.py:266
#, python-format
-msgid "error occurred during creation of repository %s"
-msgstr "ocorreu um erro ao criar o repositório %s"
+msgid "Repository %s updated successfully"
+msgstr "Repositório %s atualizado com sucesso"
+
+#: rhodecode/controllers/admin/repos.py:284
+#, fuzzy, python-format
+msgid "Error occurred during update of repository %s"
+msgstr "ocorreu um erro ao atualizar o repositório %s"
-#: rhodecode/controllers/admin/repos.py:302
+#: rhodecode/controllers/admin/repos.py:311
+#: rhodecode/controllers/api/api.py:877
+#, python-format
+msgid "Detached %s forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:314
+#: rhodecode/controllers/api/api.py:879
+#, fuzzy, python-format
+msgid "Deleted %s forks"
+msgstr "excluído o repositório %s"
+
+#: rhodecode/controllers/admin/repos.py:319
+#, fuzzy, python-format
+msgid "Deleted repository %s"
+msgstr "excluído o repositório %s"
+
+#: rhodecode/controllers/admin/repos.py:322
#, python-format
msgid "Cannot delete %s it still contains attached forks"
msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas"
-#: rhodecode/controllers/admin/repos.py:331
+#: rhodecode/controllers/admin/repos.py:327
+#, python-format
+msgid "An error occurred during deletion of %s"
+msgstr "Ocorreu um erro durante a exclusão de %s"
+
+#: rhodecode/controllers/admin/repos.py:365
+#, fuzzy
+msgid "Repository permissions updated"
+msgstr "Criação de repositório"
+
+#: rhodecode/controllers/admin/repos.py:384
msgid "An error occurred during deletion of repository user"
msgstr "Ocorreu um erro ao excluir usuário de repositório"
-#: rhodecode/controllers/admin/repos.py:350
-msgid "An error occurred during deletion of repository users groups"
+#: rhodecode/controllers/admin/repos.py:403
+#, fuzzy
+msgid "An error occurred during deletion of repository user groups"
msgstr "Ocorreu um erro ao excluir grupo de usuário de repositório"
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:421
msgid "An error occurred during deletion of repository stats"
msgstr "Ocorreu um erro ao excluir estatísticas de repositório"
-#: rhodecode/controllers/admin/repos.py:385
+#: rhodecode/controllers/admin/repos.py:438
msgid "An error occurred during cache invalidation"
msgstr "Ocorreu um erro ao invalidar o cache"
-#: rhodecode/controllers/admin/repos.py:425
+#: rhodecode/controllers/admin/repos.py:458
+#: rhodecode/controllers/admin/repos.py:485
+#, fuzzy
+msgid "An error occurred during unlocking"
+msgstr "Ocorreu um erro durante essa operação"
+
+#: rhodecode/controllers/admin/repos.py:476
+#, fuzzy
+msgid "Unlocked"
+msgstr "destravar"
+
+#: rhodecode/controllers/admin/repos.py:479
+#, fuzzy
+msgid "Locked"
+msgstr "destravar"
+
+#: rhodecode/controllers/admin/repos.py:481
+#, fuzzy, python-format
+msgid "Repository has been %s"
+msgstr "bifurcado repositório %s como %s"
+
+#: rhodecode/controllers/admin/repos.py:505
msgid "Updated repository visibility in public journal"
msgstr "Atualizada a visibilidade do repositório no diário público"
-#: rhodecode/controllers/admin/repos.py:429
+#: rhodecode/controllers/admin/repos.py:509
msgid "An error occurred during setting this repository in public journal"
msgstr "Ocorreu um erro ao ajustar esse repositório no diário público"
-#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301
+#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302
msgid "Token mismatch"
msgstr "Descompasso de Token"
-#: rhodecode/controllers/admin/repos.py:447
+#: rhodecode/controllers/admin/repos.py:527
msgid "Pulled from remote location"
msgstr "Realizado pull de localização remota"
-#: rhodecode/controllers/admin/repos.py:449
+#: rhodecode/controllers/admin/repos.py:529
msgid "An error occurred during pull from remote location"
msgstr "Ocorreu um erro ao realizar pull de localização remota"
-#: rhodecode/controllers/admin/repos.py:465
+#: rhodecode/controllers/admin/repos.py:545
msgid "Nothing"
msgstr "Nada"
-#: rhodecode/controllers/admin/repos.py:467
+#: rhodecode/controllers/admin/repos.py:547
#, python-format
msgid "Marked repo %s as fork of %s"
msgstr "Marcado repositório %s como bifurcação de %s"
-#: rhodecode/controllers/admin/repos.py:471
+#: rhodecode/controllers/admin/repos.py:551
msgid "An error occurred during this operation"
msgstr "Ocorreu um erro durante essa operação"
-#: rhodecode/controllers/admin/repos_groups.py:136
-#, python-format
-msgid "created repos group %s"
+#: rhodecode/controllers/admin/repos.py:590
+#, fuzzy
+msgid "An error occurred during creation of field"
+msgstr "ocorreu um erro ao criar o usuário %s"
+
+#: rhodecode/controllers/admin/repos.py:604
+#, fuzzy
+msgid "An error occurred during removal of field"
+msgstr "Ocorreu um erro durante essa operação"
+
+#: rhodecode/controllers/admin/repos_groups.py:145
+#, fuzzy, python-format
+msgid "Created repository group %s"
msgstr "criado grupo de repositórios %s"
-#: rhodecode/controllers/admin/repos_groups.py:148
-#, python-format
-msgid "error occurred during creation of repos group %s"
+#: rhodecode/controllers/admin/repos_groups.py:157
+#, fuzzy, python-format
+msgid "Error occurred during creation of repository group %s"
msgstr "ccorreu um erro ao criar grupo de repositório %s"
-#: rhodecode/controllers/admin/repos_groups.py:205
-#, python-format
-msgid "updated repos group %s"
-msgstr "atualizado grupo de repositórios %s"
+#: rhodecode/controllers/admin/repos_groups.py:214
+#: rhodecode/controllers/admin/repos_groups.py:286
+msgid "Cannot revoke permission for yourself as admin"
+msgstr ""
#: rhodecode/controllers/admin/repos_groups.py:220
-#, python-format
-msgid "error occurred during update of repos group %s"
+#, fuzzy, python-format
+msgid "Updated repository group %s"
+msgstr "atualizado grupo de repositórios %s"
+
+#: rhodecode/controllers/admin/repos_groups.py:235
+#, fuzzy, python-format
+msgid "Error occurred during update of repository group %s"
msgstr "ocorreu um erro ao atualizar grupo de repositórios %s"
-#: rhodecode/controllers/admin/repos_groups.py:238
+#: rhodecode/controllers/admin/repos_groups.py:253
#, python-format
msgid "This group contains %s repositores and cannot be deleted"
msgstr "Esse grupo contém %s repositórios e não pode ser excluído"
-#: rhodecode/controllers/admin/repos_groups.py:246
-#, python-format
-msgid "removed repos group %s"
-msgstr "removido grupo de repositórios %s"
+#: rhodecode/controllers/admin/repos_groups.py:260
+#, fuzzy, python-format
+msgid "This group contains %s subgroups and cannot be deleted"
+msgstr "Esse grupo contém %s repositórios e não pode ser excluído"
-#: rhodecode/controllers/admin/repos_groups.py:252
-msgid "Cannot delete this group it still contains subgroups"
-msgstr "Nao é possível excluir este grupo pois ele ainda contém subgrupos"
+#: rhodecode/controllers/admin/repos_groups.py:266
+#, fuzzy, python-format
+msgid "Removed repository group %s"
+msgstr "removido grupo de repositórios %s"
-#: rhodecode/controllers/admin/repos_groups.py:257
-#: rhodecode/controllers/admin/repos_groups.py:262
-#, python-format
-msgid "error occurred during deletion of repos group %s"
+#: rhodecode/controllers/admin/repos_groups.py:271
+#, fuzzy, python-format
+msgid "Error occurred during deletion of repos group %s"
msgstr "ccorreu um erro ao excluir grupo de repositórios %s"
-#: rhodecode/controllers/admin/repos_groups.py:283
+#: rhodecode/controllers/admin/repos_groups.py:297
msgid "An error occurred during deletion of group user"
msgstr "Ocorreu um erro ao excluir o usuário de grupo"
-#: rhodecode/controllers/admin/repos_groups.py:304
-msgid "An error occurred during deletion of group users groups"
+#: rhodecode/controllers/admin/repos_groups.py:318
+#, fuzzy
+msgid "An error occurred during deletion of group user groups"
msgstr "Ocorreu um erro ao excluir o grupo do grupo de usuários"
-#: rhodecode/controllers/admin/settings.py:124
+#: rhodecode/controllers/admin/settings.py:126
#, fuzzy, python-format
msgid "Repositories successfully rescanned added: %s ; removed: %s"
msgstr "Repositórios varridos com sucesso adicionados: %s, removidos: %s"
-#: rhodecode/controllers/admin/settings.py:133
+#: rhodecode/controllers/admin/settings.py:135
msgid "Whoosh reindex task scheduled"
msgstr "Tarefa de reindexação do whoosh agendada"
-#: rhodecode/controllers/admin/settings.py:164
+#: rhodecode/controllers/admin/settings.py:166
msgid "Updated application settings"
msgstr "Configurações da aplicação atualizadas"
-#: rhodecode/controllers/admin/settings.py:168
+#: rhodecode/controllers/admin/settings.py:170
#: rhodecode/controllers/admin/settings.py:301
-msgid "error occurred during updating application settings"
+#, fuzzy
+msgid "Error occurred during updating application settings"
msgstr "ocorreu um erro ao atualizar as configurações da aplicação"
-#: rhodecode/controllers/admin/settings.py:209
+#: rhodecode/controllers/admin/settings.py:216
#, fuzzy
msgid "Updated visualisation settings"
msgstr "Configurações da aplicação atualizadas"
-#: rhodecode/controllers/admin/settings.py:214
+#: rhodecode/controllers/admin/settings.py:221
#, fuzzy
-msgid "error occurred during updating visualisation settings"
+msgid "Error occurred during updating visualisation settings"
msgstr "ocorreu um erro ao atualizar as configurações da aplicação"
#: rhodecode/controllers/admin/settings.py:297
@@ -628,35 +693,36 @@ msgid "Updated hooks"
msgstr "Atualizados os ganchos"
#: rhodecode/controllers/admin/settings.py:327
-msgid "error occurred during hook creation"
+#, fuzzy
+msgid "Error occurred during hook creation"
msgstr "ocorreu um erro ao criar gancho"
#: rhodecode/controllers/admin/settings.py:346
msgid "Email task created"
msgstr "Tarefa de e-mail criada"
-#: rhodecode/controllers/admin/settings.py:408
+#: rhodecode/controllers/admin/settings.py:410
msgid "You can't edit this user since it's crucial for entire application"
msgstr "Você não pode editar esse usuário pois ele é crucial para toda a aplicação"
-#: rhodecode/controllers/admin/settings.py:448
+#: rhodecode/controllers/admin/settings.py:452
msgid "Your account was updated successfully"
msgstr "Sua conta foi atualizada com sucesso"
-#: rhodecode/controllers/admin/settings.py:463
+#: rhodecode/controllers/admin/settings.py:467
#: rhodecode/controllers/admin/users.py:198
-#, python-format
-msgid "error occurred during update of user %s"
+#, fuzzy, python-format
+msgid "Error occurred during update of user %s"
msgstr "ocorreu um erro ao atualizar o usuário %s"
#: rhodecode/controllers/admin/users.py:130
-#, python-format
-msgid "created user %s"
+#, fuzzy, python-format
+msgid "Created user %s"
msgstr "usuário %s criado"
#: rhodecode/controllers/admin/users.py:142
-#, python-format
-msgid "error occurred during creation of user %s"
+#, fuzzy, python-format
+msgid "Error occurred during creation of user %s"
msgstr "ocorreu um erro ao criar o usuário %s"
#: rhodecode/controllers/admin/users.py:176
@@ -664,7 +730,8 @@ msgid "User updated successfully"
msgstr "Usuário atualizado com sucesso"
#: rhodecode/controllers/admin/users.py:214
-msgid "successfully deleted user"
+#, fuzzy
+msgid "Successfully deleted user"
msgstr "usuário excluído com sucesso"
#: rhodecode/controllers/admin/users.py:219
@@ -694,7 +761,7 @@ msgid "Revoked 'repository fork' permission to user"
msgstr "Revogada permissão de 'criar repositório' ao usuário"
#: rhodecode/controllers/admin/users.py:298
-#: rhodecode/controllers/admin/users_groups.py:279
+#: rhodecode/controllers/admin/users_groups.py:281
#, fuzzy
msgid "An error occurred during permissions saving"
msgstr "Ocorreu um erro durante essa operação"
@@ -730,236 +797,238 @@ msgid "Removed ip from user"
msgstr "removido grupo de repositórios %s"
#: rhodecode/controllers/admin/users_groups.py:86
-#, python-format
-msgid "created users group %s"
+#, fuzzy, python-format
+msgid "Created user group %s"
msgstr "criado grupo de usuários %s"
#: rhodecode/controllers/admin/users_groups.py:97
-#, python-format
-msgid "error occurred during creation of users group %s"
+#, fuzzy, python-format
+msgid "Error occurred during creation of user group %s"
msgstr "ocorreu um erro ao criar o grupo de usuários %s"
-#: rhodecode/controllers/admin/users_groups.py:164
-#, python-format
-msgid "updated users group %s"
+#: rhodecode/controllers/admin/users_groups.py:166
+#, fuzzy, python-format
+msgid "Updated user group %s"
msgstr "grupo de usuários %s atualizado"
-#: rhodecode/controllers/admin/users_groups.py:186
-#, python-format
-msgid "error occurred during update of users group %s"
+#: rhodecode/controllers/admin/users_groups.py:188
+#, fuzzy, python-format
+msgid "Error occurred during update of user group %s"
msgstr "ocorreu um erro ao atualizar o grupo de usuários %s"
-#: rhodecode/controllers/admin/users_groups.py:203
-msgid "successfully deleted users group"
+#: rhodecode/controllers/admin/users_groups.py:205
+#, fuzzy
+msgid "Successfully deleted user group"
msgstr "grupo de usuários excluído com sucesso"
-#: rhodecode/controllers/admin/users_groups.py:208
-msgid "An error occurred during deletion of users group"
+#: rhodecode/controllers/admin/users_groups.py:210
+#, fuzzy
+msgid "An error occurred during deletion of user group"
msgstr "Ocorreu um erro ao excluir o grupo de usuários"
-#: rhodecode/controllers/admin/users_groups.py:257
+#: rhodecode/controllers/admin/users_groups.py:259
#, fuzzy
-msgid "Granted 'repository create' permission to users group"
+msgid "Granted 'repository create' permission to user group"
msgstr "Concedida permissão de 'criar repositório' ao usuário"
-#: rhodecode/controllers/admin/users_groups.py:262
+#: rhodecode/controllers/admin/users_groups.py:264
#, fuzzy
-msgid "Revoked 'repository create' permission to users group"
+msgid "Revoked 'repository create' permission to user group"
msgstr "Revogada permissão de 'criar repositório' ao usuário"
-#: rhodecode/controllers/admin/users_groups.py:268
+#: rhodecode/controllers/admin/users_groups.py:270
#, fuzzy
-msgid "Granted 'repository fork' permission to users group"
+msgid "Granted 'repository fork' permission to user group"
msgstr "Concedida permissão de 'criar repositório' ao usuário"
-#: rhodecode/controllers/admin/users_groups.py:273
+#: rhodecode/controllers/admin/users_groups.py:275
#, fuzzy
-msgid "Revoked 'repository fork' permission to users group"
+msgid "Revoked 'repository fork' permission to user group"
msgstr "Revogada permissão de 'criar repositório' ao usuário"
-#: rhodecode/lib/auth.py:509
+#: rhodecode/lib/auth.py:530
#, fuzzy, python-format
msgid "IP %s not allowed"
msgstr "seguidores"
-#: rhodecode/lib/auth.py:558
+#: rhodecode/lib/auth.py:579
msgid "You need to be a registered user to perform this action"
msgstr "Você precisa ser um usuário registrado para realizar essa ação"
-#: rhodecode/lib/auth.py:599
+#: rhodecode/lib/auth.py:620
msgid "You need to be a signed in to view this page"
msgstr "Você precisa estar logado para ver essa página"
-#: rhodecode/lib/diffs.py:74
-msgid "binary file"
+#: rhodecode/lib/diffs.py:66
+#, fuzzy
+msgid "Binary file"
msgstr "arquivo binário"
-#: rhodecode/lib/diffs.py:90
+#: rhodecode/lib/diffs.py:82
msgid "Changeset was too big and was cut off, use diff menu to display this diff"
msgstr ""
"Conjunto de mudanças é grande demais e foi cortado, use o menu de "
"diferenças para ver as diferenças"
-#: rhodecode/lib/diffs.py:100
+#: rhodecode/lib/diffs.py:92
msgid "No changes detected"
msgstr "Nenhuma alteração detectada"
-#: rhodecode/lib/helpers.py:374
+#: rhodecode/lib/helpers.py:394
#, python-format
msgid "%a, %d %b %Y %H:%M:%S"
msgstr ""
-#: rhodecode/lib/helpers.py:486
+#: rhodecode/lib/helpers.py:506
msgid "True"
msgstr "Verdadeiro"
-#: rhodecode/lib/helpers.py:490
+#: rhodecode/lib/helpers.py:509
msgid "False"
msgstr "Falso"
-#: rhodecode/lib/helpers.py:530
+#: rhodecode/lib/helpers.py:547
#, fuzzy, python-format
msgid "Deleted branch: %s"
msgstr "excluído o repositório %s"
-#: rhodecode/lib/helpers.py:533
+#: rhodecode/lib/helpers.py:550
#, fuzzy, python-format
msgid "Created tag: %s"
msgstr "usuário %s criado"
-#: rhodecode/lib/helpers.py:546
+#: rhodecode/lib/helpers.py:563
msgid "Changeset not found"
msgstr "Conjunto de alterações não encontrado"
-#: rhodecode/lib/helpers.py:589
+#: rhodecode/lib/helpers.py:615
#, python-format
msgid "Show all combined changesets %s->%s"
msgstr "Ver todos os conjuntos de mudanças combinados %s->%s"
-#: rhodecode/lib/helpers.py:595
+#: rhodecode/lib/helpers.py:621
msgid "compare view"
msgstr "comparar exibir"
-#: rhodecode/lib/helpers.py:615
+#: rhodecode/lib/helpers.py:641
msgid "and"
msgstr "e"
-#: rhodecode/lib/helpers.py:616
+#: rhodecode/lib/helpers.py:642
#, python-format
msgid "%s more"
msgstr "%s mais"
-#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51
+#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44
msgid "revisions"
msgstr "revisões"
-#: rhodecode/lib/helpers.py:641
+#: rhodecode/lib/helpers.py:667
#, fuzzy, python-format
msgid "fork name %s"
msgstr "nome da bifurcação"
-#: rhodecode/lib/helpers.py:658
-#: rhodecode/templates/pullrequests/pullrequest_show.html:4
-#: rhodecode/templates/pullrequests/pullrequest_show.html:12
+#: rhodecode/lib/helpers.py:684
+#: rhodecode/templates/pullrequests/pullrequest_show.html:8
#, python-format
msgid "Pull request #%s"
msgstr ""
-#: rhodecode/lib/helpers.py:664
+#: rhodecode/lib/helpers.py:690
msgid "[deleted] repository"
msgstr "repositório [excluído]"
-#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676
+#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702
msgid "[created] repository"
msgstr "repositório [criado]"
-#: rhodecode/lib/helpers.py:668
+#: rhodecode/lib/helpers.py:694
msgid "[created] repository as fork"
msgstr "repositório [criado] como uma bifurcação"
-#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678
+#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704
msgid "[forked] repository"
msgstr "repositório [bifurcado]"
-#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680
+#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706
msgid "[updated] repository"
msgstr "repositório [atualizado]"
-#: rhodecode/lib/helpers.py:674
+#: rhodecode/lib/helpers.py:700
msgid "[delete] repository"
msgstr "[excluir] repositório"
-#: rhodecode/lib/helpers.py:682
+#: rhodecode/lib/helpers.py:708
#, fuzzy
msgid "[created] user"
msgstr "usuário %s criado"
-#: rhodecode/lib/helpers.py:684
+#: rhodecode/lib/helpers.py:710
#, fuzzy
msgid "[updated] user"
msgstr "grupo de usuários %s atualizado"
-#: rhodecode/lib/helpers.py:686
+#: rhodecode/lib/helpers.py:712
#, fuzzy
-msgid "[created] users group"
+msgid "[created] user group"
msgstr "criado grupo de usuários %s"
-#: rhodecode/lib/helpers.py:688
+#: rhodecode/lib/helpers.py:714
#, fuzzy
-msgid "[updated] users group"
+msgid "[updated] user group"
msgstr "grupo de usuários %s atualizado"
-#: rhodecode/lib/helpers.py:690
+#: rhodecode/lib/helpers.py:716
#, fuzzy
msgid "[commented] on revision in repository"
msgstr "repositório [criado]"
-#: rhodecode/lib/helpers.py:692
+#: rhodecode/lib/helpers.py:718
#, fuzzy
msgid "[commented] on pull request for"
msgstr "repositório [criado]"
-#: rhodecode/lib/helpers.py:694
+#: rhodecode/lib/helpers.py:720
#, fuzzy
msgid "[closed] pull request for"
msgstr "repositório [criado]"
-#: rhodecode/lib/helpers.py:696
+#: rhodecode/lib/helpers.py:722
msgid "[pushed] into"
msgstr "[realizado push] para"
-#: rhodecode/lib/helpers.py:698
+#: rhodecode/lib/helpers.py:724
#, fuzzy
msgid "[committed via RhodeCode] into repository"
msgstr "[realizado commit via RhodeCode] para"
-#: rhodecode/lib/helpers.py:700
+#: rhodecode/lib/helpers.py:726
#, fuzzy
msgid "[pulled from remote] into repository"
msgstr "[realizado pull remoto] para"
-#: rhodecode/lib/helpers.py:702
+#: rhodecode/lib/helpers.py:728
msgid "[pulled] from"
msgstr "[realizado pull] a partir de"
-#: rhodecode/lib/helpers.py:704
+#: rhodecode/lib/helpers.py:730
msgid "[started following] repository"
msgstr "[passou a seguir] o repositório"
-#: rhodecode/lib/helpers.py:706
+#: rhodecode/lib/helpers.py:732
msgid "[stopped following] repository"
msgstr "[parou de seguir] o repositório"
-#: rhodecode/lib/helpers.py:884
+#: rhodecode/lib/helpers.py:910
#, python-format
msgid " and %s more"
msgstr " e mais %s"
-#: rhodecode/lib/helpers.py:888
+#: rhodecode/lib/helpers.py:914
msgid "No Files"
msgstr "Nenhum Arquivo"
-#: rhodecode/lib/helpers.py:1164
+#: rhodecode/lib/helpers.py:1198
#, python-format
msgid ""
"%s repository is not mapped to db perhaps it was created or renamed from "
@@ -970,200 +1039,245 @@ msgstr ""
"renomeado a partir do sistema de arquivos. Por favor execute a aplicação "
"outra vez para varrer novamente por repositórios"
-#: rhodecode/lib/utils2.py:403
+#: rhodecode/lib/unionrepo.py:193
+#, fuzzy
+msgid "cannot create new union repository"
+msgstr "repositório [criado]"
+
+#: rhodecode/lib/utils2.py:411
#, python-format
msgid "%d year"
msgid_plural "%d years"
msgstr[0] "%d ano"
msgstr[1] "%d anos"
-#: rhodecode/lib/utils2.py:404
+#: rhodecode/lib/utils2.py:412
#, python-format
msgid "%d month"
msgid_plural "%d months"
msgstr[0] "%d mês"
msgstr[1] "%d meses"
-#: rhodecode/lib/utils2.py:405
+#: rhodecode/lib/utils2.py:413
#, python-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dia"
msgstr[1] "%d dias"
-#: rhodecode/lib/utils2.py:406
+#: rhodecode/lib/utils2.py:414
#, python-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: rhodecode/lib/utils2.py:407
+#: rhodecode/lib/utils2.py:415
#, python-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: rhodecode/lib/utils2.py:408
+#: rhodecode/lib/utils2.py:416
#, python-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: rhodecode/lib/utils2.py:424
+#: rhodecode/lib/utils2.py:432
#, fuzzy, python-format
msgid "in %s"
msgstr "na linha %s"
-#: rhodecode/lib/utils2.py:426
+#: rhodecode/lib/utils2.py:434
#, python-format
msgid "%s ago"
msgstr "%s atrás"
-#: rhodecode/lib/utils2.py:428
+#: rhodecode/lib/utils2.py:436
#, fuzzy, python-format
msgid "in %s and %s"
msgstr "%s e %s atrás"
-#: rhodecode/lib/utils2.py:431
+#: rhodecode/lib/utils2.py:439
#, python-format
msgid "%s and %s ago"
msgstr "%s e %s atrás"
-#: rhodecode/lib/utils2.py:434
+#: rhodecode/lib/utils2.py:442
msgid "just now"
msgstr "agora há pouco"
-#: rhodecode/lib/celerylib/tasks.py:270
-msgid "password reset link"
-msgstr "link de reinicialização de senha"
-
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388
#, fuzzy
msgid "Repository no access"
msgstr "repositórios"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389
#, fuzzy
msgid "Repository read access"
msgstr "Esse repositório já existe"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390
#, fuzzy
msgid "Repository write access"
msgstr "repositórios"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391
#, fuzzy
msgid "Repository admin access"
msgstr "repositórios"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294
#, fuzzy
msgid "Repositories Group no access"
msgstr "grupos de repositórios"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295
#, fuzzy
msgid "Repositories Group read access"
msgstr "grupos de repositórios"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296
#, fuzzy
msgid "Repositories Group write access"
msgstr "grupos de repositórios"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297
#, fuzzy
msgid "Repositories Group admin access"
msgstr "grupos de repositórios"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398
#, fuzzy
msgid "RhodeCode Administrator"
msgstr "Administração de usuários"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399
#, fuzzy
msgid "Repository creation disabled"
msgstr "Criação de repositório"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400
#, fuzzy
msgid "Repository creation enabled"
msgstr "Criação de repositório"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401
#, fuzzy
msgid "Repository forking disabled"
msgstr "Criação de repositório"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402
#, fuzzy
msgid "Repository forking enabled"
msgstr "Criação de repositório"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403
#, fuzzy
msgid "Register disabled"
msgstr "desabilitado"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404
msgid "Register new user with RhodeCode with manual activation"
msgstr ""
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407
msgid "Register new user with RhodeCode with auto activation"
msgstr ""
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838
msgid "Not Reviewed"
msgstr ""
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839
#, fuzzy
msgid "Approved"
msgstr "removidos"
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840
msgid "Rejected"
msgstr ""
#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
-#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841
msgid "Under Review"
msgstr ""
-#: rhodecode/model/comment.py:109
+#: rhodecode/model/comment.py:75
#, python-format
msgid "on line %s"
msgstr "na linha %s"
-#: rhodecode/model/comment.py:176
+#: rhodecode/model/comment.py:219
msgid "[Mention]"
msgstr "[Menção]"
+#: rhodecode/model/db.py:1252
+msgid "top level"
+msgstr ""
+
+#: rhodecode/model/db.py:1393
+#, fuzzy
+msgid "Repository group no access"
+msgstr "grupos de repositórios"
+
+#: rhodecode/model/db.py:1394
+#, fuzzy
+msgid "Repository group read access"
+msgstr "grupos de repositórios"
+
+#: rhodecode/model/db.py:1395
+#, fuzzy
+msgid "Repository group write access"
+msgstr "grupos de repositórios"
+
+#: rhodecode/model/db.py:1396
+#, fuzzy
+msgid "Repository group admin access"
+msgstr "grupos de repositórios"
+
#: rhodecode/model/forms.py:43
msgid "Please enter a login"
msgstr "Por favor entre um login"
@@ -1182,63 +1296,64 @@ msgstr "Por favor entre com uma senha"
msgid "Enter %(min)i characters or more"
msgstr "Entre com %(min)i caracteres ou mais"
-#: rhodecode/model/notification.py:220
+#: rhodecode/model/notification.py:224
#, fuzzy, python-format
-msgid "commented on commit at %(when)s"
+msgid "%(user)s commented on changeset at %(when)s"
msgstr "comentado no commit"
-#: rhodecode/model/notification.py:221
+#: rhodecode/model/notification.py:225
#, fuzzy, python-format
-msgid "sent message at %(when)s"
+msgid "%(user)s sent message at %(when)s"
msgstr "mensagem enviada"
-#: rhodecode/model/notification.py:222
+#: rhodecode/model/notification.py:226
#, fuzzy, python-format
-msgid "mentioned you at %(when)s"
+msgid "%(user)s mentioned you at %(when)s"
msgstr "mencionou você"
-#: rhodecode/model/notification.py:223
+#: rhodecode/model/notification.py:227
#, fuzzy, python-format
-msgid "registered in RhodeCode at %(when)s"
+msgid "%(user)s registered in RhodeCode at %(when)s"
msgstr "registrado no RhodeCode"
-#: rhodecode/model/notification.py:224
+#: rhodecode/model/notification.py:228
#, fuzzy, python-format
-msgid "opened new pull request at %(when)s"
+msgid "%(user)s opened new pull request at %(when)s"
msgstr "comentado no commit"
-#: rhodecode/model/notification.py:225
+#: rhodecode/model/notification.py:229
#, fuzzy, python-format
-msgid "commented on pull request at %(when)s"
+msgid "%(user)s commented on pull request at %(when)s"
msgstr "comentado no commit"
-#: rhodecode/model/pull_request.py:100
+#: rhodecode/model/pull_request.py:104
#, python-format
-msgid "%(user)s wants you to review pull request #%(pr_id)s"
+msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
msgstr ""
-#: rhodecode/model/scm.py:556
+#: rhodecode/model/scm.py:598
#, fuzzy
msgid "latest tip"
msgstr "último login"
-#: rhodecode/model/user.py:231
-msgid "new user registration"
+#: rhodecode/model/user.py:232
+#, fuzzy
+msgid "New user registration"
msgstr "registro de novo usuário"
-#: rhodecode/model/user.py:256 rhodecode/model/user.py:280
+#: rhodecode/model/user.py:257 rhodecode/model/user.py:281
msgid "You can't Edit this user since it's crucial for entire application"
msgstr ""
"Você não pode Editar esse usuário, pois ele é crucial para toda a "
"aplicação"
-#: rhodecode/model/user.py:302
+#: rhodecode/model/user.py:303
msgid "You can't remove this user since it's crucial for entire application"
msgstr ""
"Você não pode remover esse usuário, pois ele é crucial para toda a "
"aplicação"
-#: rhodecode/model/user.py:308
+#: rhodecode/model/user.py:309
#, python-format
msgid ""
"user \"%s\" still owns %s repositories and cannot be removed. Switch "
@@ -1247,21 +1362,36 @@ msgstr ""
"usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. "
"Troque os donos ou remova esses repositórios. %s"
-#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38
+#: rhodecode/model/user.py:334
+#, fuzzy
+msgid "Password reset link"
+msgstr "link de reinicialização de senha"
+
+#: rhodecode/model/user.py:366
+#, fuzzy
+msgid "Your new password"
+msgstr "Nova senha"
+
+#: rhodecode/model/user.py:367
+#, python-format
+msgid "Your new RhodeCode password:%s"
+msgstr ""
+
+#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39
msgid "Value cannot be an empty list"
msgstr ""
-#: rhodecode/model/validators.py:84
+#: rhodecode/model/validators.py:85
#, fuzzy, python-format
msgid "Username \"%(username)s\" already exists"
msgstr "Esse nome de usuário já existe"
-#: rhodecode/model/validators.py:86
+#: rhodecode/model/validators.py:87
#, python-format
msgid "Username \"%(username)s\" is forbidden"
msgstr ""
-#: rhodecode/model/validators.py:88
+#: rhodecode/model/validators.py:89
msgid ""
"Username may only contain alphanumeric characters underscores, periods or"
" dashes and must begin with alphanumeric character"
@@ -1269,127 +1399,134 @@ msgstr ""
"Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, "
"pontos e hífens e deve iniciar com caractere alfanumérico"
-#: rhodecode/model/validators.py:116
+#: rhodecode/model/validators.py:117
#, fuzzy, python-format
msgid "Username %(username)s is not valid"
msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido"
-#: rhodecode/model/validators.py:135
+#: rhodecode/model/validators.py:136
#, fuzzy
-msgid "Invalid users group name"
+msgid "Invalid user group name"
msgstr "nome de usuário inválido"
-#: rhodecode/model/validators.py:136
+#: rhodecode/model/validators.py:137
#, fuzzy, python-format
-msgid "Users group \"%(usersgroup)s\" already exists"
+msgid "User group \"%(usergroup)s\" already exists"
msgstr "Esse grupo de usuários já existe"
-#: rhodecode/model/validators.py:138
+#: rhodecode/model/validators.py:139
+#, fuzzy
msgid ""
-"users group name may only contain alphanumeric characters underscores, "
+"user group name may only contain alphanumeric characters underscores, "
"periods or dashes and must begin with alphanumeric character"
msgstr ""
"Nome de grupo de repositório pode conter somente caracteres "
"alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere "
"alfanumérico"
-#: rhodecode/model/validators.py:176
+#: rhodecode/model/validators.py:177
msgid "Cannot assign this group as parent"
msgstr "Não é possível associar esse grupo como progenitor"
-#: rhodecode/model/validators.py:177
+#: rhodecode/model/validators.py:178
#, fuzzy, python-format
msgid "Group \"%(group_name)s\" already exists"
msgstr "Esse nome de usuário já existe"
-#: rhodecode/model/validators.py:179
+#: rhodecode/model/validators.py:180
#, fuzzy, python-format
msgid "Repository with name \"%(group_name)s\" already exists"
msgstr "Já existe um repositório com esse nome"
-#: rhodecode/model/validators.py:237
+#: rhodecode/model/validators.py:238
#, fuzzy
msgid "Invalid characters (non-ascii) in password"
msgstr "Caracteres inválidos na senha"
-#: rhodecode/model/validators.py:252
+#: rhodecode/model/validators.py:253
msgid "Passwords do not match"
msgstr "Senhas não conferem"
-#: rhodecode/model/validators.py:269
+#: rhodecode/model/validators.py:270
msgid "invalid password"
msgstr "senha inválida"
-#: rhodecode/model/validators.py:270
+#: rhodecode/model/validators.py:271
msgid "invalid user name"
msgstr "nome de usuário inválido"
-#: rhodecode/model/validators.py:271
+#: rhodecode/model/validators.py:272
msgid "Your account is disabled"
msgstr "Sua conta está desabilitada"
-#: rhodecode/model/validators.py:315
+#: rhodecode/model/validators.py:316
#, fuzzy, python-format
msgid "Repository name %(repo)s is disallowed"
msgstr "Esse nome de repositório não é permitido"
-#: rhodecode/model/validators.py:317
+#: rhodecode/model/validators.py:318
#, fuzzy, python-format
msgid "Repository named %(repo)s already exists"
msgstr "Já existe um repositório com esse nome"
-#: rhodecode/model/validators.py:318
+#: rhodecode/model/validators.py:319
#, fuzzy, python-format
msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
msgstr "Esse repositório já existe em um grupo \"%s\""
-#: rhodecode/model/validators.py:320
+#: rhodecode/model/validators.py:321
#, fuzzy, python-format
-msgid "Repositories group with name \"%(repo)s\" already exists"
+msgid "Repository group with name \"%(repo)s\" already exists"
msgstr "Já existe um repositório com esse nome"
-#: rhodecode/model/validators.py:433
+#: rhodecode/model/validators.py:438
msgid "invalid clone url"
msgstr "URL de clonagem inválida"
-#: rhodecode/model/validators.py:434
+#: rhodecode/model/validators.py:439
#, fuzzy
msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
msgstr "URL de clonagem inválida, forneça uma URL válida de clonagem http\\s"
-#: rhodecode/model/validators.py:459
+#: rhodecode/model/validators.py:464
#, fuzzy
msgid "Fork have to be the same type as parent"
msgstr "Bifurcação precisa ser do mesmo tipo que o original"
-#: rhodecode/model/validators.py:474
+#: rhodecode/model/validators.py:479
#, fuzzy
msgid "You don't have permissions to create repository in this group"
msgstr "Você não tem permissão para ver esta página"
-#: rhodecode/model/validators.py:501
+#: rhodecode/model/validators.py:481
+#, fuzzy
+msgid "no permission to create repository in root location"
+msgstr "Você não tem permissão para ver esta página"
+
+#: rhodecode/model/validators.py:518
#, fuzzy
msgid "You don't have permissions to create a group in this location"
msgstr "Você não tem permissão para ver esta página"
-#: rhodecode/model/validators.py:540
-msgid "This username or users group name is not valid"
+#: rhodecode/model/validators.py:557
+#, fuzzy
+msgid "This username or user group name is not valid"
msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido"
-#: rhodecode/model/validators.py:636
+#: rhodecode/model/validators.py:650
msgid "This is not a valid path"
msgstr "Esse não é um caminho válido"
-#: rhodecode/model/validators.py:651
+#: rhodecode/model/validators.py:665
msgid "This e-mail address is already taken"
msgstr "Esse endereço de e-mail já está tomado"
-#: rhodecode/model/validators.py:671
+#: rhodecode/model/validators.py:685
#, fuzzy, python-format
msgid "e-mail \"%(email)s\" does not exist."
msgstr "Esse endereço de e-mail não existe."
-#: rhodecode/model/validators.py:708
+#: rhodecode/model/validators.py:722
msgid ""
"The LDAP Login attribute of the CN must be specified - this is the name "
"of the attribute that is equivalent to \"username\""
@@ -1397,21 +1534,25 @@ msgstr ""
"O atributo de login LDAP do CN deve ser especificado - isto é o nome do "
"atributo que é equivalente ao 'nome de usuário'"
-#: rhodecode/model/validators.py:727
+#: rhodecode/model/validators.py:735
#, python-format
msgid "Revisions %(revs)s are already part of pull request or have set status"
msgstr ""
-#: rhodecode/model/validators.py:759
+#: rhodecode/model/validators.py:767
msgid "Please enter a valid IPv4 or IpV6 address"
msgstr ""
-#: rhodecode/model/validators.py:760
+#: rhodecode/model/validators.py:768
#, python-format
msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
msgstr ""
-#: rhodecode/templates/index.html:3
+#: rhodecode/model/validators.py:800
+msgid "Key name can only consist of letters, underscore, dash or numbers"
+msgstr ""
+
+#: rhodecode/templates/index.html:5
msgid "Dashboard"
msgstr "Painel de Controle"
@@ -1420,223 +1561,229 @@ msgstr "Painel de Controle"
#: rhodecode/templates/admin/repos/repos.html:9
#: rhodecode/templates/admin/users/user_edit_my_account.html:31
#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/bookmarks/bookmarks.html:10
+#: rhodecode/templates/bookmarks/bookmarks.html:9
#: rhodecode/templates/branches/branches.html:9
#: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:49
-#: rhodecode/templates/journal/journal.html:50
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/templates/journal/journal.html:46
+#: rhodecode/templates/journal/journal.html:47
+#: rhodecode/templates/tags/tags.html:9
msgid "quick filter..."
msgstr "filtro rápido..."
#: rhodecode/templates/index_base.html:6
#: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:239
msgid "repositories"
msgstr "repositórios"
-#: rhodecode/templates/index_base.html:14
-#: rhodecode/templates/index_base.html:17
+#: rhodecode/templates/index_base.html:13
+#: rhodecode/templates/index_base.html:18
#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
#: rhodecode/templates/admin/repos/repos.html:21
msgid "Add repository"
msgstr "Adicionar repositório"
-#: rhodecode/templates/index_base.html:23
+#: rhodecode/templates/index_base.html:15
+#: rhodecode/templates/index_base.html:20
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31
+#, fuzzy
+msgid "Add group"
+msgstr "editar grupo de repositórios"
+
+#: rhodecode/templates/index_base.html:27
#, fuzzy
msgid "Edit group"
msgstr "editar grupo de repositórios"
-#: rhodecode/templates/index_base.html:23
+#: rhodecode/templates/index_base.html:27
msgid "You have admin right to this group, and can edit it"
msgstr ""
-#: rhodecode/templates/index_base.html:36
+#: rhodecode/templates/index_base.html:40
#: rhodecode/templates/index_base.html:140
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
#: rhodecode/templates/admin/users_groups/users_group_add.html:32
#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
+#: rhodecode/templates/admin/users_groups/users_groups.html:34
msgid "Group name"
msgstr "Nome do grupo"
-#: rhodecode/templates/index_base.html:37
-#: rhodecode/templates/index_base.html:79
+#: rhodecode/templates/index_base.html:41
+#: rhodecode/templates/index_base.html:83
#: rhodecode/templates/index_base.html:142
#: rhodecode/templates/index_base.html:180
-#: rhodecode/templates/index_base.html:273
+#: rhodecode/templates/index_base.html:270
#: rhodecode/templates/admin/repos/repo_add_base.html:56
#: rhodecode/templates/admin/repos/repo_edit.html:75
#: rhodecode/templates/admin/repos/repos.html:73
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:46
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
-#: rhodecode/templates/forks/fork.html:59
-#: rhodecode/templates/settings/repo_settings.html:66
-#: rhodecode/templates/summary/summary.html:114
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
+#: rhodecode/templates/forks/fork.html:56
+#: rhodecode/templates/pullrequests/pullrequest.html:101
+#: rhodecode/templates/summary/summary.html:106
msgid "Description"
msgstr "Descrição"
-#: rhodecode/templates/index_base.html:47
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
-msgid "Repositories group"
+#: rhodecode/templates/index_base.html:51
+#: rhodecode/templates/admin/permissions/permissions.html:55
+#: rhodecode/templates/admin/repos/repo_add_base.html:29
+#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
+#: rhodecode/templates/forks/fork.html:47
+msgid "Repository group"
msgstr "Grupo de repositórios"
-#: rhodecode/templates/index_base.html:78
+#: rhodecode/templates/index_base.html:82
#: rhodecode/templates/index_base.html:178
-#: rhodecode/templates/index_base.html:271
-#: rhodecode/templates/admin/permissions/permissions.html:117
+#: rhodecode/templates/index_base.html:268
#: rhodecode/templates/admin/repos/repo_add_base.html:9
#: rhodecode/templates/admin/repos/repo_edit.html:32
#: rhodecode/templates/admin/repos/repos.html:71
-#: rhodecode/templates/admin/users/user_edit.html:200
-#: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:211
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:184
-#: rhodecode/templates/bookmarks/bookmarks.html:36
+#: rhodecode/templates/admin/users/user_edit_my_account.html:172
+#: rhodecode/templates/base/perms_summary.html:14
+#: rhodecode/templates/bookmarks/bookmarks.html:34
#: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches.html:47
#: rhodecode/templates/branches/branches_data.html:6
#: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:201
-#: rhodecode/templates/journal/journal.html:305
-#: rhodecode/templates/settings/repo_settings.html:31
-#: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:132
-#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/journal/journal.html:193
+#: rhodecode/templates/journal/journal.html:296
+#: rhodecode/templates/summary/summary.html:55
+#: rhodecode/templates/summary/summary.html:124
+#: rhodecode/templates/tags/tags.html:48
#: rhodecode/templates/tags/tags_data.html:6
msgid "Name"
msgstr "Nome"
-#: rhodecode/templates/index_base.html:80
+#: rhodecode/templates/index_base.html:84
msgid "Last change"
msgstr "Última alteração"
-#: rhodecode/templates/index_base.html:81
+#: rhodecode/templates/index_base.html:85
#: rhodecode/templates/index_base.html:183
-#: rhodecode/templates/index_base.html:276
+#: rhodecode/templates/index_base.html:273
#: rhodecode/templates/admin/repos/repos.html:74
-#: rhodecode/templates/admin/users/user_edit_my_account.html:213
-#: rhodecode/templates/journal/journal.html:203
-#: rhodecode/templates/journal/journal.html:307
+#: rhodecode/templates/admin/users/user_edit_my_account.html:174
+#: rhodecode/templates/journal/journal.html:195
+#: rhodecode/templates/journal/journal.html:298
msgid "Tip"
msgstr "Ponta"
-#: rhodecode/templates/index_base.html:82
+#: rhodecode/templates/index_base.html:86
#: rhodecode/templates/index_base.html:185
-#: rhodecode/templates/index_base.html:278
+#: rhodecode/templates/index_base.html:275
#: rhodecode/templates/admin/repos/repo_edit.html:121
#: rhodecode/templates/admin/repos/repos.html:76
msgid "Owner"
msgstr "Dono"
-#: rhodecode/templates/index_base.html:83
-#: rhodecode/templates/summary/summary.html:48
-#: rhodecode/templates/summary/summary.html:51
-msgid "RSS"
-msgstr "RSS"
-
-#: rhodecode/templates/index_base.html:84
+#: rhodecode/templates/index_base.html:87
msgid "Atom"
msgstr "Atom"
#: rhodecode/templates/index_base.html:171
-#: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/index_base.html:300
+#: rhodecode/templates/index_base.html:209
+#: rhodecode/templates/index_base.html:296
#: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:235
+#: rhodecode/templates/admin/users/user_edit_my_account.html:196
#: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:225
-#: rhodecode/templates/journal/journal.html:329
-#: rhodecode/templates/tags/tags.html:77
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/branches/branches.html:73
+#: rhodecode/templates/journal/journal.html:217
+#: rhodecode/templates/journal/journal.html:320
+#: rhodecode/templates/tags/tags.html:74
msgid "Click to sort ascending"
msgstr "Clique para ordenar em ordem crescente"
#: rhodecode/templates/index_base.html:172
-#: rhodecode/templates/index_base.html:212
-#: rhodecode/templates/index_base.html:301
+#: rhodecode/templates/index_base.html:210
+#: rhodecode/templates/index_base.html:297
#: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:236
+#: rhodecode/templates/admin/users/user_edit_my_account.html:197
#: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:226
-#: rhodecode/templates/journal/journal.html:330
-#: rhodecode/templates/tags/tags.html:78
+#: rhodecode/templates/bookmarks/bookmarks.html:59
+#: rhodecode/templates/branches/branches.html:74
+#: rhodecode/templates/journal/journal.html:218
+#: rhodecode/templates/journal/journal.html:321
+#: rhodecode/templates/tags/tags.html:75
msgid "Click to sort descending"
msgstr "Clique para ordenar em ordem descrescente"
#: rhodecode/templates/index_base.html:181
-#: rhodecode/templates/index_base.html:274
+#: rhodecode/templates/index_base.html:271
msgid "Last Change"
msgstr "Última Alteração"
-#: rhodecode/templates/index_base.html:213
-#: rhodecode/templates/index_base.html:302
+#: rhodecode/templates/index_base.html:211
#: rhodecode/templates/admin/repos/repos.html:99
-#: rhodecode/templates/admin/users/user_edit_my_account.html:237
+#: rhodecode/templates/admin/users/user_edit_my_account.html:198
#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:227
-#: rhodecode/templates/journal/journal.html:331
-#: rhodecode/templates/tags/tags.html:79
+#: rhodecode/templates/bookmarks/bookmarks.html:60
+#: rhodecode/templates/branches/branches.html:75
+#: rhodecode/templates/journal/journal.html:219
+#: rhodecode/templates/journal/journal.html:322
+#: rhodecode/templates/tags/tags.html:76
msgid "No records found."
msgstr "Nenhum registro encontrado."
-#: rhodecode/templates/index_base.html:214
-#: rhodecode/templates/index_base.html:303
+#: rhodecode/templates/index_base.html:212
+#: rhodecode/templates/index_base.html:299
#: rhodecode/templates/admin/repos/repos.html:100
-#: rhodecode/templates/admin/users/user_edit_my_account.html:238
+#: rhodecode/templates/admin/users/user_edit_my_account.html:199
#: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:228
-#: rhodecode/templates/journal/journal.html:332
-#: rhodecode/templates/tags/tags.html:80
+#: rhodecode/templates/bookmarks/bookmarks.html:61
+#: rhodecode/templates/branches/branches.html:76
+#: rhodecode/templates/journal/journal.html:220
+#: rhodecode/templates/journal/journal.html:323
+#: rhodecode/templates/tags/tags.html:77
msgid "Data error."
msgstr "Erro de dados."
-#: rhodecode/templates/index_base.html:215
-#: rhodecode/templates/index_base.html:304
+#: rhodecode/templates/index_base.html:213
+#: rhodecode/templates/index_base.html:300
#: rhodecode/templates/admin/repos/repos.html:101
-#: rhodecode/templates/admin/users/user_edit_my_account.html:105
-#: rhodecode/templates/admin/users/user_edit_my_account.html:239
+#: rhodecode/templates/admin/users/user_edit_my_account.html:58
+#: rhodecode/templates/admin/users/user_edit_my_account.html:200
#: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:229
-#: rhodecode/templates/journal/journal.html:333
-#: rhodecode/templates/tags/tags.html:81
+#: rhodecode/templates/bookmarks/bookmarks.html:62
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:221
+#: rhodecode/templates/journal/journal.html:324
+#: rhodecode/templates/tags/tags.html:78
msgid "Loading..."
msgstr "Carregando..."
-#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
-msgid "Sign In"
+#: rhodecode/templates/index_base.html:298
+#, fuzzy
+msgid "No repositories found."
+msgstr "grupos de repositórios"
+
+#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227
+msgid "Log In"
msgstr "Entrar"
#: rhodecode/templates/login.html:21
-msgid "Sign In to"
-msgstr "Entrar em"
+#, python-format
+msgid "Log In to %s"
+msgstr ""
#: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
#: rhodecode/templates/admin/admin_log.html:5
#: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:54
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
-#: rhodecode/templates/base/base.html:89
-#: rhodecode/templates/summary/summary.html:131
+#: rhodecode/templates/admin/users/user_edit.html:57
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31
+#: rhodecode/templates/admin/users/users.html:77
+#: rhodecode/templates/base/base.html:203
+#: rhodecode/templates/summary/summary.html:123
msgid "Username"
msgstr "Nome de usuário"
#: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
#: rhodecode/templates/admin/ldap/ldap.html:46
#: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:98
+#: rhodecode/templates/base/base.html:212
msgid "Password"
msgstr "Senha"
@@ -1644,17 +1791,22 @@ msgstr "Senha"
msgid "Remember me"
msgstr "Lembre-se de mim"
+#: rhodecode/templates/login.html:54
+msgid "Sign In"
+msgstr "Entrar"
+
#: rhodecode/templates/login.html:60
msgid "Forgot your password ?"
msgstr "Esqueceu sua senha ?"
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223
msgid "Don't have an account ?"
msgstr "Não possui uma conta ?"
#: rhodecode/templates/password_reset.html:5
-msgid "Reset your password"
-msgstr "Reinicializar sua senha"
+#, fuzzy
+msgid "Password Reset"
+msgstr "link de reinicialização de senha"
#: rhodecode/templates/password_reset.html:11
msgid "Reset your password to"
@@ -1688,23 +1840,23 @@ msgstr "Repita a senha"
#: rhodecode/templates/register.html:47
#: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57
+#: rhodecode/templates/admin/users/user_edit.html:97
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
msgid "First Name"
msgstr "Primeiro Nome"
#: rhodecode/templates/register.html:56
#: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:103
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66
+#: rhodecode/templates/admin/users/user_edit.html:106
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
msgid "Last Name"
msgstr "Último Nome"
#: rhodecode/templates/register.html:65
#: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:112
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75
-#: rhodecode/templates/summary/summary.html:133
+#: rhodecode/templates/admin/users/user_edit.html:115
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
+#: rhodecode/templates/summary/summary.html:125
msgid "Email"
msgstr "E-mail"
@@ -1716,44 +1868,31 @@ msgstr "Sua conta será ativada logo após o registro ser concluído"
msgid "Your account must wait for activation by administrator"
msgstr "Sua conta precisa esperar ativação por um administrador"
-#: rhodecode/templates/repo_switcher_list.html:11
+#: rhodecode/templates/repo_switcher_list.html:10
#: rhodecode/templates/admin/defaults/defaults.html:44
#: rhodecode/templates/admin/repos/repo_add_base.html:65
#: rhodecode/templates/admin/repos/repo_edit.html:85
-#: rhodecode/templates/settings/repo_settings.html:76
+#: rhodecode/templates/data_table/_dt_elements.html:61
+#: rhodecode/templates/summary/summary.html:77
msgid "Private repository"
msgstr "Repositório privado"
-#: rhodecode/templates/repo_switcher_list.html:16
+#: rhodecode/templates/repo_switcher_list.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:63
+#: rhodecode/templates/summary/summary.html:79
msgid "Public repository"
msgstr "Repositório público"
-#: rhodecode/templates/switch_to_list.html:3
-#: rhodecode/templates/branches/branches.html:14
-msgid "branches"
-msgstr "ramos"
-
#: rhodecode/templates/switch_to_list.html:10
#: rhodecode/templates/branches/branches_data.html:57
msgid "There are no branches yet"
msgstr "Ainda não há ramos"
-#: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/shortlog/shortlog_data.html:10
-#: rhodecode/templates/tags/tags.html:15
-msgid "tags"
-msgstr "etiquetas"
-
#: rhodecode/templates/switch_to_list.html:22
#: rhodecode/templates/tags/tags_data.html:38
msgid "There are no tags yet"
msgstr "Ainda não há etiquetas"
-#: rhodecode/templates/switch_to_list.html:28
-#: rhodecode/templates/bookmarks/bookmarks.html:15
-msgid "bookmarks"
-msgstr "marcadores"
-
#: rhodecode/templates/switch_to_list.html:35
#: rhodecode/templates/bookmarks/bookmarks_data.html:32
msgid "There are no bookmarks yet"
@@ -1761,6 +1900,7 @@ msgstr "Ainda não há marcadores"
#: rhodecode/templates/admin/admin.html:5
#: rhodecode/templates/admin/admin.html:13
+#: rhodecode/templates/base/base.html:68
msgid "Admin journal"
msgstr "Diário do administrador"
@@ -1785,9 +1925,12 @@ msgstr[1] ""
#: rhodecode/templates/admin/admin_log.html:6
#: rhodecode/templates/admin/repos/repos.html:77
-#: rhodecode/templates/admin/users/user_edit_my_account.html:215
-#: rhodecode/templates/journal/journal.html:205
-#: rhodecode/templates/journal/journal.html:309
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
+#: rhodecode/templates/admin/users/user_edit_my_account.html:176
+#: rhodecode/templates/admin/users/users.html:87
+#: rhodecode/templates/admin/users_groups/users_groups.html:37
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:300
msgid "Action"
msgstr "Ação"
@@ -1797,11 +1940,11 @@ msgid "Repository"
msgstr "Repositório"
#: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:37
+#: rhodecode/templates/bookmarks/bookmarks.html:35
#: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches.html:48
#: rhodecode/templates/branches/branches_data.html:7
-#: rhodecode/templates/tags/tags.html:52
+#: rhodecode/templates/tags/tags.html:49
#: rhodecode/templates/tags/tags_data.html:7
msgid "Date"
msgstr "Data"
@@ -1821,6 +1964,7 @@ msgid "Repositories defaults"
msgstr "grupos de repositórios"
#: rhodecode/templates/admin/defaults/defaults.html:11
+#: rhodecode/templates/base/base.html:75
#, fuzzy
msgid "Defaults"
msgstr "excluir"
@@ -1834,8 +1978,7 @@ msgstr "Tipo"
#: rhodecode/templates/admin/defaults/defaults.html:48
#: rhodecode/templates/admin/repos/repo_add_base.html:69
#: rhodecode/templates/admin/repos/repo_edit.html:89
-#: rhodecode/templates/forks/fork.html:72
-#: rhodecode/templates/settings/repo_settings.html:80
+#: rhodecode/templates/forks/fork.html:69
msgid ""
"Private repositories are only visible to people explicitly added as "
"collaborators."
@@ -1865,7 +2008,7 @@ msgstr "Habilitar menu de descarregar na página de sumário."
#: rhodecode/templates/admin/defaults/defaults.html:75
#: rhodecode/templates/admin/repos/repo_edit.html:112
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
#, fuzzy
msgid "Enable locking"
msgstr "habilitar"
@@ -1878,14 +2021,17 @@ msgstr ""
#: rhodecode/templates/admin/defaults/defaults.html:84
#: rhodecode/templates/admin/ldap/ldap.html:89
#: rhodecode/templates/admin/permissions/permissions.html:92
-#: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79
+#: rhodecode/templates/admin/repos/repo_edit.html:148
+#: rhodecode/templates/admin/repos/repo_edit.html:173
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
#: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:137
-#: rhodecode/templates/admin/users/user_edit.html:182
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83
+#: rhodecode/templates/admin/users/user_add.html:94
+#: rhodecode/templates/admin/users/user_edit.html:140
+#: rhodecode/templates/admin/users/user_edit.html:185
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88
+#: rhodecode/templates/admin/users_groups/users_group_add.html:49
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
#: rhodecode/templates/admin/users_groups/users_group_edit.html:135
-#: rhodecode/templates/settings/repo_settings.html:94
msgid "Save"
msgstr "Salvar"
@@ -1894,8 +2040,11 @@ msgid "LDAP administration"
msgstr "Administração de LDAP"
#: rhodecode/templates/admin/ldap/ldap.html:11
-msgid "Ldap"
-msgstr "LDAP"
+#: rhodecode/templates/admin/users/users.html:86
+#: rhodecode/templates/base/base.html:74
+#, fuzzy
+msgid "LDAP"
+msgstr "ldap"
#: rhodecode/templates/admin/ldap/ldap.html:28
msgid "Connection settings"
@@ -1976,8 +2125,7 @@ msgid "Comments"
msgstr "commits"
#: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:272
-#: rhodecode/templates/base/base.html:274
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
msgid "Pull requests"
msgstr ""
@@ -1995,6 +2143,7 @@ msgid "Show notification"
msgstr "Mostrar notificação"
#: rhodecode/templates/admin/notifications/show_notification.html:9
+#: rhodecode/templates/base/base.html:241
msgid "Notifications"
msgstr "Notificações"
@@ -2003,11 +2152,12 @@ msgid "Permissions administration"
msgstr "Administração de permissões"
#: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:134
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63
-#: rhodecode/templates/admin/users/user_edit.html:147
+#: rhodecode/templates/admin/repos/repo_edit.html:158
+#: rhodecode/templates/admin/repos/repo_edit.html:165
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+#: rhodecode/templates/admin/users/user_edit.html:150
#: rhodecode/templates/admin/users_groups/users_group_edit.html:100
-#: rhodecode/templates/settings/repo_settings.html:86
+#: rhodecode/templates/base/base.html:73
msgid "Permissions"
msgstr "Permissões"
@@ -2020,8 +2170,9 @@ msgid "Anonymous access"
msgstr "Acesso anônimo"
#: rhodecode/templates/admin/permissions/permissions.html:49
+#, fuzzy
msgid ""
-"All default permissions on each repository will be reset to choosen "
+"All default permissions on each repository will be reset to chosen "
"permission, note that all custom default permission on repositories will "
"be lost"
msgstr ""
@@ -2031,24 +2182,16 @@ msgstr ""
#: rhodecode/templates/admin/permissions/permissions.html:50
#: rhodecode/templates/admin/permissions/permissions.html:63
-msgid "overwrite existing settings"
+#, fuzzy
+msgid "Overwrite existing settings"
msgstr "sobrescrever configurações existentes"
-#: rhodecode/templates/admin/permissions/permissions.html:55
-#: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:49
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
-#: rhodecode/templates/forks/fork.html:50
-#: rhodecode/templates/settings/repo_settings.html:48
-msgid "Repository group"
-msgstr "Grupo de repositórios"
-
#: rhodecode/templates/admin/permissions/permissions.html:62
#, fuzzy
msgid ""
-"All default permissions on each repository group will be reset to choosen"
-" permission, note that all custom default permission on repositories "
-"group will be lost"
+"All default permissions on each repository group will be reset to chosen "
+"permission, note that all custom default permission on repository groups "
+"will be lost"
msgstr ""
"Todas as permissões padrão em cada repositório serão reinicializadas para"
" as permissões escolhidas. Note que todas as permissões padrão "
@@ -2068,22 +2211,23 @@ msgid "Repository forking"
msgstr "Criação de repositório"
#: rhodecode/templates/admin/permissions/permissions.html:93
-#: rhodecode/templates/admin/permissions/permissions.html:209
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
-#: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:179
-#: rhodecode/templates/admin/settings/settings.html:269
-#: rhodecode/templates/admin/users/user_edit.html:138
-#: rhodecode/templates/admin/users/user_edit.html:183
-#: rhodecode/templates/admin/users/user_edit.html:286
-#: rhodecode/templates/admin/users/user_edit.html:334
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84
+#: rhodecode/templates/admin/permissions/permissions.html:154
+#: rhodecode/templates/admin/repos/repo_edit.html:149
+#: rhodecode/templates/admin/repos/repo_edit.html:174
+#: rhodecode/templates/admin/repos/repo_edit.html:388
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
+#: rhodecode/templates/admin/settings/settings.html:115
+#: rhodecode/templates/admin/settings/settings.html:187
+#: rhodecode/templates/admin/settings/settings.html:278
+#: rhodecode/templates/admin/users/user_edit.html:141
+#: rhodecode/templates/admin/users/user_edit.html:186
+#: rhodecode/templates/admin/users/user_edit.html:235
+#: rhodecode/templates/admin/users/user_edit.html:283
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/files/files_add.html:82
-#: rhodecode/templates/files/files_edit.html:68
-#: rhodecode/templates/pullrequests/pullrequest.html:124
-#: rhodecode/templates/settings/repo_settings.html:95
+#: rhodecode/templates/files/files_add.html:80
+#: rhodecode/templates/files/files_edit.html:66
+#: rhodecode/templates/pullrequests/pullrequest.html:110
msgid "Reset"
msgstr "Limpar"
@@ -2092,109 +2236,74 @@ msgstr "Limpar"
msgid "Default User Permissions"
msgstr "Permissões padrão"
-#: rhodecode/templates/admin/permissions/permissions.html:111
-#: rhodecode/templates/admin/users/user_edit.html:194
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
-#, fuzzy
-msgid "Nothing here yet"
-msgstr "Ainda não há notificações aqui"
-
-#: rhodecode/templates/admin/permissions/permissions.html:118
-#: rhodecode/templates/admin/users/user_edit.html:201
-#: rhodecode/templates/admin/users/user_edit_my_account.html:61
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
-msgid "Permission"
-msgstr "Permissão"
-
-#: rhodecode/templates/admin/permissions/permissions.html:119
-#: rhodecode/templates/admin/users/user_edit.html:202
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
-#, fuzzy
-msgid "Edit Permission"
-msgstr "Permissão de repositório"
-
-#: rhodecode/templates/admin/permissions/permissions.html:149
-#: rhodecode/templates/admin/permissions/permissions.html:151
-#: rhodecode/templates/admin/repos/repo_edit.html:13
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:232
-#: rhodecode/templates/admin/users/user_edit.html:234
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
-#: rhodecode/templates/data_table/_dt_elements.html:116
-#: rhodecode/templates/data_table/_dt_elements.html:117
-msgid "edit"
-msgstr "editar"
-
-#: rhodecode/templates/admin/permissions/permissions.html:168
-#: rhodecode/templates/admin/users/user_edit.html:295
+#: rhodecode/templates/admin/permissions/permissions.html:113
+#: rhodecode/templates/admin/users/user_edit.html:244
#, fuzzy
msgid "Allowed IP addresses"
msgstr "Endereço de e-mail"
-#: rhodecode/templates/admin/permissions/permissions.html:182
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
-#: rhodecode/templates/admin/users/user_edit.html:263
-#: rhodecode/templates/admin/users/user_edit.html:308
-#: rhodecode/templates/admin/users_groups/users_groups.html:44
+#: rhodecode/templates/admin/permissions/permissions.html:127
+#: rhodecode/templates/admin/repos/repo_edit.html:347
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
+#: rhodecode/templates/admin/users/user_edit.html:212
+#: rhodecode/templates/admin/users/user_edit.html:257
+#: rhodecode/templates/admin/users_groups/users_groups.html:46
#: rhodecode/templates/data_table/_dt_elements.html:122
#: rhodecode/templates/data_table/_dt_elements.html:130
msgid "delete"
msgstr "excluir"
-#: rhodecode/templates/admin/permissions/permissions.html:183
-#: rhodecode/templates/admin/users/user_edit.html:309
+#: rhodecode/templates/admin/permissions/permissions.html:128
+#: rhodecode/templates/admin/users/user_edit.html:258
#, fuzzy, python-format
msgid "Confirm to delete this ip: %s"
msgstr "Confirma excluir este usuário: %s"
-#: rhodecode/templates/admin/permissions/permissions.html:189
-#: rhodecode/templates/admin/users/user_edit.html:315
+#: rhodecode/templates/admin/permissions/permissions.html:134
+#: rhodecode/templates/admin/users/user_edit.html:264
msgid "All IP addresses are allowed"
msgstr ""
-#: rhodecode/templates/admin/permissions/permissions.html:200
-#: rhodecode/templates/admin/users/user_edit.html:326
+#: rhodecode/templates/admin/permissions/permissions.html:145
+#: rhodecode/templates/admin/users/user_edit.html:275
#, fuzzy
msgid "New ip address"
msgstr "Endereço de e-mail"
-#: rhodecode/templates/admin/permissions/permissions.html:208
-#: rhodecode/templates/admin/users/user_edit.html:285
-#: rhodecode/templates/admin/users/user_edit.html:333
+#: rhodecode/templates/admin/permissions/permissions.html:153
+#: rhodecode/templates/admin/repos/repo_add_base.html:73
+#: rhodecode/templates/admin/repos/repo_edit.html:387
+#: rhodecode/templates/admin/users/user_edit.html:234
+#: rhodecode/templates/admin/users/user_edit.html:282
#, fuzzy
msgid "Add"
msgstr "adicionar"
-#: rhodecode/templates/admin/repos/repo_add.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
-#: rhodecode/templates/base/base.html:154
+#: rhodecode/templates/admin/repos/repo_add.html:12
+#: rhodecode/templates/admin/repos/repo_add.html:16
+#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103
+#: rhodecode/templates/base/base.html:263
msgid "Repositories"
msgstr "Repositórios"
-#: rhodecode/templates/admin/repos/repo_add.html:13
-msgid "add new"
+#: rhodecode/templates/admin/repos/repo_add.html:19
+#, fuzzy
+msgid "Add new"
msgstr "adicionar novo"
#: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:104
-#: rhodecode/templates/summary/summary.html:105
+#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:97
msgid "Clone from"
msgstr "Clonar de"
#: rhodecode/templates/admin/repos/repo_add_base.html:24
#: rhodecode/templates/admin/repos/repo_edit.html:44
-#: rhodecode/templates/settings/repo_settings.html:43
msgid "Optional http[s] url from which repository should be cloned."
msgstr "URL opcional http[s] da qual o repositório deve ser clonado."
#: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: rhodecode/templates/forks/fork.html:54
+#: rhodecode/templates/forks/fork.html:51
#, fuzzy
msgid "Optionaly select a group to put this repository into."
msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório."
@@ -2205,47 +2314,42 @@ msgstr "Tipo de repositório a criar."
#: rhodecode/templates/admin/repos/repo_add_base.html:47
#: rhodecode/templates/admin/repos/repo_edit.html:66
-#: rhodecode/templates/forks/fork.html:41
-#: rhodecode/templates/settings/repo_settings.html:57
+#: rhodecode/templates/forks/fork.html:38
#, fuzzy
msgid "Landing revision"
msgstr "próxima revisão"
#: rhodecode/templates/admin/repos/repo_add_base.html:51
#: rhodecode/templates/admin/repos/repo_edit.html:70
-#: rhodecode/templates/forks/fork.html:45
-#: rhodecode/templates/settings/repo_settings.html:61
+#: rhodecode/templates/forks/fork.html:42
msgid "Default revision for files page, downloads, whoosh and readme"
msgstr ""
#: rhodecode/templates/admin/repos/repo_add_base.html:60
#: rhodecode/templates/admin/repos/repo_edit.html:79
-#: rhodecode/templates/forks/fork.html:63
-#: rhodecode/templates/settings/repo_settings.html:70
+#: rhodecode/templates/forks/fork.html:60
msgid "Keep it short and to the point. Use a README file for longer descriptions."
msgstr ""
"Seja sucinto e objetivo. Use um arquivo README para descrições mais "
"longas."
-#: rhodecode/templates/admin/repos/repo_add_base.html:73
-msgid "add"
-msgstr "adicionar"
-
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9
-msgid "add new repository"
-msgstr "adicionar novo repositório"
-
-#: rhodecode/templates/admin/repos/repo_edit.html:5
+#: rhodecode/templates/admin/repos/repo_edit.html:8
msgid "Edit repository"
msgstr "Editar repositório"
+#: rhodecode/templates/admin/repos/repo_edit.html:12
+#: rhodecode/templates/admin/settings/hooks.html:9
+#: rhodecode/templates/admin/settings/settings.html:11
+#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121
+#: rhodecode/templates/summary/summary.html:212
+msgid "Settings"
+msgstr "Configurações"
+
#: rhodecode/templates/admin/repos/repo_edit.html:40
-#: rhodecode/templates/settings/repo_settings.html:39
msgid "Clone uri"
msgstr "URI de clonagem"
#: rhodecode/templates/admin/repos/repo_edit.html:53
-#: rhodecode/templates/settings/repo_settings.html:52
msgid "Optional select a group to put this repository into."
msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório."
@@ -2253,97 +2357,99 @@ msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório."
msgid "Change owner of this repository."
msgstr "Mudar o dono desse repositório."
-#: rhodecode/templates/admin/repos/repo_edit.html:152
-msgid "Administration"
-msgstr "Administração"
+#: rhodecode/templates/admin/repos/repo_edit.html:184
+#, fuzzy
+msgid "Advanced settings"
+msgstr "Salvar configurações"
-#: rhodecode/templates/admin/repos/repo_edit.html:155
+#: rhodecode/templates/admin/repos/repo_edit.html:187
msgid "Statistics"
msgstr "Estatísticas"
-#: rhodecode/templates/admin/repos/repo_edit.html:159
+#: rhodecode/templates/admin/repos/repo_edit.html:191
msgid "Reset current statistics"
msgstr "Reinicializar estatísticas atuais"
-#: rhodecode/templates/admin/repos/repo_edit.html:159
+#: rhodecode/templates/admin/repos/repo_edit.html:191
msgid "Confirm to remove current statistics"
msgstr "Confirma remover atuais estatísticas"
-#: rhodecode/templates/admin/repos/repo_edit.html:162
+#: rhodecode/templates/admin/repos/repo_edit.html:194
msgid "Fetched to rev"
msgstr "Trazida à rev"
-#: rhodecode/templates/admin/repos/repo_edit.html:163
+#: rhodecode/templates/admin/repos/repo_edit.html:195
msgid "Stats gathered"
msgstr "Estatísticas coletadas"
-#: rhodecode/templates/admin/repos/repo_edit.html:171
+#: rhodecode/templates/admin/repos/repo_edit.html:203
msgid "Remote"
msgstr "Remoto"
-#: rhodecode/templates/admin/repos/repo_edit.html:175
+#: rhodecode/templates/admin/repos/repo_edit.html:207
msgid "Pull changes from remote location"
msgstr "Realizar pull de alterações a partir de localização remota"
-#: rhodecode/templates/admin/repos/repo_edit.html:175
+#: rhodecode/templates/admin/repos/repo_edit.html:207
msgid "Confirm to pull changes from remote side"
msgstr "Confirma realizar pull de alterações a partir de lado remoto"
-#: rhodecode/templates/admin/repos/repo_edit.html:186
+#: rhodecode/templates/admin/repos/repo_edit.html:218
msgid "Cache"
msgstr "Cache"
-#: rhodecode/templates/admin/repos/repo_edit.html:190
+#: rhodecode/templates/admin/repos/repo_edit.html:222
msgid "Invalidate repository cache"
msgstr "Invalidar cache do repositório"
-#: rhodecode/templates/admin/repos/repo_edit.html:190
+#: rhodecode/templates/admin/repos/repo_edit.html:222
msgid "Confirm to invalidate repository cache"
msgstr "Confirma invalidar cache do repositório"
-#: rhodecode/templates/admin/repos/repo_edit.html:193
+#: rhodecode/templates/admin/repos/repo_edit.html:225
msgid ""
"Manually invalidate cache for this repository. On first access repository"
" will be cached again"
msgstr ""
-#: rhodecode/templates/admin/repos/repo_edit.html:198
+#: rhodecode/templates/admin/repos/repo_edit.html:230
msgid "List of cached values"
msgstr ""
-#: rhodecode/templates/admin/repos/repo_edit.html:201
+#: rhodecode/templates/admin/repos/repo_edit.html:233
msgid "Prefix"
msgstr ""
-#: rhodecode/templates/admin/repos/repo_edit.html:202
+#: rhodecode/templates/admin/repos/repo_edit.html:234
#, fuzzy
msgid "Key"
msgstr "Chave de API"
-#: rhodecode/templates/admin/repos/repo_edit.html:203
+#: rhodecode/templates/admin/repos/repo_edit.html:235
#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:121
+#: rhodecode/templates/admin/users/user_edit.html:124
+#: rhodecode/templates/admin/users/users.html:84
#: rhodecode/templates/admin/users_groups/users_group_add.html:41
#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
+#: rhodecode/templates/admin/users_groups/users_groups.html:36
msgid "Active"
msgstr "Ativo"
-#: rhodecode/templates/admin/repos/repo_edit.html:218
-#: rhodecode/templates/base/base.html:306
-#: rhodecode/templates/base/base.html:308
-#: rhodecode/templates/base/base.html:310
+#: rhodecode/templates/admin/repos/repo_edit.html:250
+#: rhodecode/templates/base/base.html:280
+#: rhodecode/templates/base/base.html:281
msgid "Public journal"
msgstr "Diário público"
-#: rhodecode/templates/admin/repos/repo_edit.html:224
+#: rhodecode/templates/admin/repos/repo_edit.html:256
msgid "Remove from public journal"
msgstr "Remover do diário público"
-#: rhodecode/templates/admin/repos/repo_edit.html:226
+#: rhodecode/templates/admin/repos/repo_edit.html:258
msgid "Add to public journal"
msgstr "Adicionar ao diário público"
-#: rhodecode/templates/admin/repos/repo_edit.html:231
+#: rhodecode/templates/admin/repos/repo_edit.html:263
msgid ""
"All actions made on this repository will be accessible to everyone in "
"public journal"
@@ -2351,80 +2457,125 @@ msgstr ""
"Todas as ações feitas nesse repositório serão acessíveis a todos no "
"diário público"
-#: rhodecode/templates/admin/repos/repo_edit.html:238
+#: rhodecode/templates/admin/repos/repo_edit.html:270
#, fuzzy
msgid "Locking"
msgstr "destravar"
-#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/admin/repos/repo_edit.html:275
msgid "Unlock locked repo"
msgstr ""
-#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/admin/repos/repo_edit.html:275
#, fuzzy
msgid "Confirm to unlock repository"
msgstr "Confirma excluir este repositório"
-#: rhodecode/templates/admin/repos/repo_edit.html:246
+#: rhodecode/templates/admin/repos/repo_edit.html:278
msgid "lock repo"
msgstr ""
-#: rhodecode/templates/admin/repos/repo_edit.html:246
+#: rhodecode/templates/admin/repos/repo_edit.html:278
#, fuzzy
msgid "Confirm to lock repository"
msgstr "Confirma excluir este repositório"
-#: rhodecode/templates/admin/repos/repo_edit.html:247
+#: rhodecode/templates/admin/repos/repo_edit.html:279
#, fuzzy
msgid "Repository is not locked"
msgstr "repositórios"
-#: rhodecode/templates/admin/repos/repo_edit.html:252
+#: rhodecode/templates/admin/repos/repo_edit.html:284
msgid "Force locking on repository. Works only when anonymous access is disabled"
msgstr ""
-#: rhodecode/templates/admin/repos/repo_edit.html:259
+#: rhodecode/templates/admin/repos/repo_edit.html:291
#, fuzzy
msgid "Set as fork of"
msgstr "Marcar como bifurcação"
-#: rhodecode/templates/admin/repos/repo_edit.html:264
+#: rhodecode/templates/admin/repos/repo_edit.html:296
msgid "set"
msgstr "ajustar"
-#: rhodecode/templates/admin/repos/repo_edit.html:268
+#: rhodecode/templates/admin/repos/repo_edit.html:300
#, fuzzy
msgid "Manually set this repository as a fork of another from the list"
msgstr "Marcar manualmente este repositório como sendo uma bifurcação de outro"
-#: rhodecode/templates/admin/repos/repo_edit.html:274
+#: rhodecode/templates/admin/repos/repo_edit.html:306
#: rhodecode/templates/changeset/changeset_file_comment.html:41
msgid "Delete"
msgstr "Excluir"
-#: rhodecode/templates/admin/repos/repo_edit.html:278
-#: rhodecode/templates/settings/repo_settings.html:115
+#: rhodecode/templates/admin/repos/repo_edit.html:315
msgid "Remove this repository"
msgstr "Remover deste repositório"
-#: rhodecode/templates/admin/repos/repo_edit.html:278
-#: rhodecode/templates/settings/repo_settings.html:115
+#: rhodecode/templates/admin/repos/repo_edit.html:315
msgid "Confirm to delete this repository"
msgstr "Confirma excluir este repositório"
-#: rhodecode/templates/admin/repos/repo_edit.html:282
-#: rhodecode/templates/settings/repo_settings.html:119
+#: rhodecode/templates/admin/repos/repo_edit.html:317
+#, fuzzy, python-format
+msgid "this repository has %s fork"
+msgid_plural "this repository has %s forks"
+msgstr[0] "repositório [criado] como uma bifurcação"
+msgstr[1] ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:318
+#, fuzzy
+msgid "Detach forks"
+msgstr "Marcar como bifurcação"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:319
+#, fuzzy
+msgid "Delete forks"
+msgstr "excluir"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:322
#, fuzzy
msgid ""
"This repository will be renamed in a special way in order to be "
-"unaccesible for RhodeCode and VCS systems. If you need fully delete it "
-"from file system please do it manually"
+"unaccesible for RhodeCode and VCS systems. If you need to fully delete it"
+" from file system please do it manually"
msgstr ""
"Este repositório será renomeado de uma maneira especial, de forma a ser "
"inacessível ao RhodeCode e sistemas de controle de versão.\n"
" Se você precisa exclui-lo completamente do "
"sistema de arquivos, por favor faça-o manualmente"
+#: rhodecode/templates/admin/repos/repo_edit.html:336
+msgid "Extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:348
+#, fuzzy, python-format
+msgid "Confirm to delete this field: %s"
+msgstr "Confirma excluir este usuário: %s"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:362
+#, fuzzy
+msgid "New field key"
+msgstr "adicionar novo arquivo"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:370
+msgid "New field label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:373
+msgid "Enter short label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:379
+#, fuzzy
+msgid "New field description"
+msgstr "Descrição"
+
+#: rhodecode/templates/admin/repos/repo_edit.html:382
+msgid "Enter description of a field"
+msgstr ""
+
#: rhodecode/templates/admin/repos/repo_edit_perms.html:3
#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
msgid "none"
@@ -2442,8 +2593,6 @@ msgstr "escrever"
#: rhodecode/templates/admin/repos/repo_edit_perms.html:6
#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
-#: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/base/base.html:235
msgid "admin"
msgstr "administrador"
@@ -2453,75 +2602,60 @@ msgid "member"
msgstr "membro"
#: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-#: rhodecode/templates/data_table/_dt_elements.html:61
-#: rhodecode/templates/summary/summary.html:85
msgid "private repository"
msgstr "repositório privado"
#: rhodecode/templates/admin/repos/repo_edit_perms.html:19
#: rhodecode/templates/admin/repos/repo_edit_perms.html:28
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
#, fuzzy
msgid "default"
msgstr "excluir"
#: rhodecode/templates/admin/repos/repo_edit_perms.html:33
#: rhodecode/templates/admin/repos/repo_edit_perms.html:58
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
msgid "revoke"
msgstr "revogar"
#: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80
msgid "Add another member"
msgstr "Adicionar outro membro"
#: rhodecode/templates/admin/repos/repo_edit_perms.html:97
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100
msgid "Failed to remove user"
msgstr "Falha ao reomver usuário"
#: rhodecode/templates/admin/repos/repo_edit_perms.html:112
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103
-msgid "Failed to remove users group"
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116
+#, fuzzy
+msgid "Failed to remove user group"
msgstr "Falha ao remover grupo de usuários"
#: rhodecode/templates/admin/repos/repos.html:5
msgid "Repositories administration"
msgstr "Administração de repositórios"
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86
msgid "apply to children"
msgstr ""
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
msgid ""
"Set or revoke permission to all children of that group, including non-"
"private repositories and other groups"
msgstr ""
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
+#, python-format
+msgid "%s Group Dashboard"
+msgstr ""
+
#: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-#: rhodecode/templates/base/base.html:128
-#: rhodecode/templates/bookmarks/bookmarks.html:11
-#: rhodecode/templates/branches/branches.html:10
-#: rhodecode/templates/changelog/changelog.html:10
-#: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/changeset/changeset_range.html:9
-#: rhodecode/templates/compare/compare_diff.html:9
-#: rhodecode/templates/files/file_diff.html:8
-#: rhodecode/templates/files/files.html:8
-#: rhodecode/templates/files/files_add.html:15
-#: rhodecode/templates/files/files_edit.html:15
-#: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9
-#: rhodecode/templates/pullrequests/pullrequest.html:8
-#: rhodecode/templates/pullrequests/pullrequest_show.html:8
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
-#: rhodecode/templates/settings/repo_settings.html:9
-#: rhodecode/templates/shortlog/shortlog.html:10
-#: rhodecode/templates/summary/summary.html:8
-#: rhodecode/templates/tags/tags.html:11
msgid "Home"
msgstr "Início"
@@ -2530,78 +2664,86 @@ msgid "with"
msgstr "com"
#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
-msgid "Add repos group"
-msgstr "Adicionar grupo de repositórios"
+#, fuzzy
+msgid "Add repository group"
+msgstr "Grupo de repositórios"
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10
-msgid "Repos groups"
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
+#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82
+#, fuzzy
+msgid "Repository groups"
msgstr "Grupo de repositórios"
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12
-msgid "add new repos group"
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13
+#, fuzzy
+msgid "Add new repository group"
msgstr "adicionar novo grupo de repositórios"
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56
msgid "Group parent"
msgstr "Progenitor do grupo"
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
-#: rhodecode/templates/admin/users/user_add.html:94
-#: rhodecode/templates/admin/users_groups/users_group_add.html:49
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/pullrequests/pullrequest_show.html:149
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59
msgid "save"
msgstr "salvar"
#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
-msgid "Edit repos group"
-msgstr "Editar grupo de repositórios"
+#, fuzzy
+msgid "Edit repository group"
+msgstr "editar grupo de repositórios"
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12
-msgid "edit repos group"
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13
+#, fuzzy, python-format
+msgid "Edit repository group %s"
msgstr "editar grupo de repositórios"
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27
#, fuzzy
-msgid "Add new child group"
+msgid "Add child group"
msgstr "Adicionar novo grupo de usuários"
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76
msgid ""
"Enable lock-by-pulling on group. This option will be applied to all other"
" groups and repositories inside"
msgstr ""
#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
-msgid "Repositories groups administration"
-msgstr "Administração de grupos de repositórios"
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
#, fuzzy
-msgid "Add new group"
-msgstr "Adicionar novo grupo de usuários"
+msgid "Repository groups administration"
+msgstr "Administração de grupos de repositórios"
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45
msgid "Number of toplevel repositories"
msgstr "Número de repositórios de nível superior"
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
-#: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:35
-msgid "action"
-msgstr "ação"
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
+#, fuzzy
+msgid "Edit"
+msgstr "editar"
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
+#: rhodecode/templates/base/perms_summary.html:29
+#: rhodecode/templates/base/perms_summary.html:48
+#: rhodecode/templates/base/perms_summary.html:50
+#: rhodecode/templates/data_table/_dt_elements.html:116
+#: rhodecode/templates/data_table/_dt_elements.html:117
+msgid "edit"
+msgstr "editar"
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
#, fuzzy, python-format
msgid "Confirm to delete this group: %s with %s repository"
msgid_plural "Confirm to delete this group: %s with %s repositories"
msgstr[0] "Confirma excluir este repositório"
msgstr[1] ""
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68
-msgid "There are no repositories groups yet"
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78
+#, fuzzy
+msgid "There are no repository groups yet"
msgstr "Ainda não há grupos de repositórios"
#: rhodecode/templates/admin/settings/hooks.html:5
@@ -2609,12 +2751,6 @@ msgstr "Ainda não há grupos de repositórios"
msgid "Settings administration"
msgstr "Administração de configurações"
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/settings/repo_settings.html:13
-msgid "Settings"
-msgstr "Configurações"
-
#: rhodecode/templates/admin/settings/hooks.html:24
msgid "Built in hooks - read only"
msgstr "Ganchos pré-definidos - somente leitura"
@@ -2631,15 +2767,16 @@ msgstr "remover"
msgid "Failed to remove hook"
msgstr "Falha ao remover gancho"
-#: rhodecode/templates/admin/settings/settings.html:24
+#: rhodecode/templates/admin/settings/settings.html:26
msgid "Remap and rescan repositories"
msgstr "Remapear e varrer novamente repositórios"
-#: rhodecode/templates/admin/settings/settings.html:32
-msgid "rescan option"
+#: rhodecode/templates/admin/settings/settings.html:34
+#, fuzzy
+msgid "Rescan option"
msgstr "opção de varredura"
-#: rhodecode/templates/admin/settings/settings.html:38
+#: rhodecode/templates/admin/settings/settings.html:40
msgid ""
"In case a repository was deleted from filesystem and there are leftovers "
"in the database check this option to scan obsolete data in database and "
@@ -2649,163 +2786,172 @@ msgstr ""
"restos no banco de dados, marque esta opção para varrer dados obsoletos "
"no banco e removê-los."
-#: rhodecode/templates/admin/settings/settings.html:39
-msgid "destroy old data"
+#: rhodecode/templates/admin/settings/settings.html:41
+#, fuzzy
+msgid "Destroy old data"
msgstr "destruir dados antigos"
-#: rhodecode/templates/admin/settings/settings.html:41
+#: rhodecode/templates/admin/settings/settings.html:43
msgid ""
"Rescan repositories location for new repositories. Also deletes obsolete "
"if `destroy` flag is checked "
msgstr ""
-#: rhodecode/templates/admin/settings/settings.html:46
+#: rhodecode/templates/admin/settings/settings.html:48
msgid "Rescan repositories"
msgstr "Varrer repositórios"
-#: rhodecode/templates/admin/settings/settings.html:52
+#: rhodecode/templates/admin/settings/settings.html:54
msgid "Whoosh indexing"
msgstr "Indexação do Whoosh"
-#: rhodecode/templates/admin/settings/settings.html:60
-msgid "index build option"
+#: rhodecode/templates/admin/settings/settings.html:62
+#, fuzzy
+msgid "Index build option"
msgstr "opção de construção de índice"
-#: rhodecode/templates/admin/settings/settings.html:65
-msgid "build from scratch"
+#: rhodecode/templates/admin/settings/settings.html:67
+#, fuzzy
+msgid "Build from scratch"
msgstr "construir do início"
-#: rhodecode/templates/admin/settings/settings.html:71
+#: rhodecode/templates/admin/settings/settings.html:73
msgid "Reindex"
msgstr "Reindexar"
-#: rhodecode/templates/admin/settings/settings.html:77
+#: rhodecode/templates/admin/settings/settings.html:79
msgid "Global application settings"
msgstr "Configurações globais da aplicação"
-#: rhodecode/templates/admin/settings/settings.html:86
-msgid "Application name"
-msgstr "Nome da aplicação"
+#: rhodecode/templates/admin/settings/settings.html:88
+msgid "Site branding"
+msgstr ""
-#: rhodecode/templates/admin/settings/settings.html:95
-msgid "Realm text"
-msgstr "Texto de esfera"
+#: rhodecode/templates/admin/settings/settings.html:97
+msgid "HTTP authentication realm"
+msgstr ""
-#: rhodecode/templates/admin/settings/settings.html:104
-msgid "GA code"
-msgstr "Código GA"
+#: rhodecode/templates/admin/settings/settings.html:106
+msgid "Google Analytics code"
+msgstr ""
-#: rhodecode/templates/admin/settings/settings.html:112
-#: rhodecode/templates/admin/settings/settings.html:178
-#: rhodecode/templates/admin/settings/settings.html:268
+#: rhodecode/templates/admin/settings/settings.html:114
+#: rhodecode/templates/admin/settings/settings.html:186
+#: rhodecode/templates/admin/settings/settings.html:277
msgid "Save settings"
msgstr "Salvar configurações"
-#: rhodecode/templates/admin/settings/settings.html:119
+#: rhodecode/templates/admin/settings/settings.html:121
#, fuzzy
msgid "Visualisation settings"
msgstr "Configurações globais da aplicação"
-#: rhodecode/templates/admin/settings/settings.html:127
+#: rhodecode/templates/admin/settings/settings.html:129
#, fuzzy
msgid "General"
msgstr "habilitar"
-#: rhodecode/templates/admin/settings/settings.html:132
+#: rhodecode/templates/admin/settings/settings.html:134
msgid "Use lightweight dashboard"
msgstr ""
-#: rhodecode/templates/admin/settings/settings.html:139
+#: rhodecode/templates/admin/settings/settings.html:140
+#, fuzzy
+msgid "Use repository extra fields"
+msgstr "repositórios"
+
+#: rhodecode/templates/admin/settings/settings.html:147
#, fuzzy
msgid "Icons"
msgstr "Opções"
-#: rhodecode/templates/admin/settings/settings.html:144
+#: rhodecode/templates/admin/settings/settings.html:152
msgid "Show public repo icon on repositories"
msgstr ""
-#: rhodecode/templates/admin/settings/settings.html:148
+#: rhodecode/templates/admin/settings/settings.html:156
#, fuzzy
msgid "Show private repo icon on repositories"
msgstr "repositório privado"
-#: rhodecode/templates/admin/settings/settings.html:155
+#: rhodecode/templates/admin/settings/settings.html:163
#, fuzzy
msgid "Meta-Tagging"
msgstr "configurações"
-#: rhodecode/templates/admin/settings/settings.html:160
+#: rhodecode/templates/admin/settings/settings.html:168
msgid "Stylify recognised metatags:"
msgstr ""
-#: rhodecode/templates/admin/settings/settings.html:187
+#: rhodecode/templates/admin/settings/settings.html:195
#, fuzzy
msgid "VCS settings"
msgstr "configurações"
-#: rhodecode/templates/admin/settings/settings.html:196
+#: rhodecode/templates/admin/settings/settings.html:204
msgid "Web"
msgstr "Web"
-#: rhodecode/templates/admin/settings/settings.html:201
+#: rhodecode/templates/admin/settings/settings.html:209
#, fuzzy
-msgid "require ssl for vcs operations"
+msgid "Require SSL for vcs operations"
msgstr "exigir ssl para realizar push"
-#: rhodecode/templates/admin/settings/settings.html:203
+#: rhodecode/templates/admin/settings/settings.html:211
msgid ""
"RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
"will return HTTP Error 406: Not Acceptable"
msgstr ""
-#: rhodecode/templates/admin/settings/settings.html:209
+#: rhodecode/templates/admin/settings/settings.html:217
msgid "Hooks"
msgstr "Ganchos"
-#: rhodecode/templates/admin/settings/settings.html:214
+#: rhodecode/templates/admin/settings/settings.html:222
msgid "Update repository after push (hg update)"
msgstr "Atualizar repositório após realizar push (hg update)"
-#: rhodecode/templates/admin/settings/settings.html:218
+#: rhodecode/templates/admin/settings/settings.html:226
msgid "Show repository size after push"
msgstr "Mostrar tamanho do repositório após o push"
-#: rhodecode/templates/admin/settings/settings.html:222
+#: rhodecode/templates/admin/settings/settings.html:230
msgid "Log user push commands"
msgstr "Armazenar registro de comandos de push dos usuários"
-#: rhodecode/templates/admin/settings/settings.html:226
+#: rhodecode/templates/admin/settings/settings.html:234
msgid "Log user pull commands"
msgstr "Armazenar registro de comandos de pull dos usuários"
-#: rhodecode/templates/admin/settings/settings.html:230
-msgid "advanced setup"
+#: rhodecode/templates/admin/settings/settings.html:238
+#, fuzzy
+msgid "Advanced setup"
msgstr "confirguações avançadas"
-#: rhodecode/templates/admin/settings/settings.html:235
+#: rhodecode/templates/admin/settings/settings.html:243
#, fuzzy
msgid "Mercurial Extensions"
msgstr "Repositório Mercurial"
-#: rhodecode/templates/admin/settings/settings.html:240
-msgid "largefiles extensions"
+#: rhodecode/templates/admin/settings/settings.html:248
+msgid "Enable largefiles extension"
msgstr ""
-#: rhodecode/templates/admin/settings/settings.html:244
-msgid "hgsubversion extensions"
+#: rhodecode/templates/admin/settings/settings.html:252
+msgid "Enable hgsubversion extension"
msgstr ""
-#: rhodecode/templates/admin/settings/settings.html:246
+#: rhodecode/templates/admin/settings/settings.html:254
msgid ""
-"Requires hgsubversion library installed. Allows clonning from svn remote "
+"Requires hgsubversion library installed. Allows cloning from svn remote "
"locations"
msgstr ""
-#: rhodecode/templates/admin/settings/settings.html:256
+#: rhodecode/templates/admin/settings/settings.html:264
msgid "Repositories location"
msgstr "Localização dos repositórios"
-#: rhodecode/templates/admin/settings/settings.html:261
+#: rhodecode/templates/admin/settings/settings.html:269
msgid ""
"This a crucial application setting. If you are really sure you need to "
"change this, you must restart application in order to make this setting "
@@ -2815,36 +2961,38 @@ msgstr ""
"certeza de que quer mudar isto, você precisa reiniciar a aplicação para "
"que essa configuração tenha efeito. Clique este rótulo para destravar."
-#: rhodecode/templates/admin/settings/settings.html:262
-#: rhodecode/templates/base/base.html:227
-msgid "unlock"
+#: rhodecode/templates/admin/settings/settings.html:270
+#: rhodecode/templates/base/base.html:131
+#, fuzzy
+msgid "Unlock"
msgstr "destravar"
-#: rhodecode/templates/admin/settings/settings.html:263
+#: rhodecode/templates/admin/settings/settings.html:272
msgid ""
"Location where repositories are stored. After changing this value a "
"restart, and rescan is required"
msgstr ""
-#: rhodecode/templates/admin/settings/settings.html:283
+#: rhodecode/templates/admin/settings/settings.html:292
msgid "Test Email"
msgstr "Testar E-mail"
-#: rhodecode/templates/admin/settings/settings.html:291
+#: rhodecode/templates/admin/settings/settings.html:300
msgid "Email to"
msgstr "E-mail para"
-#: rhodecode/templates/admin/settings/settings.html:299
+#: rhodecode/templates/admin/settings/settings.html:308
msgid "Send"
msgstr "Enviar"
-#: rhodecode/templates/admin/settings/settings.html:305
+#: rhodecode/templates/admin/settings/settings.html:314
msgid "System Info and Packages"
msgstr "Informações de Sistema e Pacotes"
-#: rhodecode/templates/admin/settings/settings.html:308
-msgid "show"
-msgstr "mostrar"
+#: rhodecode/templates/admin/settings/settings.html:317
+#: rhodecode/templates/changelog/changelog.html:42
+msgid "Show"
+msgstr "Mostrar"
#: rhodecode/templates/admin/users/user_add.html:5
msgid "Add user"
@@ -2852,11 +3000,14 @@ msgstr "Adicionar usuário"
#: rhodecode/templates/admin/users/user_add.html:10
#: rhodecode/templates/admin/users/user_edit.html:11
+#: rhodecode/templates/base/base.html:71
msgid "Users"
msgstr "Usuários"
#: rhodecode/templates/admin/users/user_add.html:12
-msgid "add new user"
+#: rhodecode/templates/admin/users/users.html:23
+#, fuzzy
+msgid "Add new user"
msgstr "adicionar novo usuário"
#: rhodecode/templates/admin/users/user_add.html:50
@@ -2867,6 +3018,12 @@ msgstr "Confirmação de senha"
msgid "Edit user"
msgstr "Editar usuário"
+#: rhodecode/templates/admin/users/user_edit.html:13
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#, fuzzy, python-format
+msgid "Edit %s"
+msgstr "editar"
+
#: rhodecode/templates/admin/users/user_edit.html:34
#: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
msgid "Change your avatar at"
@@ -2882,31 +3039,32 @@ msgstr "Usando"
msgid "API key"
msgstr "Chave de API"
-#: rhodecode/templates/admin/users/user_edit.html:48
-msgid "Your IP"
+#: rhodecode/templates/admin/users/user_edit.html:50
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25
+msgid "Current IP"
msgstr ""
-#: rhodecode/templates/admin/users/user_edit.html:67
+#: rhodecode/templates/admin/users/user_edit.html:70
msgid "LDAP DN"
msgstr "DN LDAP"
-#: rhodecode/templates/admin/users/user_edit.html:76
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39
+#: rhodecode/templates/admin/users/user_edit.html:79
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
msgid "New password"
msgstr "Nova senha"
-#: rhodecode/templates/admin/users/user_edit.html:85
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48
+#: rhodecode/templates/admin/users/user_edit.html:88
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
msgid "New password confirmation"
msgstr "Confirmação de nova senha"
-#: rhodecode/templates/admin/users/user_edit.html:155
+#: rhodecode/templates/admin/users/user_edit.html:158
#: rhodecode/templates/admin/users_groups/users_group_edit.html:108
#, fuzzy
msgid "Inherit default permissions"
msgstr "Permissões padrão"
-#: rhodecode/templates/admin/users/user_edit.html:160
+#: rhodecode/templates/admin/users/user_edit.html:163
#: rhodecode/templates/admin/users_groups/users_group_edit.html:113
#, python-format
msgid ""
@@ -2914,34 +3072,34 @@ msgid ""
"options does not have any action"
msgstr ""
-#: rhodecode/templates/admin/users/user_edit.html:166
+#: rhodecode/templates/admin/users/user_edit.html:169
#: rhodecode/templates/admin/users_groups/users_group_edit.html:119
msgid "Create repositories"
msgstr "Criar repositórios"
-#: rhodecode/templates/admin/users/user_edit.html:174
+#: rhodecode/templates/admin/users/user_edit.html:177
#: rhodecode/templates/admin/users_groups/users_group_edit.html:127
#, fuzzy
msgid "Fork repositories"
msgstr "repositórios"
-#: rhodecode/templates/admin/users/user_edit.html:251
+#: rhodecode/templates/admin/users/user_edit.html:200
#, fuzzy
msgid "Email addresses"
msgstr "Endereço de e-mail"
-#: rhodecode/templates/admin/users/user_edit.html:264
+#: rhodecode/templates/admin/users/user_edit.html:213
#, fuzzy, python-format
msgid "Confirm to delete this email: %s"
msgstr "Confirma excluir este usuário: %s"
-#: rhodecode/templates/admin/users/user_edit.html:278
+#: rhodecode/templates/admin/users/user_edit.html:227
#, fuzzy
msgid "New email address"
msgstr "Endereço de e-mail"
#: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:130
+#: rhodecode/templates/base/base.html:242
msgid "My account"
msgstr "Minha conta"
@@ -2954,7 +3112,7 @@ msgid "My permissions"
msgstr "Minhas permissões"
#: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:57
+#: rhodecode/templates/journal/journal.html:54
msgid "My repos"
msgstr "Meus repositórios"
@@ -2963,32 +3121,46 @@ msgstr "Meus repositórios"
msgid "My pull requests"
msgstr "comentado no commit"
-#: rhodecode/templates/admin/users/user_edit_my_account.html:45
-#: rhodecode/templates/journal/journal.html:61
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4
#, fuzzy
-msgid "Add repo"
-msgstr "adicionar novo"
+msgid "Show closed pull requests"
+msgstr "repositório [criado]"
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6
msgid "Opened by me"
msgstr ""
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
#, python-format
msgid "Pull request #%s opened on %s"
msgstr ""
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
+#: rhodecode/templates/pullrequests/pullrequest_data.html:7
+#: rhodecode/templates/pullrequests/pullrequest_show.html:27
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+msgid "Closed"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23
#, fuzzy
msgid "Confirm to delete this pull request"
msgstr "Confirma excluir este repositório"
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51
+#, fuzzy
+msgid "Nothing here yet"
+msgstr "Ainda não há notificações aqui"
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34
msgid "I participate in"
msgstr ""
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
#, python-format
msgid "Pull request #%s opened by %s on %s"
msgstr ""
@@ -2998,69 +3170,60 @@ msgid "Users administration"
msgstr "Administração de usuários"
#: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:241
msgid "users"
msgstr "usuários"
-#: rhodecode/templates/admin/users/users.html:23
-#, fuzzy
-msgid "Add new user"
-msgstr "adicionar novo usuário"
-
-#: rhodecode/templates/admin/users/users.html:77
-msgid "username"
-msgstr "nome de usuário"
-
#: rhodecode/templates/admin/users/users.html:80
#, fuzzy
-msgid "firstname"
+msgid "Firstname"
msgstr "Primeiro Nome"
#: rhodecode/templates/admin/users/users.html:81
-msgid "lastname"
+#, fuzzy
+msgid "Lastname"
msgstr "sobrenome"
#: rhodecode/templates/admin/users/users.html:82
-msgid "last login"
+#, fuzzy
+msgid "Last login"
msgstr "último login"
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/admin/users_groups/users_groups.html:34
-msgid "active"
-msgstr "ativo"
-
-#: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:244
-msgid "ldap"
-msgstr "ldap"
-
#: rhodecode/templates/admin/users_groups/users_group_add.html:5
-msgid "Add users group"
+#, fuzzy
+msgid "Add user group"
msgstr "Adicionar grupo de usuários"
#: rhodecode/templates/admin/users_groups/users_group_add.html:10
-#: rhodecode/templates/admin/users_groups/users_groups.html:9
-msgid "Users groups"
-msgstr "Grupos de usuários"
+#: rhodecode/templates/admin/users_groups/users_groups.html:11
+#: rhodecode/templates/base/base.html:72
+#, fuzzy
+msgid "User groups"
+msgstr "grupos de usuários"
#: rhodecode/templates/admin/users_groups/users_group_add.html:12
-msgid "add new users group"
+#: rhodecode/templates/admin/users_groups/users_groups.html:25
+#, fuzzy
+msgid "Add new user group"
msgstr "Adicionar novo grupo de usuários"
#: rhodecode/templates/admin/users_groups/users_group_edit.html:5
-msgid "Edit users group"
+#, fuzzy
+msgid "Edit user group"
msgstr "Editar grupo de usuários"
#: rhodecode/templates/admin/users_groups/users_group_edit.html:11
-msgid "UsersGroups"
-msgstr "Grupos de Usuários"
+#, fuzzy
+msgid "UserGroups"
+msgstr "grupos de usuários"
#: rhodecode/templates/admin/users_groups/users_group_edit.html:50
+#: rhodecode/templates/admin/users_groups/users_groups.html:35
msgid "Members"
msgstr "Membros"
#: rhodecode/templates/admin/users_groups/users_group_edit.html:58
-msgid "Choosen group members"
+#, fuzzy
+msgid "Chosen group members"
msgstr "Membros escolhidos do grupo"
#: rhodecode/templates/admin/users_groups/users_group_edit.html:61
@@ -3075,270 +3238,266 @@ msgstr "Membros disponíveis"
msgid "Add all elements"
msgstr "Adicionar todos os elementos"
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:146
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:150
msgid "Group members"
msgstr "Membros do grupo"
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:163
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:167
#, fuzzy
msgid "No members yet"
msgstr "membros"
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:171
-#, fuzzy
-msgid "Permissions defined for this group"
-msgstr "Administração de permissões"
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:178
-#, fuzzy
-msgid "No permissions set yet"
-msgstr "Copiar permissões"
-
#: rhodecode/templates/admin/users_groups/users_groups.html:5
-msgid "Users groups administration"
-msgstr "Administração de grupos de usuários"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:23
#, fuzzy
-msgid "Add new user group"
-msgstr "Adicionar novo grupo de usuários"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:32
-msgid "group name"
-msgstr "nome do grupo"
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:33
-#: rhodecode/templates/base/root.html:46
-msgid "members"
-msgstr "membros"
+msgid "User groups administration"
+msgstr "Administração de grupos de usuários"
-#: rhodecode/templates/admin/users_groups/users_groups.html:45
-#, python-format
-msgid "Confirm to delete this users group: %s"
+#: rhodecode/templates/admin/users_groups/users_groups.html:47
+#, fuzzy, python-format
+msgid "Confirm to delete this user group: %s"
msgstr "Confirme para excluir este grupo de usuários: %s"
-#: rhodecode/templates/base/base.html:41
+#: rhodecode/templates/base/base.html:42
msgid "Submit a bug"
msgstr "Encaminhe um bug"
-#: rhodecode/templates/base/base.html:76
-#, fuzzy
-msgid "Not logged in"
-msgstr "último login"
-
-#: rhodecode/templates/base/base.html:83
-msgid "Login to your account"
-msgstr "Entrar com sua conta"
-
-#: rhodecode/templates/base/base.html:106
-msgid "Forgot password ?"
-msgstr "Esqueceu a senha ?"
-
-#: rhodecode/templates/base/base.html:113
-msgid "Log In"
-msgstr "Entrar"
-
-#: rhodecode/templates/base/base.html:124
-msgid "Inbox"
-msgstr "Caixa de Entrada"
-
-#: rhodecode/templates/base/base.html:129
-#: rhodecode/templates/base/base.html:297
-#: rhodecode/templates/base/base.html:299
-#: rhodecode/templates/base/base.html:301
-#: rhodecode/templates/journal/journal.html:4
-#: rhodecode/templates/journal/public_journal.html:4
-msgid "Journal"
-msgstr "Diário"
-
-#: rhodecode/templates/base/base.html:131
-msgid "Log Out"
-msgstr "Sair"
-
-#: rhodecode/templates/base/base.html:150
-msgid "Switch repository"
-msgstr "Trocar repositório"
-
-#: rhodecode/templates/base/base.html:152
-msgid "Products"
-msgstr "Produtos"
-
-#: rhodecode/templates/base/base.html:158
-#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47
-msgid "loading..."
-msgstr "carregando..."
-
-#: rhodecode/templates/base/base.html:166
-#: rhodecode/templates/base/base.html:168
-#: rhodecode/templates/base/base.html:170
+#: rhodecode/templates/base/base.html:108
#: rhodecode/templates/data_table/_dt_elements.html:9
#: rhodecode/templates/data_table/_dt_elements.html:11
#: rhodecode/templates/data_table/_dt_elements.html:13
+#: rhodecode/templates/pullrequests/pullrequest_show.html:81
+#: rhodecode/templates/summary/summary.html:8
msgid "Summary"
msgstr "Sumário"
-#: rhodecode/templates/base/base.html:174
-#: rhodecode/templates/base/base.html:176
-#: rhodecode/templates/base/base.html:178
-#: rhodecode/templates/changelog/changelog.html:15
+#: rhodecode/templates/base/base.html:109
+#: rhodecode/templates/changelog/changelog.html:11
#: rhodecode/templates/data_table/_dt_elements.html:17
#: rhodecode/templates/data_table/_dt_elements.html:19
#: rhodecode/templates/data_table/_dt_elements.html:21
msgid "Changelog"
msgstr "Registro de alterações"
-#: rhodecode/templates/base/base.html:182
-#: rhodecode/templates/base/base.html:184
-#: rhodecode/templates/base/base.html:186
-msgid "Switch to"
-msgstr "Trocar para"
-
-#: rhodecode/templates/base/base.html:193
-#: rhodecode/templates/base/base.html:195
-#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/base/base.html:110
#: rhodecode/templates/data_table/_dt_elements.html:25
#: rhodecode/templates/data_table/_dt_elements.html:27
#: rhodecode/templates/data_table/_dt_elements.html:29
+#: rhodecode/templates/files/files.html:12
msgid "Files"
msgstr "Arquivos"
-#: rhodecode/templates/base/base.html:201
-#: rhodecode/templates/base/base.html:205
+#: rhodecode/templates/base/base.html:112
+#, fuzzy
+msgid "Switch To"
+msgstr "Trocar para"
+
+#: rhodecode/templates/base/base.html:114
+#: rhodecode/templates/base/base.html:267
+msgid "loading..."
+msgstr "carregando..."
+
+#: rhodecode/templates/base/base.html:118
msgid "Options"
msgstr "Opções"
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/base/base.html:212
+#: rhodecode/templates/base/base.html:124
+#: rhodecode/templates/forks/forks_data.html:21
#, fuzzy
-msgid "repository settings"
-msgstr "Criação de repositório"
+msgid "Compare fork"
+msgstr "comparar exibir"
-#: rhodecode/templates/base/base.html:216
+#: rhodecode/templates/base/base.html:126
+msgid "Lightweight changelog"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:127
+#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/search/search.html:14
+#: rhodecode/templates/search/search.html:54
+msgid "Search"
+msgstr "Pesquisar"
+
+#: rhodecode/templates/base/base.html:133
+#, fuzzy
+msgid "Lock"
+msgstr "destravar"
+
+#: rhodecode/templates/base/base.html:141
+#, fuzzy
+msgid "Follow"
+msgstr "seguidores"
+
+#: rhodecode/templates/base/base.html:142
+#, fuzzy
+msgid "Unfollow"
+msgstr "seguidores"
+
+#: rhodecode/templates/base/base.html:145
+#: rhodecode/templates/data_table/_dt_elements.html:33
+#: rhodecode/templates/data_table/_dt_elements.html:35
+#: rhodecode/templates/data_table/_dt_elements.html:37
#: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/forks/fork.html:13
-msgid "fork"
-msgstr "bifurcação"
+#: rhodecode/templates/forks/fork.html:9
+msgid "Fork"
+msgstr "Bifurcação"
-#: rhodecode/templates/base/base.html:218
-#: rhodecode/templates/changelog/changelog.html:43
+#: rhodecode/templates/base/base.html:147
#, fuzzy
-msgid "open new pull request"
+msgid "Create Pull Request"
msgstr "Criar novo arquivo"
-#: rhodecode/templates/base/base.html:221
+#: rhodecode/templates/base/base.html:153
#, fuzzy
-msgid "compare fork"
-msgstr "comparar exibir"
+msgid "Show Pull Requests"
+msgstr "comentado no commit"
-#: rhodecode/templates/base/base.html:223
-msgid "search"
-msgstr "pesquisar"
+#: rhodecode/templates/base/base.html:153
+#, fuzzy
+msgid "Pull Requests"
+msgstr "comentado no commit"
-#: rhodecode/templates/base/base.html:229
+#: rhodecode/templates/base/base.html:190
#, fuzzy
-msgid "lock"
-msgstr "destravar"
+msgid "Not logged in"
+msgstr "último login"
-#: rhodecode/templates/base/base.html:240
-msgid "repositories groups"
-msgstr "grupos de repositórios"
+#: rhodecode/templates/base/base.html:197
+msgid "Login to your account"
+msgstr "Entrar com sua conta"
-#: rhodecode/templates/base/base.html:242
-msgid "users groups"
-msgstr "grupos de usuários"
+#: rhodecode/templates/base/base.html:220
+msgid "Forgot password ?"
+msgstr "Esqueceu a senha ?"
#: rhodecode/templates/base/base.html:243
-msgid "permissions"
-msgstr "permissões"
+msgid "Log Out"
+msgstr "Sair"
-#: rhodecode/templates/base/base.html:245
-#, fuzzy
-msgid "defaults"
-msgstr "excluir"
+#: rhodecode/templates/base/base.html:262
+msgid "Switch repository"
+msgstr "Trocar repositório"
-#: rhodecode/templates/base/base.html:246
-msgid "settings"
-msgstr "configurações"
+#: rhodecode/templates/base/base.html:274
+msgid "Show recent activity"
+msgstr ""
-#: rhodecode/templates/base/base.html:256
-#: rhodecode/templates/base/base.html:258
-msgid "Followers"
-msgstr "Seguidores"
+#: rhodecode/templates/base/base.html:275
+#: rhodecode/templates/journal/journal.html:4
+msgid "Journal"
+msgstr "Diário"
-#: rhodecode/templates/base/base.html:264
-#: rhodecode/templates/base/base.html:266
-msgid "Forks"
-msgstr "Bifurcações"
+#: rhodecode/templates/base/base.html:286
+#, fuzzy
+msgid "Search in repositories"
+msgstr "em todos os repositórios"
-#: rhodecode/templates/base/base.html:315
-#: rhodecode/templates/base/base.html:317
-#: rhodecode/templates/base/base.html:319
-#: rhodecode/templates/search/search.html:52
-msgid "Search"
-msgstr "Pesquisar"
+#: rhodecode/templates/base/perms_summary.html:8
+#, fuzzy
+msgid "No permissions defined yet"
+msgstr "Copiar permissões"
-#: rhodecode/templates/base/root.html:42
-msgid "add another comment"
-msgstr "adicionar outro comentário"
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "Permission"
+msgstr "Permissão"
+
+#: rhodecode/templates/base/perms_summary.html:16
+#, fuzzy
+msgid "Edit Permission"
+msgstr "Permissão de repositório"
#: rhodecode/templates/base/root.html:43
+#, fuzzy
+msgid "Add another comment"
+msgstr "adicionar outro comentário"
+
+#: rhodecode/templates/base/root.html:44
#: rhodecode/templates/data_table/_dt_elements.html:140
-#: rhodecode/templates/summary/summary.html:57
msgid "Stop following this repository"
msgstr "Parar de seguir este repositório"
-#: rhodecode/templates/base/root.html:44
-#: rhodecode/templates/summary/summary.html:61
+#: rhodecode/templates/base/root.html:45
msgid "Start following this repository"
msgstr "Passar a seguir este repositório"
-#: rhodecode/templates/base/root.html:45
+#: rhodecode/templates/base/root.html:46
msgid "Group"
msgstr "Grupo"
+#: rhodecode/templates/base/root.html:47
+msgid "members"
+msgstr "membros"
+
#: rhodecode/templates/base/root.html:48
-msgid "search truncated"
-msgstr "pesquisa truncada"
+#: rhodecode/templates/pullrequests/pullrequest.html:181
+#, fuzzy
+msgid "Loading ..."
+msgstr "carregando..."
#: rhodecode/templates/base/root.html:49
-msgid "no matching files"
-msgstr "nenhum arquivo corresponde"
+#, fuzzy
+msgid "Search truncated"
+msgstr "pesquisa truncada"
#: rhodecode/templates/base/root.html:50
+#, fuzzy
+msgid "No matching files"
+msgstr "nenhum arquivo corresponde"
+
+#: rhodecode/templates/base/root.html:51
+#: rhodecode/templates/changelog/changelog.html:36
msgid "Open new pull request"
msgstr ""
-#: rhodecode/templates/base/root.html:51
+#: rhodecode/templates/base/root.html:52
msgid "Open new pull request for selected changesets"
msgstr ""
-#: rhodecode/templates/base/root.html:52
-msgid "Show selected changes __S -> __E"
+#: rhodecode/templates/base/root.html:53
+#, fuzzy
+msgid "Show selected changesets __S -> __E"
msgstr "Mostrar alterações selecionadas __S -> __E"
-#: rhodecode/templates/base/root.html:53
+#: rhodecode/templates/base/root.html:54
+#, fuzzy
+msgid "Show selected changeset __S"
+msgstr "Mostrar alterações selecionadas __S -> __E"
+
+#: rhodecode/templates/base/root.html:55
msgid "Selection link"
msgstr "Link da seleção"
+#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/changeset/diff_block.html:8
+#, fuzzy
+msgid "Collapse diff"
+msgstr "Diff do arquivo"
+
+#: rhodecode/templates/base/root.html:57
+#, fuzzy
+msgid "Expand diff"
+msgstr "diff bruto"
+
#: rhodecode/templates/bookmarks/bookmarks.html:5
#, fuzzy, python-format
msgid "%s Bookmarks"
msgstr "marcadores"
-#: rhodecode/templates/bookmarks/bookmarks.html:39
+#: rhodecode/templates/bookmarks/bookmarks.html:37
#: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:53
+#: rhodecode/templates/branches/branches.html:50
#: rhodecode/templates/branches/branches_data.html:8
-#: rhodecode/templates/tags/tags.html:54
+#: rhodecode/templates/shortlog/shortlog_data.html:8
+#: rhodecode/templates/tags/tags.html:51
#: rhodecode/templates/tags/tags_data.html:8
msgid "Author"
msgstr "Autor"
-#: rhodecode/templates/bookmarks/bookmarks.html:40
+#: rhodecode/templates/bookmarks/bookmarks.html:38
#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:54
+#: rhodecode/templates/branches/branches.html:51
#: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/tags/tags.html:55
+#: rhodecode/templates/shortlog/shortlog_data.html:5
+#: rhodecode/templates/tags/tags.html:52
#: rhodecode/templates/tags/tags_data.html:9
msgid "Revision"
msgstr "Revisão"
@@ -3348,16 +3507,14 @@ msgstr "Revisão"
msgid "%s Branches"
msgstr "ramos"
-#: rhodecode/templates/branches/branches.html:29
+#: rhodecode/templates/branches/branches.html:26
#, fuzzy
msgid "Compare branches"
msgstr "ramos"
-#: rhodecode/templates/branches/branches.html:56
+#: rhodecode/templates/branches/branches.html:53
#: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/compare/compare_diff.html:5
-#: rhodecode/templates/compare/compare_diff.html:13
-#: rhodecode/templates/tags/tags.html:57
+#: rhodecode/templates/tags/tags.html:54
#: rhodecode/templates/tags/tags_data.html:10
#, fuzzy
msgid "Compare"
@@ -3368,119 +3525,85 @@ msgstr "comparar exibir"
msgid "%s Changelog"
msgstr "Registro de alterações"
-#: rhodecode/templates/changelog/changelog.html:15
+#: rhodecode/templates/changelog/changelog.html:11
#, python-format
msgid "showing %d out of %d revision"
msgid_plural "showing %d out of %d revisions"
msgstr[0] "mostrando %d de %d revisão"
msgstr[1] "mostrando %d de %d revisões"
-#: rhodecode/templates/changelog/changelog.html:37
+#: rhodecode/templates/changelog/changelog.html:30
#, fuzzy
msgid "Clear selection"
msgstr "Configurações de busca"
-#: rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/templates/changelog/changelog.html:33
#: rhodecode/templates/forks/forks_data.html:19
-#, python-format
-msgid "compare fork with %s"
-msgstr ""
+#, fuzzy, python-format
+msgid "Compare fork with %s"
+msgstr "comparar exibir"
-#: rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/templates/changelog/changelog.html:33
#, fuzzy
msgid "Compare fork with parent"
msgstr "comparar exibir"
-#: rhodecode/templates/changelog/changelog.html:49
-msgid "Show"
-msgstr "Mostrar"
-
-#: rhodecode/templates/changelog/changelog.html:74
-#: rhodecode/templates/summary/summary.html:375
-msgid "show more"
-msgstr "mostrar mais"
-
-#: rhodecode/templates/changelog/changelog.html:78
-msgid "Affected number of files, click to show more details"
-msgstr "Número de arquivos afetados, clique para mostrar mais detalhes"
-
-#: rhodecode/templates/changelog/changelog.html:91
-#: rhodecode/templates/changeset/changeset.html:65
-#: rhodecode/templates/changeset/changeset_file_comment.html:20
-#: rhodecode/templates/changeset/changeset_range.html:46
+#: rhodecode/templates/changelog/changelog.html:76
+#: rhodecode/templates/summary/summary.html:404
#, fuzzy
-msgid "Changeset status"
-msgstr "Conjuntos de mudanças"
+msgid "Show more"
+msgstr "mostrar mais"
-#: rhodecode/templates/changelog/changelog.html:94
-#: rhodecode/templates/shortlog/shortlog_data.html:20
+#: rhodecode/templates/changelog/changelog.html:89
+#: rhodecode/templates/changeset/changeset_range.html:86
#, fuzzy, python-format
-msgid "Click to open associated pull request #%s"
-msgstr "repositório [criado]"
-
-#: rhodecode/templates/changelog/changelog.html:104
-msgid "Parent"
-msgstr "Progenitor"
+msgid "Bookmark %s"
+msgstr "marcadores"
-#: rhodecode/templates/changelog/changelog.html:110
-#: rhodecode/templates/changeset/changeset.html:42
-msgid "No parents"
-msgstr "Sem progenitores"
+#: rhodecode/templates/changelog/changelog.html:95
+#: rhodecode/templates/changeset/changeset.html:111
+#: rhodecode/templates/changeset/changeset_range.html:92
+#, fuzzy, python-format
+msgid "Tag %s"
+msgstr "etiquetas"
-#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog.html:100
#: rhodecode/templates/changeset/changeset.html:106
-#: rhodecode/templates/changeset/changeset_range.html:79
-msgid "merge"
-msgstr "mesclar"
-
-#: rhodecode/templates/changelog/changelog.html:118
-#: rhodecode/templates/changeset/changeset.html:109
-#: rhodecode/templates/changeset/changeset_range.html:82
-#: rhodecode/templates/files/files.html:29
-#: rhodecode/templates/files/files_add.html:33
-#: rhodecode/templates/files/files_edit.html:33
-#: rhodecode/templates/shortlog/shortlog_data.html:9
-msgid "branch"
-msgstr "ramo"
-
-#: rhodecode/templates/changelog/changelog.html:124
-#: rhodecode/templates/changeset/changeset_range.html:88
-msgid "bookmark"
-msgstr "marcador"
-
-#: rhodecode/templates/changelog/changelog.html:130
-#: rhodecode/templates/changeset/changeset.html:114
-#: rhodecode/templates/changeset/changeset_range.html:94
-msgid "tag"
-msgstr "etiqueta"
+#: rhodecode/templates/changeset/changeset_range.html:80
+#, fuzzy, python-format
+msgid "Branch %s"
+msgstr "ramos"
-#: rhodecode/templates/changelog/changelog.html:302
+#: rhodecode/templates/changelog/changelog.html:258
msgid "There are no changes yet"
msgstr "Ainda não há alteações"
#: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:94
-msgid "removed"
+#: rhodecode/templates/changeset/changeset.html:91
+#, fuzzy
+msgid "Removed"
msgstr "removidos"
#: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:95
-msgid "changed"
+#: rhodecode/templates/changeset/changeset.html:92
+#, fuzzy
+msgid "Changed"
msgstr "alterados"
#: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:96
-msgid "added"
+#: rhodecode/templates/changeset/changeset.html:93
+#, fuzzy
+msgid "Added"
msgstr "adicionados"
#: rhodecode/templates/changelog/changelog_details.html:8
#: rhodecode/templates/changelog/changelog_details.html:9
#: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:98
-#: rhodecode/templates/changeset/changeset.html:99
-#: rhodecode/templates/changeset/changeset.html:100
-#, python-format
-msgid "affected %s files"
+#: rhodecode/templates/changeset/changeset.html:95
+#: rhodecode/templates/changeset/changeset.html:96
+#: rhodecode/templates/changeset/changeset.html:97
+#, fuzzy, python-format
+msgid "Affected %s files"
msgstr "%s arquivos afetados"
#: rhodecode/templates/changeset/changeset.html:6
@@ -3488,30 +3611,39 @@ msgstr "%s arquivos afetados"
msgid "%s Changeset"
msgstr "Conjunto de Mudanças"
-#: rhodecode/templates/changeset/changeset.html:14
-msgid "Changeset"
-msgstr "Conjunto de Mudanças"
+#: rhodecode/templates/changeset/changeset.html:39
+msgid "No parents"
+msgstr "Sem progenitores"
-#: rhodecode/templates/changeset/changeset.html:52
+#: rhodecode/templates/changeset/changeset.html:49
msgid "No children"
msgstr ""
-#: rhodecode/templates/changeset/changeset.html:70
-#: rhodecode/templates/changeset/diff_block.html:20
-msgid "raw diff"
+#: rhodecode/templates/changeset/changeset.html:62
+#: rhodecode/templates/changeset/changeset_file_comment.html:20
+#: rhodecode/templates/changeset/changeset_range.html:44
+#, fuzzy
+msgid "Changeset status"
+msgstr "Conjuntos de mudanças"
+
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/diff_block.html:23
+#, fuzzy
+msgid "Raw diff"
msgstr "diff bruto"
-#: rhodecode/templates/changeset/changeset.html:71
+#: rhodecode/templates/changeset/changeset.html:68
#, fuzzy
-msgid "patch diff"
+msgid "Patch diff"
msgstr "diff bruto"
-#: rhodecode/templates/changeset/changeset.html:72
-#: rhodecode/templates/changeset/diff_block.html:21
-msgid "download diff"
+#: rhodecode/templates/changeset/changeset.html:69
+#: rhodecode/templates/changeset/diff_block.html:24
+#, fuzzy
+msgid "Download diff"
msgstr "descarregar diff"
-#: rhodecode/templates/changeset/changeset.html:76
+#: rhodecode/templates/changeset/changeset.html:73
#: rhodecode/templates/changeset/changeset_file_comment.html:97
#, python-format
msgid "%d comment"
@@ -3519,7 +3651,7 @@ msgid_plural "%d comments"
msgstr[0] "%d comentário"
msgstr[1] "%d comentários"
-#: rhodecode/templates/changeset/changeset.html:76
+#: rhodecode/templates/changeset/changeset.html:73
#: rhodecode/templates/changeset/changeset_file_comment.html:97
#, python-format
msgid "(%d inline)"
@@ -3527,32 +3659,54 @@ msgid_plural "(%d inline)"
msgstr[0] "(%d em linha)"
msgstr[1] "(%d em linha)"
-#: rhodecode/templates/changeset/changeset.html:122
-#: rhodecode/templates/compare/compare_diff.html:44
-#: rhodecode/templates/pullrequests/pullrequest_show.html:94
+#: rhodecode/templates/changeset/changeset.html:103
+#: rhodecode/templates/changeset/changeset_range.html:77
+msgid "merge"
+msgstr "mesclar"
+
+#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/templates/compare/compare_diff.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:113
#, fuzzy, python-format
msgid "%s file changed"
msgid_plural "%s files changed"
msgstr[0] "arquivo alterado"
msgstr[1] ""
-#: rhodecode/templates/changeset/changeset.html:124
-#: rhodecode/templates/compare/compare_diff.html:46
-#: rhodecode/templates/pullrequests/pullrequest_show.html:96
+#: rhodecode/templates/changeset/changeset.html:121
+#: rhodecode/templates/compare/compare_diff.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:115
#, fuzzy, python-format
msgid "%s file changed with %s insertions and %s deletions"
msgid_plural "%s files changed with %s insertions and %s deletions"
msgstr[0] "%s arquivos afetados com %s inserções e %s exclusões"
msgstr[1] ""
+#: rhodecode/templates/changeset/changeset.html:134
+#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+msgid "Showing a huge diff might take some time and resources"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:134
+#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/compare/compare_diff.html:58
+#: rhodecode/templates/compare/compare_diff.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+#, fuzzy
+msgid "Show full diff"
+msgstr "Carregando lista de arquivos..."
+
#: rhodecode/templates/changeset/changeset_file_comment.html:30
#, fuzzy, python-format
-msgid "Status from pull request %s"
+msgid "Status change on pull request #%s"
msgstr "Criar novo arquivo"
#: rhodecode/templates/changeset/changeset_file_comment.html:32
#, fuzzy, python-format
-msgid "Comment from pull request %s"
+msgid "Comment on pull request #%s"
msgstr "repositório [criado]"
#: rhodecode/templates/changeset/changeset_file_comment.html:57
@@ -3564,27 +3718,27 @@ msgid "Commenting on line {1}."
msgstr "Comentando a linha {1}."
#: rhodecode/templates/changeset/changeset_file_comment.html:61
-#: rhodecode/templates/changeset/changeset_file_comment.html:140
+#: rhodecode/templates/changeset/changeset_file_comment.html:139
#, python-format
msgid "Comments parsed using %s syntax with %s support."
msgstr "Comentários interpretados usando a sintaxe %s com suporte a %s."
#: rhodecode/templates/changeset/changeset_file_comment.html:63
-#: rhodecode/templates/changeset/changeset_file_comment.html:142
+#: rhodecode/templates/changeset/changeset_file_comment.html:141
msgid "Use @username inside this text to send notification to this RhodeCode user"
msgstr ""
"Use @nomedeusuário dentro desse texto para enviar notificação a este "
"usuário do RhodeCode"
#: rhodecode/templates/changeset/changeset_file_comment.html:74
-#: rhodecode/templates/changeset/changeset_file_comment.html:162
+#: rhodecode/templates/changeset/changeset_file_comment.html:161
msgid "Comment"
msgstr "Comentário"
#: rhodecode/templates/changeset/changeset_file_comment.html:75
-#: rhodecode/templates/changeset/changeset_file_comment.html:86
-msgid "Hide"
-msgstr "Ocultar"
+#, fuzzy
+msgid "Cancel"
+msgstr "alterados"
#: rhodecode/templates/changeset/changeset_file_comment.html:82
msgid "You need to be logged in to comment."
@@ -3594,20 +3748,16 @@ msgstr "Você precisa estar logado para comentar."
msgid "Login now"
msgstr "Entrar agora"
-#: rhodecode/templates/changeset/changeset_file_comment.html:137
-msgid "Leave a comment"
-msgstr "Deixar um comentário"
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:144
-msgid "Check this to change current status of code-review for this changeset"
-msgstr ""
+#: rhodecode/templates/changeset/changeset_file_comment.html:86
+msgid "Hide"
+msgstr "Ocultar"
-#: rhodecode/templates/changeset/changeset_file_comment.html:144
+#: rhodecode/templates/changeset/changeset_file_comment.html:143
#, fuzzy
-msgid "change status"
+msgid "Change status"
msgstr "Conjuntos de mudanças"
-#: rhodecode/templates/changeset/changeset_file_comment.html:164
+#: rhodecode/templates/changeset/changeset_file_comment.html:163
msgid "Comment and close"
msgstr ""
@@ -3616,73 +3766,80 @@ msgstr ""
msgid "%s Changesets"
msgstr "Conjuntos de mudanças"
-#: rhodecode/templates/changeset/changeset_range.html:29
-#: rhodecode/templates/compare/compare_diff.html:29
-msgid "Compare View"
-msgstr "Exibir Comparação"
-
-#: rhodecode/templates/changeset/changeset_range.html:29
-#, fuzzy
-msgid "Show combined compare"
-msgstr "mostrar comentários em linha"
-
-#: rhodecode/templates/changeset/changeset_range.html:54
+#: rhodecode/templates/changeset/changeset_range.html:52
msgid "Files affected"
msgstr "Arquivos afetados"
-#: rhodecode/templates/changeset/diff_block.html:19
-msgid "show full diff for this file"
+#: rhodecode/templates/changeset/diff_block.html:22
+msgid "Show full diff for this file"
msgstr ""
-#: rhodecode/templates/changeset/diff_block.html:27
-msgid "show inline comments"
+#: rhodecode/templates/changeset/diff_block.html:30
+#, fuzzy
+msgid "Show inline comments"
msgstr "mostrar comentários em linha"
-#: rhodecode/templates/compare/compare_cs.html:5
+#: rhodecode/templates/changeset/diff_block.html:55
+msgid "Show file at latest version in this repo"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:56
+msgid "Show file at initial version in this repo"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_cs.html:4
#, fuzzy
msgid "No changesets"
msgstr "Nenhum conjunto de alterações ainda."
-#: rhodecode/templates/compare/compare_diff.html:37
-#: rhodecode/templates/pullrequests/pullrequest_show.html:87
+#: rhodecode/templates/compare/compare_cs.html:32
+#, fuzzy
+msgid "Ancestor"
+msgstr "ramos"
+
+#: rhodecode/templates/compare/compare_diff.html:5
+#, fuzzy, python-format
+msgid "%s Compare"
+msgstr "comparar exibir"
+
+#: rhodecode/templates/compare/compare_diff.html:9
+#, fuzzy
+msgid "Compare revisions"
+msgstr "revisão anterior"
+
+#: rhodecode/templates/compare/compare_diff.html:33
+#: rhodecode/templates/pullrequests/pullrequest_show.html:106
#, fuzzy, python-format
msgid "Showing %s commit"
msgid_plural "Showing %s commits"
msgstr[0] "mostrar comentários em linha"
msgstr[1] ""
-#: rhodecode/templates/compare/compare_diff.html:52
-#: rhodecode/templates/pullrequests/pullrequest_show.html:102
+#: rhodecode/templates/compare/compare_diff.html:48
+#: rhodecode/templates/pullrequests/pullrequest_show.html:121
#, fuzzy
msgid "No files"
msgstr "arquivos"
-#: rhodecode/templates/data_table/_dt_elements.html:33
-#: rhodecode/templates/data_table/_dt_elements.html:35
-#: rhodecode/templates/data_table/_dt_elements.html:37
-msgid "Fork"
-msgstr "Bifurcação"
+#: rhodecode/templates/compare/compare_diff.html:58
+#: rhodecode/templates/compare/compare_diff.html:69
+msgid "confirm to show potentially huge diff"
+msgstr ""
#: rhodecode/templates/data_table/_dt_elements.html:54
-#: rhodecode/templates/summary/summary.html:77
+#: rhodecode/templates/summary/summary.html:69
msgid "Mercurial repository"
msgstr "Repositório Mercurial"
#: rhodecode/templates/data_table/_dt_elements.html:56
-#: rhodecode/templates/summary/summary.html:80
+#: rhodecode/templates/summary/summary.html:72
msgid "Git repository"
msgstr "Repositório Git"
-#: rhodecode/templates/data_table/_dt_elements.html:63
-#: rhodecode/templates/summary/summary.html:87
-msgid "public repository"
-msgstr "repositório público"
-
#: rhodecode/templates/data_table/_dt_elements.html:74
-#: rhodecode/templates/summary/summary.html:96
-#: rhodecode/templates/summary/summary.html:97
-msgid "Fork of"
-msgstr "Bifurcação de"
+#, fuzzy, python-format
+msgid "Fork of %s"
+msgstr "nome da bifurcação"
#: rhodecode/templates/data_table/_dt_elements.html:88
msgid "No changesets yet"
@@ -3710,30 +3867,46 @@ msgstr "Confirma excluir esse repositório: %s"
msgid "Confirm to delete this user: %s"
msgstr "Confirma excluir este usuário: %s"
-#: rhodecode/templates/email_templates/changeset_comment.html:10
+#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/email_templates/pull_request_comment.html:15
#, fuzzy
-msgid "New status$"
+msgid "New status"
msgstr "Conjuntos de mudanças"
+#: rhodecode/templates/email_templates/changeset_comment.html:11
+#: rhodecode/templates/email_templates/pull_request_comment.html:9
+msgid "View this comment here"
+msgstr ""
+
+#: rhodecode/templates/email_templates/changeset_comment.html:14
+#, fuzzy
+msgid "Repo"
+msgstr "Meus repositórios"
+
+#: rhodecode/templates/email_templates/changeset_comment.html:16
+msgid "desc"
+msgstr ""
+
#: rhodecode/templates/email_templates/main.html:8
#, fuzzy
msgid "This is a notification from RhodeCode."
msgstr "Esta é uma notificação do RhodeCode."
#: rhodecode/templates/email_templates/password_reset.html:4
-msgid "Hello"
+#, python-format
+msgid "Hello %s"
msgstr ""
-#: rhodecode/templates/email_templates/password_reset.html:6
+#: rhodecode/templates/email_templates/password_reset.html:5
msgid "We received a request to create a new password for your account."
msgstr ""
-#: rhodecode/templates/email_templates/password_reset.html:8
+#: rhodecode/templates/email_templates/password_reset.html:6
msgid "You can generate it by clicking following URL"
msgstr ""
-#: rhodecode/templates/email_templates/password_reset.html:12
-msgid "If you didn't request new password please ignore this email."
+#: rhodecode/templates/email_templates/password_reset.html:11
+msgid "If you did not request new password please ignore this email."
msgstr ""
#: rhodecode/templates/email_templates/pull_request.html:4
@@ -3745,37 +3918,32 @@ msgstr ""
#: rhodecode/templates/email_templates/pull_request.html:5
#, fuzzy
-msgid "title"
-msgstr "escrever"
+msgid "View this pull request here"
+msgstr "Confirma excluir este repositório"
#: rhodecode/templates/email_templates/pull_request.html:6
-#: rhodecode/templates/pullrequests/pullrequest.html:115
#, fuzzy
-msgid "description"
-msgstr "Descrição"
+msgid "title"
+msgstr "escrever"
#: rhodecode/templates/email_templates/pull_request.html:7
#, fuzzy
-msgid "View this pull request here"
-msgstr "Confirma excluir este repositório"
+msgid "description"
+msgstr "Descrição"
#: rhodecode/templates/email_templates/pull_request.html:12
msgid "revisions for reviewing"
msgstr ""
-#: rhodecode/templates/email_templates/pull_request_comment.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:3
#, fuzzy, python-format
-msgid "User %s commented on pull request #%s for repository %s"
+msgid "Pull request #%s for repository %s"
msgstr "repositório [criado]"
-#: rhodecode/templates/email_templates/pull_request_comment.html:10
+#: rhodecode/templates/email_templates/pull_request_comment.html:13
#, fuzzy
-msgid "New status"
-msgstr "Conjuntos de mudanças"
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:14
-msgid "View this comment here"
-msgstr ""
+msgid "Closing pull request with status"
+msgstr "repositório [criado]"
#: rhodecode/templates/email_templates/registration.html:4
#, fuzzy
@@ -3786,109 +3954,115 @@ msgstr "Você se registrou com sucesso no rhodecode"
msgid "View this user here"
msgstr ""
-#: rhodecode/templates/errors/error_document.html:46
+#: rhodecode/templates/errors/error_document.html:55
#, python-format
msgid "You will be redirected to %s in %s seconds"
msgstr "Você será redirecionado para %s em %s segundos"
#: rhodecode/templates/files/file_diff.html:4
#, fuzzy, python-format
-msgid "%s File diff"
+msgid "%s File Diff"
msgstr "Diff do arquivo"
-#: rhodecode/templates/files/file_diff.html:12
+#: rhodecode/templates/files/file_diff.html:8
msgid "File diff"
msgstr "Diff do arquivo"
#: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:74
+#: rhodecode/templates/files/files.html:76
#, fuzzy, python-format
-msgid "%s files"
+msgid "%s Files"
msgstr "arquivos"
-#: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:351
-msgid "files"
-msgstr "arquivos"
+#: rhodecode/templates/files/files.html:30
+#: rhodecode/templates/files/files_add.html:31
+#: rhodecode/templates/files/files_edit.html:31
+#: rhodecode/templates/shortlog/shortlog_data.html:9
+#, fuzzy
+msgid "Branch"
+msgstr "ramo"
#: rhodecode/templates/files/files_add.html:4
-#: rhodecode/templates/files/files_edit.html:4
#, fuzzy, python-format
-msgid "%s Edit file"
-msgstr "editar arquivo"
+msgid "%s Files Add"
+msgstr "arquivos"
#: rhodecode/templates/files/files_add.html:19
-msgid "add file"
+#, fuzzy
+msgid "Add file"
msgstr "adicionar arquivo"
-#: rhodecode/templates/files/files_add.html:40
+#: rhodecode/templates/files/files_add.html:38
+#: rhodecode/templates/files/files_browser.html:31
+#: rhodecode/templates/shortlog/shortlog_data.html:78
msgid "Add new file"
msgstr "Adicionar novo arquivo"
-#: rhodecode/templates/files/files_add.html:45
+#: rhodecode/templates/files/files_add.html:43
msgid "File Name"
msgstr "Nome de Arquivo"
-#: rhodecode/templates/files/files_add.html:49
-#: rhodecode/templates/files/files_add.html:58
+#: rhodecode/templates/files/files_add.html:47
+#: rhodecode/templates/files/files_add.html:56
msgid "or"
msgstr "ou"
-#: rhodecode/templates/files/files_add.html:49
-#: rhodecode/templates/files/files_add.html:54
+#: rhodecode/templates/files/files_add.html:47
+#: rhodecode/templates/files/files_add.html:52
msgid "Upload file"
msgstr "Enviar arquivo"
-#: rhodecode/templates/files/files_add.html:58
+#: rhodecode/templates/files/files_add.html:56
msgid "Create new file"
msgstr "Criar novo arquivo"
-#: rhodecode/templates/files/files_add.html:63
-#: rhodecode/templates/files/files_edit.html:39
+#: rhodecode/templates/files/files_add.html:61
+#: rhodecode/templates/files/files_edit.html:37
#: rhodecode/templates/files/files_ypjax.html:3
msgid "Location"
msgstr "Local"
-#: rhodecode/templates/files/files_add.html:67
+#: rhodecode/templates/files/files_add.html:65
msgid "use / to separate directories"
msgstr "use / para separar diretórios"
-#: rhodecode/templates/files/files_add.html:77
-#: rhodecode/templates/files/files_edit.html:63
+#: rhodecode/templates/files/files_add.html:75
+#: rhodecode/templates/files/files_edit.html:61
#: rhodecode/templates/shortlog/shortlog_data.html:6
-msgid "commit message"
+#, fuzzy
+msgid "Commit message"
msgstr "mensagem de commit"
-#: rhodecode/templates/files/files_add.html:81
-#: rhodecode/templates/files/files_edit.html:67
+#: rhodecode/templates/files/files_add.html:79
+#: rhodecode/templates/files/files_edit.html:65
msgid "Commit changes"
msgstr "Realizar commit das alterações"
#: rhodecode/templates/files/files_browser.html:13
-msgid "view"
+#, fuzzy
+msgid "View"
msgstr "ver"
#: rhodecode/templates/files/files_browser.html:14
-msgid "previous revision"
+#, fuzzy
+msgid "Previous revision"
msgstr "revisão anterior"
#: rhodecode/templates/files/files_browser.html:16
-msgid "next revision"
+#, fuzzy
+msgid "Next revision"
msgstr "próxima revisão"
#: rhodecode/templates/files/files_browser.html:23
-msgid "follow current branch"
+#, fuzzy
+msgid "Follow current branch"
msgstr "seguir ramo atual"
#: rhodecode/templates/files/files_browser.html:27
-msgid "search file list"
+#, fuzzy
+msgid "Search file list"
msgstr "pesquisar lista de arquivos"
-#: rhodecode/templates/files/files_browser.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:78
-msgid "add new file"
-msgstr "adicionar novo arquivo"
-
#: rhodecode/templates/files/files_browser.html:35
msgid "Loading file list..."
msgstr "Carregando lista de arquivos..."
@@ -3913,31 +4087,41 @@ msgstr "Última alteração"
msgid "Last committer"
msgstr "Último commiter"
+#: rhodecode/templates/files/files_edit.html:4
+#, fuzzy, python-format
+msgid "%s Files Edit"
+msgstr "arquivos"
+
#: rhodecode/templates/files/files_edit.html:19
-msgid "edit file"
+#, fuzzy
+msgid "Edit file"
msgstr "editar arquivo"
-#: rhodecode/templates/files/files_edit.html:49
+#: rhodecode/templates/files/files_edit.html:47
#: rhodecode/templates/files/files_source.html:23
-msgid "show annotation"
+#, fuzzy
+msgid "Show annotation"
msgstr "mostrar anotação"
-#: rhodecode/templates/files/files_edit.html:50
+#: rhodecode/templates/files/files_edit.html:48
#: rhodecode/templates/files/files_source.html:25
#: rhodecode/templates/files/files_source.html:55
-msgid "show as raw"
+#, fuzzy
+msgid "Show as raw"
msgstr "mostrar como bruto"
-#: rhodecode/templates/files/files_edit.html:51
+#: rhodecode/templates/files/files_edit.html:49
#: rhodecode/templates/files/files_source.html:26
-msgid "download as raw"
+#, fuzzy
+msgid "Download as raw"
msgstr "descarregar como bruto"
-#: rhodecode/templates/files/files_edit.html:54
-msgid "source"
+#: rhodecode/templates/files/files_edit.html:52
+#, fuzzy
+msgid "Source"
msgstr "fonte"
-#: rhodecode/templates/files/files_edit.html:59
+#: rhodecode/templates/files/files_edit.html:57
msgid "Editing file"
msgstr "Editando arquivo"
@@ -3947,17 +4131,17 @@ msgstr "Histórico"
#: rhodecode/templates/files/files_history_box.html:9
#, fuzzy
-msgid "diff to revision"
+msgid "Diff to revision"
msgstr "próxima revisão"
#: rhodecode/templates/files/files_history_box.html:10
#, fuzzy
-msgid "show at revision"
+msgid "Show at revision"
msgstr "próxima revisão"
#: rhodecode/templates/files/files_history_box.html:11
#, fuzzy
-msgid "show full history"
+msgid "Show full history"
msgstr "Carregando lista de arquivos..."
#: rhodecode/templates/files/files_history_box.html:16
@@ -3973,17 +4157,19 @@ msgid "Load file history"
msgstr "Carregando lista de arquivos..."
#: rhodecode/templates/files/files_source.html:21
-msgid "show source"
+#, fuzzy
+msgid "Show source"
msgstr "mostrar fonte"
#: rhodecode/templates/files/files_source.html:29
#, fuzzy, python-format
-msgid "edit on branch:%s"
+msgid "Edit on branch:%s"
msgstr "excluído o repositório %s"
#: rhodecode/templates/files/files_source.html:31
-msgid "edit on branch:?"
-msgstr ""
+#, fuzzy
+msgid "Edit on branch:?"
+msgstr "excluído o repositório %s"
#: rhodecode/templates/files/files_source.html:31
msgid "Editing files allowed only when on branch head revision"
@@ -4015,9 +4201,11 @@ msgstr "Nenhum arquivo no caminho especificado"
msgid "%s Followers"
msgstr "seguidores"
-#: rhodecode/templates/followers/followers.html:13
-msgid "followers"
-msgstr "seguidores"
+#: rhodecode/templates/followers/followers.html:9
+#: rhodecode/templates/summary/summary.html:183
+#: rhodecode/templates/summary/summary.html:184
+msgid "Followers"
+msgstr "Seguidores"
#: rhodecode/templates/followers/followers_data.html:12
#, fuzzy
@@ -4029,32 +4217,33 @@ msgstr "Passou a seguir"
msgid "%s Fork"
msgstr "bifurcação"
-#: rhodecode/templates/forks/fork.html:31
+#: rhodecode/templates/forks/fork.html:28
msgid "Fork name"
msgstr "Nome da bifurcação"
-#: rhodecode/templates/forks/fork.html:68
+#: rhodecode/templates/forks/fork.html:65
msgid "Private"
msgstr "Privado"
-#: rhodecode/templates/forks/fork.html:77
+#: rhodecode/templates/forks/fork.html:74
msgid "Copy permissions"
msgstr "Copiar permissões"
-#: rhodecode/templates/forks/fork.html:81
+#: rhodecode/templates/forks/fork.html:78
msgid "Copy permissions from forked repository"
msgstr ""
-#: rhodecode/templates/forks/fork.html:86
+#: rhodecode/templates/forks/fork.html:84
msgid "Update after clone"
msgstr "Atualizar após clonar"
-#: rhodecode/templates/forks/fork.html:90
+#: rhodecode/templates/forks/fork.html:88
msgid "Checkout source after making a clone"
msgstr ""
-#: rhodecode/templates/forks/fork.html:94
-msgid "fork this repository"
+#: rhodecode/templates/forks/fork.html:93
+#, fuzzy
+msgid "Fork this repository"
msgstr "bifurcar este repositório"
#: rhodecode/templates/forks/forks.html:5
@@ -4062,18 +4251,16 @@ msgstr "bifurcar este repositório"
msgid "%s Forks"
msgstr "bifurcações"
-#: rhodecode/templates/forks/forks.html:13
-msgid "forks"
-msgstr "bifurcações"
+#: rhodecode/templates/forks/forks.html:9
+#: rhodecode/templates/summary/summary.html:189
+#: rhodecode/templates/summary/summary.html:190
+msgid "Forks"
+msgstr "Bifurcações"
#: rhodecode/templates/forks/forks_data.html:17
-msgid "forked"
-msgstr "bifurcado"
-
-#: rhodecode/templates/forks/forks_data.html:21
#, fuzzy
-msgid "Compare fork"
-msgstr "comparar exibir"
+msgid "Forked"
+msgstr "bifurcado"
#: rhodecode/templates/forks/forks_data.html:42
msgid "There are no forks yet"
@@ -4090,22 +4277,15 @@ msgid "RSS journal feed"
msgstr "diário público de %s - feed %s"
#: rhodecode/templates/journal/journal.html:32
-#: rhodecode/templates/pullrequests/pullrequest.html:55
msgid "Refresh"
msgstr "Atualizar"
#: rhodecode/templates/journal/journal.html:35
#: rhodecode/templates/journal/public_journal.html:24
-#, fuzzy
-msgid "RSS feed"
-msgstr "%s - feed %s"
-
-#: rhodecode/templates/journal/journal.html:38
-#: rhodecode/templates/journal/public_journal.html:27
msgid "ATOM feed"
msgstr ""
-#: rhodecode/templates/journal/journal.html:54
+#: rhodecode/templates/journal/journal.html:51
msgid "Watched"
msgstr "Seguindo"
@@ -4113,6 +4293,11 @@ msgstr "Seguindo"
msgid "No entries yet"
msgstr "Ainda não há entradas"
+#: rhodecode/templates/journal/public_journal.html:4
+#: rhodecode/templates/journal/public_journal.html:21
+msgid "Public Journal"
+msgstr "Diário Público"
+
#: rhodecode/templates/journal/public_journal.html:13
#, fuzzy
msgid "ATOM public journal feed"
@@ -4123,163 +4308,140 @@ msgstr "diário público de %s - feed %s"
msgid "RSS public journal feed"
msgstr "diário público de %s - feed %s"
-#: rhodecode/templates/journal/public_journal.html:21
-msgid "Public Journal"
-msgstr "Diário Público"
-
#: rhodecode/templates/pullrequests/pullrequest.html:4
-#: rhodecode/templates/pullrequests/pullrequest.html:12
+#: rhodecode/templates/pullrequests/pullrequest.html:8
msgid "New pull request"
msgstr ""
-#: rhodecode/templates/pullrequests/pullrequest.html:54
-msgid "refresh overview"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:66
+#: rhodecode/templates/pullrequests/pullrequest.html:52
#, fuzzy
msgid "Detailed compare view"
msgstr "comparar exibir"
-#: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:118
+#: rhodecode/templates/pullrequests/pullrequest.html:56
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
msgid "Pull request reviewers"
msgstr ""
-#: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:130
+#: rhodecode/templates/pullrequests/pullrequest.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
#, fuzzy
msgid "owner"
msgstr "Dono"
-#: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:145
+#: rhodecode/templates/pullrequests/pullrequest.html:77
msgid "Add reviewer to this pull request."
msgstr ""
-#: rhodecode/templates/pullrequests/pullrequest.html:97
+#: rhodecode/templates/pullrequests/pullrequest.html:83
#, fuzzy
msgid "Create new pull request"
msgstr "Criar novo arquivo"
-#: rhodecode/templates/pullrequests/pullrequest.html:106
+#: rhodecode/templates/pullrequests/pullrequest.html:92
+#: rhodecode/templates/pullrequests/pullrequest_data.html:14
#: rhodecode/templates/pullrequests/pullrequest_show.html:25
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
#, fuzzy
msgid "Title"
msgstr "escrever"
-#: rhodecode/templates/pullrequests/pullrequest.html:123
+#: rhodecode/templates/pullrequests/pullrequest.html:109
msgid "Send pull request"
msgstr ""
-#: rhodecode/templates/pullrequests/pullrequest_show.html:23
-#, python-format
-msgid "Closed %s"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:23
-#, python-format
-msgid "with status %s"
-msgstr ""
+#: rhodecode/templates/pullrequests/pullrequest_show.html:4
+#, fuzzy, python-format
+msgid "%s Pull Request #%s"
+msgstr "comentado no commit"
-#: rhodecode/templates/pullrequests/pullrequest_show.html:31
+#: rhodecode/templates/pullrequests/pullrequest_show.html:35
#, fuzzy
-msgid "Status"
+msgid "Review status"
msgstr "Conjuntos de mudanças"
-#: rhodecode/templates/pullrequests/pullrequest_show.html:36
+#: rhodecode/templates/pullrequests/pullrequest_show.html:40
msgid "Pull request status"
msgstr ""
-#: rhodecode/templates/pullrequests/pullrequest_show.html:44
+#: rhodecode/templates/pullrequests/pullrequest_show.html:53
msgid "Still not reviewed by"
msgstr ""
-#: rhodecode/templates/pullrequests/pullrequest_show.html:48
+#: rhodecode/templates/pullrequests/pullrequest_show.html:57
#, python-format
msgid "%d reviewer"
msgid_plural "%d reviewers"
msgstr[0] ""
msgstr[1] ""
-#: rhodecode/templates/pullrequests/pullrequest_show.html:50
-msgid "pull request was reviewed by all reviewers"
+#: rhodecode/templates/pullrequests/pullrequest_show.html:59
+msgid "Pull request was reviewed by all reviewers"
msgstr ""
-#: rhodecode/templates/pullrequests/pullrequest_show.html:56
+#: rhodecode/templates/pullrequests/pullrequest_show.html:65
#, fuzzy
msgid "Origin repository"
msgstr "Repositório Git"
-#: rhodecode/templates/pullrequests/pullrequest_show.html:76
+#: rhodecode/templates/pullrequests/pullrequest_show.html:89
#, fuzzy
msgid "Created on"
msgstr "criar um agora"
-#: rhodecode/templates/pullrequests/pullrequest_show.html:83
+#: rhodecode/templates/pullrequests/pullrequest_show.html:102
#, fuzzy
msgid "Compare view"
msgstr "comparar exibir"
-#: rhodecode/templates/pullrequests/pullrequest_show.html:130
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
#, fuzzy
msgid "reviewer"
msgstr ""
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
+#: rhodecode/templates/pullrequests/pullrequest_show.html:164
#, fuzzy
-msgid "all pull requests"
-msgstr "Criar novo arquivo"
+msgid "Add or remove reviewer to this pull request."
+msgstr "Confirma excluir este repositório"
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
-msgid "All pull requests"
-msgstr ""
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
+#, fuzzy
+msgid "Save changes"
+msgstr "Sem alterações"
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27
-msgid "Closed"
-msgstr ""
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
+#, fuzzy, python-format
+msgid "%s Pull Requests"
+msgstr "comentado no commit"
#: rhodecode/templates/search/search.html:6
-#, fuzzy, python-format
-msgid "Search \"%s\" in repository: %s"
+#, fuzzy
+msgid "Search repository"
msgstr "no repositório"
#: rhodecode/templates/search/search.html:8
-#, fuzzy, python-format
-msgid "Search \"%s\" in all repositories"
-msgstr "em todos os repositórios"
-
-#: rhodecode/templates/search/search.html:12
-#: rhodecode/templates/search/search.html:32
-#, fuzzy, python-format
-msgid "Search in repository: %s"
-msgstr "no repositório"
-
-#: rhodecode/templates/search/search.html:14
-#: rhodecode/templates/search/search.html:34
+#: rhodecode/templates/search/search.html:16
#, fuzzy
msgid "Search in all repositories"
msgstr "em todos os repositórios"
-#: rhodecode/templates/search/search.html:48
+#: rhodecode/templates/search/search.html:50
msgid "Search term"
msgstr "Termo de pesquisa"
-#: rhodecode/templates/search/search.html:60
+#: rhodecode/templates/search/search.html:62
msgid "Search in"
msgstr "Pesquisando em"
-#: rhodecode/templates/search/search.html:63
+#: rhodecode/templates/search/search.html:65
msgid "File contents"
msgstr "Conteúdo dos arquivos"
-#: rhodecode/templates/search/search.html:64
+#: rhodecode/templates/search/search.html:66
#, fuzzy
msgid "Commit messages"
msgstr "mensagem de commit"
-#: rhodecode/templates/search/search.html:65
+#: rhodecode/templates/search/search.html:67
msgid "File names"
msgstr "Nomes dos arquivos"
@@ -4289,42 +4451,25 @@ msgstr "Nomes dos arquivos"
msgid "Permission denied"
msgstr "Permissão negada"
-#: rhodecode/templates/settings/repo_settings.html:5
-#, fuzzy, python-format
-msgid "%s Settings"
-msgstr "configurações"
-
-#: rhodecode/templates/settings/repo_settings.html:102
-#, fuzzy
-msgid "Delete repository"
-msgstr "[excluir] repositório"
-
-#: rhodecode/templates/settings/repo_settings.html:109
-#, fuzzy
-msgid "Remove repo"
-msgstr "remover"
-
#: rhodecode/templates/shortlog/shortlog.html:5
#, fuzzy, python-format
-msgid "%s Shortlog"
-msgstr "log resumido"
+msgid "%s Lightweight Changelog"
+msgstr "arquivo alterado"
+#: rhodecode/templates/shortlog/shortlog.html:11
#: rhodecode/templates/shortlog/shortlog.html:15
-#: rhodecode/templates/shortlog/shortlog.html:19
-msgid "shortlog"
-msgstr "log resumido"
-
-#: rhodecode/templates/shortlog/shortlog_data.html:5
-msgid "revision"
-msgstr "revisão"
+msgid "Lightweight Changelog"
+msgstr ""
#: rhodecode/templates/shortlog/shortlog_data.html:7
-msgid "age"
+#, fuzzy
+msgid "Age"
msgstr "idade"
-#: rhodecode/templates/shortlog/shortlog_data.html:8
-msgid "author"
-msgstr "autor"
+#: rhodecode/templates/shortlog/shortlog_data.html:20
+#, fuzzy, python-format
+msgid "Click to open associated pull request #%s"
+msgstr "repositório [criado]"
#: rhodecode/templates/shortlog/shortlog_data.html:75
msgid "Add or upload files directly via RhodeCode"
@@ -4343,158 +4488,172 @@ msgstr "Repositório existente?"
msgid "%s Summary"
msgstr "sumário"
-#: rhodecode/templates/summary/summary.html:12
-msgid "summary"
-msgstr "sumário"
-
-#: rhodecode/templates/summary/summary.html:20
+#: rhodecode/templates/summary/summary.html:16
#, fuzzy, python-format
-msgid "repo %s ATOM feed"
-msgstr "Assinar o feed atom de %s"
+msgid "%s ATOM feed"
+msgstr "%s - feed %s"
-#: rhodecode/templates/summary/summary.html:21
+#: rhodecode/templates/summary/summary.html:17
#, fuzzy, python-format
-msgid "repo %s RSS feed"
-msgstr "Assinar o feed rss de %s"
-
-#: rhodecode/templates/summary/summary.html:49
-#: rhodecode/templates/summary/summary.html:52
-msgid "ATOM"
-msgstr "ATOM"
+msgid "%s RSS feed"
+msgstr "%s - feed %s"
-#: rhodecode/templates/summary/summary.html:70
+#: rhodecode/templates/summary/summary.html:62
#, fuzzy, python-format
msgid "Repository locked by %s"
msgstr "repositórios"
-#: rhodecode/templates/summary/summary.html:72
+#: rhodecode/templates/summary/summary.html:64
#, fuzzy
msgid "Repository unlocked"
msgstr "repositórios"
-#: rhodecode/templates/summary/summary.html:91
+#: rhodecode/templates/summary/summary.html:83
#, python-format
msgid "Non changable ID %s"
msgstr "ID não alterável %s"
-#: rhodecode/templates/summary/summary.html:96
-msgid "public"
+#: rhodecode/templates/summary/summary.html:88
+#, fuzzy
+msgid "Public"
msgstr "público"
-#: rhodecode/templates/summary/summary.html:104
-msgid "remote clone"
+#: rhodecode/templates/summary/summary.html:88
+#: rhodecode/templates/summary/summary.html:89
+msgid "Fork of"
+msgstr "Bifurcação de"
+
+#: rhodecode/templates/summary/summary.html:96
+#, fuzzy
+msgid "Remote clone"
msgstr "clone remoto"
-#: rhodecode/templates/summary/summary.html:125
+#: rhodecode/templates/summary/summary.html:117
msgid "Contact"
msgstr "Contato"
-#: rhodecode/templates/summary/summary.html:139
+#: rhodecode/templates/summary/summary.html:131
msgid "Clone url"
msgstr "URL de clonagem"
-#: rhodecode/templates/summary/summary.html:142
+#: rhodecode/templates/summary/summary.html:136
msgid "Show by Name"
msgstr "Mostrar por Nome"
-#: rhodecode/templates/summary/summary.html:143
+#: rhodecode/templates/summary/summary.html:137
msgid "Show by ID"
msgstr "Mostrar por ID"
-#: rhodecode/templates/summary/summary.html:151
+#: rhodecode/templates/summary/summary.html:143
msgid "Trending files"
msgstr "Tendências em arquivos"
-#: rhodecode/templates/summary/summary.html:159
-#: rhodecode/templates/summary/summary.html:175
-#: rhodecode/templates/summary/summary.html:203
+#: rhodecode/templates/summary/summary.html:151
+#: rhodecode/templates/summary/summary.html:167
+#: rhodecode/templates/summary/summary.html:232
msgid "enable"
msgstr "habilitar"
-#: rhodecode/templates/summary/summary.html:167
+#: rhodecode/templates/summary/summary.html:159
msgid "Download"
msgstr "Download"
-#: rhodecode/templates/summary/summary.html:171
+#: rhodecode/templates/summary/summary.html:163
msgid "There are no downloads yet"
msgstr "Ainda não há downloads"
-#: rhodecode/templates/summary/summary.html:173
+#: rhodecode/templates/summary/summary.html:165
msgid "Downloads are disabled for this repository"
msgstr "Downloads estão desabilitados para este repositório"
-#: rhodecode/templates/summary/summary.html:179
+#: rhodecode/templates/summary/summary.html:171
#, fuzzy
msgid "Download as zip"
msgstr "descarregar como bruto"
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:174
msgid "Check this to download archive with subrepos"
msgstr "Marque isto para descarregar arquivo com subrepositórios"
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:174
msgid "with subrepos"
msgstr "com subrepositórios"
-#: rhodecode/templates/summary/summary.html:195
+#: rhodecode/templates/summary/summary.html:197
+#, fuzzy
+msgid "Repository Size"
+msgstr "repositórios"
+
+#: rhodecode/templates/summary/summary.html:204
+#: rhodecode/templates/summary/summary.html:206
+#, fuzzy
+msgid "Feed"
+msgstr "%s - feed %s"
+
+#: rhodecode/templates/summary/summary.html:224
msgid "Commit activity by day / author"
msgstr "Atividade de commit por dia / autor"
-#: rhodecode/templates/summary/summary.html:206
+#: rhodecode/templates/summary/summary.html:235
msgid "Stats gathered: "
msgstr "Estatísticas coletadas:"
-#: rhodecode/templates/summary/summary.html:227
-msgid "Shortlog"
-msgstr "Log resumido"
+#: rhodecode/templates/summary/summary.html:256
+#, fuzzy
+msgid "Latest changes"
+msgstr "Última alteração"
-#: rhodecode/templates/summary/summary.html:229
+#: rhodecode/templates/summary/summary.html:258
msgid "Quick start"
msgstr "Início rápido"
-#: rhodecode/templates/summary/summary.html:243
+#: rhodecode/templates/summary/summary.html:272
#, python-format
msgid "Readme file at revision '%s'"
msgstr ""
-#: rhodecode/templates/summary/summary.html:246
+#: rhodecode/templates/summary/summary.html:275
msgid "Permalink to this readme"
msgstr ""
-#: rhodecode/templates/summary/summary.html:304
+#: rhodecode/templates/summary/summary.html:333
#, python-format
msgid "Download %s as %s"
msgstr "Descarregar %s como %s"
-#: rhodecode/templates/summary/summary.html:661
+#: rhodecode/templates/summary/summary.html:380
+msgid "files"
+msgstr "arquivos"
+
+#: rhodecode/templates/summary/summary.html:690
msgid "commits"
msgstr "commits"
-#: rhodecode/templates/summary/summary.html:662
+#: rhodecode/templates/summary/summary.html:691
msgid "files added"
msgstr "arquivos adicionados"
-#: rhodecode/templates/summary/summary.html:663
+#: rhodecode/templates/summary/summary.html:692
msgid "files changed"
msgstr "arquivos alterados"
-#: rhodecode/templates/summary/summary.html:664
+#: rhodecode/templates/summary/summary.html:693
msgid "files removed"
msgstr "arquivos removidos"
-#: rhodecode/templates/summary/summary.html:667
+#: rhodecode/templates/summary/summary.html:695
msgid "commit"
msgstr "commit"
-#: rhodecode/templates/summary/summary.html:668
+#: rhodecode/templates/summary/summary.html:696
msgid "file added"
msgstr "arquivo adicionado"
-#: rhodecode/templates/summary/summary.html:669
+#: rhodecode/templates/summary/summary.html:697
msgid "file changed"
msgstr "arquivo alterado"
-#: rhodecode/templates/summary/summary.html:670
+#: rhodecode/templates/summary/summary.html:698
msgid "file removed"
msgstr "arquivo removido"
@@ -4503,7 +4662,7 @@ msgstr "arquivo removido"
msgid "%s Tags"
msgstr "%s atrás"
-#: rhodecode/templates/tags/tags.html:29
+#: rhodecode/templates/tags/tags.html:26
#, fuzzy
msgid "Compare tags"
msgstr "comparar exibir"