Browse Source

fix #1902

pull/1890/merge
Unknwon 9 years ago
parent
commit
676d774d88
  1. 2
      cmd/web.go
  2. 4
      conf/locale/locale_bg-BG.ini
  3. 6
      conf/locale/locale_de-DE.ini
  4. 30
      conf/locale/locale_es-ES.ini
  5. 6
      conf/locale/locale_fr-FR.ini
  6. 2
      conf/locale/locale_it-IT.ini
  7. 2
      conf/locale/locale_ja-JP.ini
  8. 2
      conf/locale/locale_lv-LV.ini
  9. 2
      conf/locale/locale_nl-NL.ini
  10. 2
      conf/locale/locale_pl-PL.ini
  11. 10
      conf/locale/locale_pt-BR.ini
  12. 2
      conf/locale/locale_ru-RU.ini
  13. 2
      gogs.go
  14. 2
      models/models.go
  15. 48
      modules/bindata/bindata.go
  16. 2
      templates/.VERSION

2
cmd/web.go

@ -80,7 +80,7 @@ func checkVersion() {
// Check dependency version.
checkers := []VerChecker{
{"github.com/go-xorm/xorm", func() string { return xorm.Version }, "0.4.3.0806"},
{"github.com/go-xorm/xorm", func() string { return xorm.Version }, "0.4.4.1029"},
{"github.com/Unknwon/macaron", macaron.Version, "0.5.4"},
{"github.com/go-macaron/binding", binding.Version, "0.1.0"},
{"github.com/go-macaron/cache", cache.Version, "0.1.2"},

4
conf/locale/locale_bg-BG.ini

@ -360,6 +360,7 @@ migrate_type_helper=Това хранилище ще бъде <span class="text
migrate_repo=Мигрирай хранилище
migrate.clone_address=Адрес за клонирай
migrate.clone_address_desc=Това може да е HTTP/HTTPS/GIT адрес или локален път на сървъра.
migrate.permission_denied=Недостатъчни права за импорт на локални хранилища.
migrate.invalid_local_path=Невалиден път - не съществува или не е директория.
forked_from=разклонено от
@ -651,7 +652,7 @@ release.tag_name_already_exist=Издание с това име на марке
[org]
org_name_holder=Име на организацията
org_full_name_holder=Organization Full Name
org_full_name_holder=Пълно име на организацията
org_name_helper=Добрите имена на организация са кратки и запомнящи се.
create_org=Създай организация
repo_updated=Обновено
@ -808,6 +809,7 @@ users.edit_account=Редактирай профил
users.is_activated=Този профил е активиран
users.is_admin=Този профил има административни права
users.allow_git_hook=Този профил има разрешение да създава Git куки
users.allow_import_local=Този профил има права за импорт на локални хранилища
users.update_profile=Обнови профила
users.delete_account=Изтрий този профил
users.still_own_repo=Този профил притежава поне едно хранилище. Първо трябва да изтриете хранилището или да го прехвърлите на друг потребител.

6
conf/locale/locale_de-DE.ini

@ -360,7 +360,7 @@ migrate_type_helper=Diese Repository wird ein <span class="text blue">Spiegel</s
migrate_repo=Repository migrieren
migrate.clone_address=Adresse kopieren
migrate.clone_address_desc=Dies kann eine HTTP/HTTPS/GIT URL oder ein lokaler Serverpfad sein.
migrate.permission_denied=You are not allowed to import local repositories.
migrate.permission_denied=Ihnen fehlen die Rechte zum Importieren lokaler Repositorys.
migrate.invalid_local_path=Lokaler Pfad ist ungültig, er existiert nicht oder ist kein Ordner.
forked_from=Geforkt von
@ -687,7 +687,7 @@ settings.delete_prompt=Die Organisation wird dauerhaft gelöscht. Dies kann <str
settings.confirm_delete_account=Löschen
settings.delete_org_title=Organisation löschen
settings.delete_org_desc=Diese Organisation wird dauerhaft gelöscht, möchtest du fortfahren?
settings.hooks_desc=Füge Webhooks hinzu, die für <strong>alle</strong> Repositorys dieser Organisation ausgelöst werden.
settings.hooks_desc=Füge Webhooks hinzu, die für <strong>alle</strong> Repositories dieser Organisation ausgelöst werden.
members.public=Öffentlich
members.public_helper=Privat machen
@ -809,7 +809,7 @@ users.edit_account=Konto bearbeiten
users.is_activated=Dieses Konto ist aktiviert
users.is_admin=Dieses Konto hat Administratorrechte
users.allow_git_hook=Dieses Konto ist berechtigt, Git-Hooks zu erstellen
users.allow_import_local=This account has permissions to import local repositories
users.allow_import_local=Dieses Konto ist berechtigt, lokale Repositorys zu importieren
users.update_profile=Kontoprofil aktualisieren
users.delete_account=Dieses Konto löschen
users.still_own_repo=Dieses Konto besitzt noch Repositories. Diese müssen zuerst gelöscht oder übertragen werden.

30
conf/locale/locale_es-ES.ini

@ -360,6 +360,7 @@ migrate_type_helper=Este repositorio será un <span class="text blue">mirror</sp
migrate_repo=Migrar Repositorio
migrate.clone_address=Clonar Dirección
migrate.clone_address_desc=Puede ser una URL HTTP/HTTPS/GIT o una ruta local del servidor.
migrate.permission_denied=You are not allowed to import local repositories.
migrate.invalid_local_path=Rutal local inválida, no existe o no es un directorio.
forked_from=forked de
@ -808,6 +809,7 @@ users.edit_account=Editar Cuenta
users.is_activated=Esta cuenta está activada
users.is_admin=Esta cuenta tiene permisos de administrador
users.allow_git_hook=Esta cuenta tiene permisos para crear hooks de Git
users.allow_import_local=This account has permissions to import local repositories
users.update_profile=Actualizar Perfil de la Cuenta
users.delete_account=Eliminar esta Cuenta
users.still_own_repo=Esta cuenta es propietaria de uno o más repositorios, tienes que borrarlos o transferirlos primero.
@ -968,20 +970,20 @@ compare_2_commits=Ver la comparación de estos 2 commits
ago=hace
from_now=desde ahora
now=ahora
1s=1 segundo %s
1m=1 minuto %s
1h=1 hora %s
1d=1 día %s
1w=1 semana %s
1mon=1 mes %s
1y=1 año %s
seconds=%d segundos %s
minutes=%d minutos %s
hours=%d horas %s
days=%d días %s
weeks=%d semanas %s
months=%d meses %s
years=%d años %s
1s=%s 1 segundo
1m=%s 1 minuto
1h=%s 1 hora
1d=%s 1 día
1w=%s 1 semana
1mon=%s 1 mes
1y=%s 1 año
seconds=%s %d segundos
minutes=%s %d minutos
hours=%s %d horas
days=%s %d días
weeks=%s %d semanas
months=%s %d meses
years=%s %d años
raw_seconds=segundos
raw_minutes=minutos

6
conf/locale/locale_fr-FR.ini

@ -7,7 +7,7 @@ help=Aide
sign_in=Connexion
sign_out=Déconnexion
sign_up=Créer un compte
register=S'inscrire
register=Inscription
website=Site Web
version=Version
page=Page
@ -360,6 +360,7 @@ migrate_type_helper=Ce dépôt sera un <span class="text blue"> miroir</span>
migrate_repo=Migrer le dépôt
migrate.clone_address=Adresse du clone
migrate.clone_address_desc=Cela peut être une URL HTTP/HTTPS/GIT ou un chemin d'accès local.
migrate.permission_denied=Vous n'êtes pas autorisé à importer des dépôts locaux.
migrate.invalid_local_path=Chemin local non valide, non existant ou n'étant pas un dossier.
forked_from=dérivé depuis
@ -651,7 +652,7 @@ release.tag_name_already_exist=Une publication avec ce nom de tag a déjà exist
[org]
org_name_holder=Nom d'organisation
org_full_name_holder=Organization Full Name
org_full_name_holder=Nom complet de l'organisation
org_name_helper=Idéalement, un nom d'organisation devrait être court et mémorable.
create_org=Créer une organisation
repo_updated=Mis à jour
@ -808,6 +809,7 @@ users.edit_account=Modifier le Compte
users.is_activated=Ce compte est activé
users.is_admin=Ce compte possède un niveau d'accès administrateur
users.allow_git_hook=Ce compte dispose des autorisations pour créer des crochets de Git
users.allow_import_local=Ce compte dispose des permissions nécessaire à l'import des dépôts locaux
users.update_profile=Mettre le profil à jour
users.delete_account=Supprimer ce Compte
users.still_own_repo=Ce compte possède toujours des dépôts. Vous devez d'abord les supprimer ou les transférer.

2
conf/locale/locale_it-IT.ini

@ -360,6 +360,7 @@ migrate_type_helper=This repository will be a <span class="text blue">mirror</sp
migrate_repo=Migra Repository
migrate.clone_address=Duplica Indirizzo
migrate.clone_address_desc=This can be a HTTP/HTTPS/GIT URL or local server path.
migrate.permission_denied=You are not allowed to import local repositories.
migrate.invalid_local_path=Percorso locale non valido, non esiste o non è una cartella.
forked_from=forkato da
@ -808,6 +809,7 @@ users.edit_account=Modifica Account
users.is_activated=Questo account è attivato
users.is_admin=Questo account ha permessi di amministratore
users.allow_git_hook=Questo account ha il permesso di creare hooks di Git
users.allow_import_local=This account has permissions to import local repositories
users.update_profile=Aggiornare Profilo Account
users.delete_account=Elimina Questo Account
users.still_own_repo=Questo account possiede ancora almeno un repository, devi prima cancellarli o trasferirli.

2
conf/locale/locale_ja-JP.ini

@ -360,6 +360,7 @@ migrate_type_helper=このリポジトリは、<span class="text blue"> ミラ
migrate_repo=リポジトリを移行
migrate.clone_address=クローンアドレス
migrate.clone_address_desc=これは、HTTP/HTTPS/GIT URL またはローカル サーバー パスを設定できます。
migrate.permission_denied=You are not allowed to import local repositories.
migrate.invalid_local_path=ローカルパスが無効です。存在しないかディレクトリではありません。
forked_from=フォーク元
@ -808,6 +809,7 @@ users.edit_account=アカウントの編集
users.is_activated=アカウントがアクティブされました
users.is_admin=このアカウントには管理者の権限を持つ
users.allow_git_hook=このアカウントには Git のフックを作成する権限を持つ
users.allow_import_local=This account has permissions to import local repositories
users.update_profile=アカウント ・ プロファイルを更新
users.delete_account=このアカウントを削除
users.still_own_repo=アカウント所有のリポジトリがあり、リポジトリの削除または所有者の移譲が必要です。

2
conf/locale/locale_lv-LV.ini

@ -360,6 +360,7 @@ migrate_type_helper=Šis repozitorijs būs <span class="text blue">spogulis</spa
migrate_repo=Migrēt repozitoriju
migrate.clone_address=Klonēšanas adrese
migrate.clone_address_desc=Tas var būt HTTP/HTTPS/GIT URL vai ceļš uz lokālā servera.
migrate.permission_denied=You are not allowed to import local repositories.
migrate.invalid_local_path=Nekorents lokālais ceļš, tas neeksistē vai nav direktorijs.
forked_from=atdalīts no
@ -808,6 +809,7 @@ users.edit_account=Labot kontu
users.is_activated=Konts ir aktivizēts
users.is_admin=Šim kontam ir administratora piekļuves tiesības
users.allow_git_hook=Šim kontam ir tiesības pievienot/labot Git āķus
users.allow_import_local=This account has permissions to import local repositories
users.update_profile=Mainīt konta profilu
users.delete_account=Dzēst šo kontu
users.still_own_repo=Šis konts ir vismaz viena repozitorija īpašnieks, tos sākumā ir nepieciešams izdzēst vai nomainīt to īpašnieku.

2
conf/locale/locale_nl-NL.ini

@ -360,6 +360,7 @@ migrate_type_helper=Deze repositorie zal een <span class="text blue">mirror</spa
migrate_repo=Migreer repositorie
migrate.clone_address=Clone adres
migrate.clone_address_desc=Dit kan een HTTP/HTTPS/GIT URL zijn of een lokaal pad.
migrate.permission_denied=You are not allowed to import local repositories.
migrate.invalid_local_path=Ongeldig lokaal pad, het pad bestaat niet of het is geen map.
forked_from=geforked van
@ -808,6 +809,7 @@ users.edit_account=Bewerk account
users.is_activated=Dit account is geactiveerd
users.is_admin=Dit account heeft beheerdersrechten
users.allow_git_hook=Deze account beschikt over machtigingen voor het maken van Git haken
users.allow_import_local=This account has permissions to import local repositories
users.update_profile=Account profiel bijwerken
users.delete_account=Dit account verwijderen
users.still_own_repo=Dit account is nog steeds eigendom van een repositorie. U moet deze repositorie eerst verwijderen of overdragen.

2
conf/locale/locale_pl-PL.ini

@ -360,6 +360,7 @@ migrate_type_helper=This repository will be a <span class="text blue">mirror</sp
migrate_repo=Przenieś repozytorium
migrate.clone_address=Sklonuj adres
migrate.clone_address_desc=This can be a HTTP/HTTPS/GIT URL or local server path.
migrate.permission_denied=You are not allowed to import local repositories.
migrate.invalid_local_path=Ścieżka jest niepoprawna. Nie istnieje lub nie jest katalogiem.
forked_from=sklonowany z
@ -808,6 +809,7 @@ users.edit_account=Edytuj konto
users.is_activated=To konto jest aktywne
users.is_admin=To konto ma uprawnienia administratora
users.allow_git_hook=To konto posiada uprawnienia do tworzenia skryptów Git
users.allow_import_local=This account has permissions to import local repositories
users.update_profile=Zaktualizuj profil konta
users.delete_account=Usuń to konto
users.still_own_repo=Twoje konto jest dalej właścicielem repozytorium, musisz je usunąć lub przekazać.

10
conf/locale/locale_pt-BR.ini

@ -111,7 +111,7 @@ admin_title=Configurações da Conta de Administrador
admin_name=Nome de Usuário
admin_password=Senha
confirm_password=Confirmar Senha
admin_email=Admin E-mail
admin_email=E-mail do Administrador
install_gogs=Instalar Gogs
test_git_failed=Falha ao testar o comando 'git': %v
sqlite3_not_available=Sua versão não suporta SQLite3, por favor faça o download da versão binária oficial em %s, NÃO da versão gobuild.
@ -191,7 +191,7 @@ min_size_error=` deve conter pelo menos %s caracteres.`
max_size_error=` deve conter no máximo %s caracteres.`
email_error=` não é um endereço de e-mail válido.`
url_error=`não é uma URL válida.`
include_error=` must contain substring '%s'.`
include_error=` deve conter '%s'.`
unknown_error=Erro desconhecido:
captcha_incorrect=O captcha não correspondeu.
password_not_match=Senha e confirmação da senha não são as mesmas.
@ -360,6 +360,7 @@ migrate_type_helper=Este repositório será um <span class="text blue"> espelho<
migrate_repo=Migrar Repositório
migrate.clone_address=Endereço de Clone
migrate.clone_address_desc=Isto pode ser uma URL de HTTP/HTTPS/GIT ou um caminho de diretório local.
migrate.permission_denied=Você não pode importar repositórios locais.
migrate.invalid_local_path=Caminho local inválido, não existe ou não é um diretório.
forked_from=forkado de
@ -457,7 +458,7 @@ issues.no_content=Nenhum conteúdo textual.
issues.close_issue=Fechar
issues.close_comment_issue=Comentar e fechar
issues.reopen_issue=Reabrir
issues.reopen_comment_issue=Reabrir e comentar
issues.reopen_comment_issue=Comentar e reabrir
issues.create_comment=Comentar
issues.closed_at=`fechado em <a id="%[1]s" href="#%[1]s">%[2]s</a>`
issues.reopened_at=`reaberto em <a id="%[1]s" href="#%[1]s">%[2]s</a>`
@ -651,7 +652,7 @@ release.tag_name_already_exist=Já existiu versão com esse nome de tag.
[org]
org_name_holder=Nome da Organização
org_full_name_holder=Organization Full Name
org_full_name_holder=Nome completo da organização
org_name_helper=Nomes de grandes organizações são curtos e memoráveis.
create_org=Criar Organização
repo_updated=Atualizado
@ -808,6 +809,7 @@ users.edit_account=Editar Conta
users.is_activated=Esta conta está ativada
users.is_admin=Esta conta tem permissões de administrador
users.allow_git_hook=Esta conta tem permissões para criar hooks do Git
users.allow_import_local=Esta conta tem permissões para importar repositórios locais
users.update_profile=Atualizar Perfil da Conta
users.delete_account=Deletar Esta Conta
users.still_own_repo=Sua conta ainda é proprietária do repositório, você tem que excluir ou transferi-lo primeiro.

2
conf/locale/locale_ru-RU.ini

@ -360,6 +360,7 @@ migrate_type_helper=Этот репозиторий будет <span class="text
migrate_repo=Перенос репозитория
migrate.clone_address=Скопировать адрес
migrate.clone_address_desc=Это может быть HTTP/HTTPS/GIT адрес или локальный путь на сервере.
migrate.permission_denied=You are not allowed to import local repositories.
migrate.invalid_local_path=Недопустимый локальный путь. Возможно он не существует или является не папкой.
forked_from=форк от
@ -808,6 +809,7 @@ users.edit_account=Изменение учетной записи
users.is_activated=Эта учетная запись активирована
users.is_admin=У этой учетной записи есть права администратора
users.allow_git_hook=Пользователь имеет право создать Git перехватчик
users.allow_import_local=This account has permissions to import local repositories
users.update_profile=Обновить профиль учетной записи
users.delete_account=Удалить эту учетную запись
users.still_own_repo=На вашем аккаунте все еще остается как минимум один репозиторий, сначала вам нужно удалить или передать его.

2
gogs.go

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.6.28.1106 Beta"
const APP_VER = "0.6.28.1107 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())

2
models/models.go

@ -90,7 +90,7 @@ func init() {
new(Team), new(OrgUser), new(TeamUser), new(TeamRepo),
new(Notice), new(EmailAddress))
gonicNames := []string{"UID", "SSL"}
gonicNames := []string{"SSL"}
for _, name := range gonicNames {
core.LintGonicMapper[name] = true
}

48
modules/bindata/bindata.go

File diff suppressed because one or more lines are too long

2
templates/.VERSION

@ -1 +1 @@
0.6.28.1106 Beta
0.6.28.1107 Beta
Loading…
Cancel
Save