Browse Source

Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

Conflicts:
	modules/bindata/bindata.go
	public/js/gogs.js
pull/3287/head
Richard Mahn 8 years ago
parent
commit
47603edf22
  1. 2
      .gitattributes
  2. 2
      .gopmfile
  3. 2
      README.md
  4. 2
      cmd/web.go
  5. 6
      conf/locale/locale_bg-BG.ini
  6. 6
      conf/locale/locale_cs-CZ.ini
  7. 6
      conf/locale/locale_de-DE.ini
  8. 8
      conf/locale/locale_es-ES.ini
  9. 6
      conf/locale/locale_fi-FI.ini
  10. 18
      conf/locale/locale_fr-FR.ini
  11. 6
      conf/locale/locale_it-IT.ini
  12. 6
      conf/locale/locale_ja-JP.ini
  13. 6
      conf/locale/locale_lv-LV.ini
  14. 6
      conf/locale/locale_nl-NL.ini
  15. 6
      conf/locale/locale_pl-PL.ini
  16. 6
      conf/locale/locale_pt-BR.ini
  17. 6
      conf/locale/locale_ru-RU.ini
  18. 6
      conf/locale/locale_tr-TR.ini
  19. 6
      conf/locale/locale_zh-CN.ini
  20. 6
      conf/locale/locale_zh-HK.ini
  21. 6
      conf/locale/locale_zh-TW.ini
  22. 2
      glide.lock
  23. 2
      gogs.go
  24. 6
      models/git_diff.go
  25. 18
      models/issue.go
  26. 2
      models/login.go
  27. 5
      models/user.go
  28. 4
      modules/avatar/avatar.go
  29. 1
      public/js/gogs.js
  30. 2
      templates/.VERSION
  31. 2
      templates/repo/diff_box.tmpl

2
.gitattributes vendored

@ -0,0 +1,2 @@
public/assets/* linguist-vendored
public/plugins/* linguist-vendored

2
.gopmfile

@ -18,7 +18,7 @@ github.com/go-xorm/core = commit:bc1b7f8
github.com/go-xorm/xorm = commit:b8b1711 github.com/go-xorm/xorm = commit:b8b1711
github.com/gogits/chardet = commit:2404f77 github.com/gogits/chardet = commit:2404f77
github.com/gogits/cron = commit:96040e4 github.com/gogits/cron = commit:96040e4
github.com/gogits/git-module = commit:db93fa5 github.com/gogits/git-module = commit:53bcb73
github.com/gogits/go-gogs-client = commit:ee68cd9 github.com/gogits/go-gogs-client = commit:ee68cd9
github.com/issue9/identicon = commit:d36b545 github.com/issue9/identicon = commit:d36b545
github.com/jaytaylor/html2text = commit:52d9b78 github.com/jaytaylor/html2text = commit:52d9b78

2
README.md

@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
##### Current tip version: 0.9.46 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) ##### Current tip version: 0.9.48 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
| Web | UI | Preview | | Web | UI | Preview |
|:-------------:|:-------:|:-------:| |:-------------:|:-------:|:-------:|

2
cmd/web.go

@ -87,7 +87,7 @@ func checkVersion() {
{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"}, {"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
{"gopkg.in/ini.v1", ini.Version, "1.8.4"}, {"gopkg.in/ini.v1", ini.Version, "1.8.4"},
{"gopkg.in/macaron.v1", macaron.Version, "1.1.4"}, {"gopkg.in/macaron.v1", macaron.Version, "1.1.4"},
{"github.com/gogits/git-module", git.Version, "0.3.2"}, {"github.com/gogits/git-module", git.Version, "0.3.3"},
{"github.com/gogits/go-gogs-client", gogs.Version, "0.7.4"}, {"github.com/gogits/go-gogs-client", gogs.Version, "0.7.4"},
} }
for _, c := range checkers { for _, c := range checkers {

6
conf/locale/locale_bg-BG.ini

@ -148,6 +148,8 @@ forget_password=Забравена парола?
sign_up_now=Нуждаете се от профил? Регистрирайте се сега. sign_up_now=Нуждаете се от профил? Регистрирайте се сега.
confirmation_mail_sent_prompt=Ново писмо за потвърждение е изпратено до <b>%s</b>. Моля проверете пощенската си кутия в рамките на следващите %d часа, за да завършите процеса на регистрация. confirmation_mail_sent_prompt=Ново писмо за потвърждение е изпратено до <b>%s</b>. Моля проверете пощенската си кутия в рамките на следващите %d часа, за да завършите процеса на регистрация.
active_your_account=Активиране на профил active_your_account=Активиране на профил
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=За съжаление Вие съвсем наскоро изпратихте писмо за активация. Моля изчакайте 3 минути, след което опитайте отново. resent_limit_prompt=За съжаление Вие съвсем наскоро изпратихте писмо за активация. Моля изчакайте 3 минути, след което опитайте отново.
has_unconfirmed_mail=Здравейте %s, имате непотвърден адрес на ел. поща (<b>%s</b>). Ако не сте получили писмо за потвърждение или имате нужда да се изпрати ново писмо, моля щракнете бутона по-долу. has_unconfirmed_mail=Здравейте %s, имате непотвърден адрес на ел. поща (<b>%s</b>). Ако не сте получили писмо за потвърждение или имате нужда да се изпрати ново писмо, моля щракнете бутона по-долу.
resend_mail=Щракнете тук, за да се изпрати ново писмо за потвърждение resend_mail=Щракнете тук, за да се изпрати ново писмо за потвърждение
@ -409,6 +411,7 @@ file_raw=Директен файл
file_history=История file_history=История
file_view_raw=Виж директен файл file_view_raw=Виж директен файл
file_permalink=Постоянна връзка file_permalink=Постоянна връзка
file_too_large=This file is too large to be shown
commits.commits=Ревизии commits.commits=Ревизии
commits.search=Търсене в ревизии commits.search=Търсене в ревизии
@ -690,7 +693,7 @@ diff.show_unified_view=Обединен изглед
diff.stats_desc=променени са <strong>%d файла</strong>, в които са <strong>добавени %d</strong> реда и са <strong>изтрити %d</strong> реда diff.stats_desc=променени са <strong>%d файла</strong>, в които са <strong>добавени %d</strong> реда и са <strong>изтрити %d</strong> реда
diff.bin=BIN diff.bin=BIN
diff.view_file=Целия файл diff.view_file=Целия файл
diff.file_supressed=File diff supressed because it is too large diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Some files were not shown because too many files changed in this diff diff.too_many_files=Some files were not shown because too many files changed in this diff
release.releases=Версии release.releases=Версии
@ -889,6 +892,7 @@ users.edit_account=Редактирай профил
users.max_repo_creation=Макс. брой хранилища users.max_repo_creation=Макс. брой хранилища
users.max_repo_creation_desc=(Задайте -1 за да се използва глобалния лимит) users.max_repo_creation_desc=(Задайте -1 за да се използва глобалния лимит)
users.is_activated=Този профил е активиран users.is_activated=Този профил е активиран
users.prohibit_login=This account is prohibited to login
users.is_admin=Този профил има административни права users.is_admin=Този профил има административни права
users.allow_git_hook=Този профил има разрешение да създава Git куки users.allow_git_hook=Този профил има разрешение да създава Git куки
users.allow_import_local=Този профил има права за импорт на локални хранилища users.allow_import_local=Този профил има права за импорт на локални хранилища

6
conf/locale/locale_cs-CZ.ini

@ -148,6 +148,8 @@ forget_password=Zapomněli jste heslo?
sign_up_now=Potřebujete účet? Zaregistrujte se. sign_up_now=Potřebujete účet? Zaregistrujte se.
confirmation_mail_sent_prompt=Nový potvrzovací e-mail byl zaslán na <b>%s</b>, prosíme, zkontrolujte si vaši doručenou poštu během následující %d hodin pro dokončení registračního procesu. confirmation_mail_sent_prompt=Nový potvrzovací e-mail byl zaslán na <b>%s</b>, prosíme, zkontrolujte si vaši doručenou poštu během následující %d hodin pro dokončení registračního procesu.
active_your_account=Aktivujte si váš účet active_your_account=Aktivujte si váš účet
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=Omlouváme se, ale před chvílí jste požádal o aktivační e-mail. Prosíme, počkejte 3 minuty a pak to zkuste znovu. resent_limit_prompt=Omlouváme se, ale před chvílí jste požádal o aktivační e-mail. Prosíme, počkejte 3 minuty a pak to zkuste znovu.
has_unconfirmed_mail=Zdravím, %s, máte nepotvrzenou e-mailovou adresu (<b>%s</b>). Pokud jste nedostali e-mail pro potvrzení nebo potřebujete zaslat nový, klikněte prosím na tlačítku níže. has_unconfirmed_mail=Zdravím, %s, máte nepotvrzenou e-mailovou adresu (<b>%s</b>). Pokud jste nedostali e-mail pro potvrzení nebo potřebujete zaslat nový, klikněte prosím na tlačítku níže.
resend_mail=Klikněte zde pro odeslání aktivačního e-mailu resend_mail=Klikněte zde pro odeslání aktivačního e-mailu
@ -409,6 +411,7 @@ file_raw=Surový
file_history=Historie file_history=Historie
file_view_raw=Zobrazit v surovém stavu file_view_raw=Zobrazit v surovém stavu
file_permalink=Trvalý odkaz file_permalink=Trvalý odkaz
file_too_large=This file is too large to be shown
commits.commits=Revize commits.commits=Revize
commits.search=Hledání revizí commits.search=Hledání revizí
@ -690,7 +693,7 @@ diff.show_unified_view=Jednotný pohled
diff.stats_desc=<strong> %d změnil soubory</strong>, kde provedl <strong>%d přidání</strong> a <strong>%d odebrání</strong> diff.stats_desc=<strong> %d změnil soubory</strong>, kde provedl <strong>%d přidání</strong> a <strong>%d odebrání</strong>
diff.bin=binární diff.bin=binární
diff.view_file=Zobrazit soubor diff.view_file=Zobrazit soubor
diff.file_supressed=File diff supressed because it is too large diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Some files were not shown because too many files changed in this diff diff.too_many_files=Some files were not shown because too many files changed in this diff
release.releases=Vydání release.releases=Vydání
@ -889,6 +892,7 @@ users.edit_account=Upravit účet
users.max_repo_creation=Limit počtu vytvořených repositářů users.max_repo_creation=Limit počtu vytvořených repositářů
users.max_repo_creation_desc=(Nastavte na -1 pro použití výchozího systémového limitu) users.max_repo_creation_desc=(Nastavte na -1 pro použití výchozího systémového limitu)
users.is_activated=Tento účet je aktivován users.is_activated=Tento účet je aktivován
users.prohibit_login=This account is prohibited to login
users.is_admin=Tento účet je správce users.is_admin=Tento účet je správce
users.allow_git_hook=Tento účet má právo vytváře háčky Gitu users.allow_git_hook=Tento účet má právo vytváře háčky Gitu
users.allow_import_local=Tento účet má právo importovat místní repositáře users.allow_import_local=Tento účet má právo importovat místní repositáře

6
conf/locale/locale_de-DE.ini

@ -148,6 +148,8 @@ forget_password=Passwort vergessen?
sign_up_now=Benötigen Sie ein Konto? Registrieren Sie sich jetzt. sign_up_now=Benötigen Sie ein Konto? Registrieren Sie sich jetzt.
confirmation_mail_sent_prompt=Eine neue Bestätigungs-E-Mail wurde an <b>%s</b> gesendet. Bitte kontrollieren Sie Ihr Postfach innerhalb der nächsten %d Stunden, um die Registrierung abzuschließen. confirmation_mail_sent_prompt=Eine neue Bestätigungs-E-Mail wurde an <b>%s</b> gesendet. Bitte kontrollieren Sie Ihr Postfach innerhalb der nächsten %d Stunden, um die Registrierung abzuschließen.
active_your_account=Aktivieren Sie Ihr Konto active_your_account=Aktivieren Sie Ihr Konto
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=Es tut uns leid, aber Sie haben bereits eine Aktivierungs-E-Mail angefordert. Bitte warten Sie 3 Minuten und probieren Sie es dann nochmal. resent_limit_prompt=Es tut uns leid, aber Sie haben bereits eine Aktivierungs-E-Mail angefordert. Bitte warten Sie 3 Minuten und probieren Sie es dann nochmal.
has_unconfirmed_mail=Hallo %s, Sie haben eine unbestätigte E-Mail-Adresse (<b>%s</b>). Wenn Sie keine Bestätigungs-E-Mail erhalten haben oder eine neue benötigen, klicken Sie bitte auf den folgenden Button. has_unconfirmed_mail=Hallo %s, Sie haben eine unbestätigte E-Mail-Adresse (<b>%s</b>). Wenn Sie keine Bestätigungs-E-Mail erhalten haben oder eine neue benötigen, klicken Sie bitte auf den folgenden Button.
resend_mail=Hier klicken, um die Aktivierungs-E-Mail erneut zu versenden resend_mail=Hier klicken, um die Aktivierungs-E-Mail erneut zu versenden
@ -409,6 +411,7 @@ file_raw=Originalformat
file_history=Verlauf file_history=Verlauf
file_view_raw=Ansicht im Originalformat file_view_raw=Ansicht im Originalformat
file_permalink=Permalink file_permalink=Permalink
file_too_large=This file is too large to be shown
commits.commits=Commits commits.commits=Commits
commits.search=Commits durchsuchen commits.search=Commits durchsuchen
@ -690,7 +693,7 @@ diff.show_unified_view=Gesamtansicht
diff.stats_desc=<strong> %d geänderte Dateien</strong> mit <strong>%d neuen</strong> und <strong>%d gelöschten</strong> Zeilen diff.stats_desc=<strong> %d geänderte Dateien</strong> mit <strong>%d neuen</strong> und <strong>%d gelöschten</strong> Zeilen
diff.bin=BIN diff.bin=BIN
diff.view_file=Datei anzeigen diff.view_file=Datei anzeigen
diff.file_supressed=Datei-Diff unterdrückt, da es zu groß ist diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden. diff.too_many_files=Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.
release.releases=Releases release.releases=Releases
@ -889,6 +892,7 @@ users.edit_account=Konto bearbeiten
users.max_repo_creation=Maximale Anzahl erstellbarer Repositories users.max_repo_creation=Maximale Anzahl erstellbarer Repositories
users.max_repo_creation_desc=(Auf -1 setzen, um das globale Standardlimit zu verwenden) users.max_repo_creation_desc=(Auf -1 setzen, um das globale Standardlimit zu verwenden)
users.is_activated=Dieses Konto ist aktiviert users.is_activated=Dieses Konto ist aktiviert
users.prohibit_login=This account is prohibited to login
users.is_admin=Dieses Konto hat Administratorrechte users.is_admin=Dieses Konto hat Administratorrechte
users.allow_git_hook=Dieses Konto ist berechtigt Git-Hooks zu erstellen users.allow_git_hook=Dieses Konto ist berechtigt Git-Hooks zu erstellen
users.allow_import_local=Dieses Konto ist berechtigt, lokale Repositories zu importieren users.allow_import_local=Dieses Konto ist berechtigt, lokale Repositories zu importieren

8
conf/locale/locale_es-ES.ini

@ -148,6 +148,8 @@ forget_password=¿Has olvidado tu contraseña?
sign_up_now=¿Necesitas una cuenta? Regístrate ahora. sign_up_now=¿Necesitas una cuenta? Regístrate ahora.
confirmation_mail_sent_prompt=Un nuevo correo de confirmación se ha enviado a <b>%s</b>. Por favor, comprueba tu bandeja de entrada en las siguientes %d horas para completar el proceso de registro. confirmation_mail_sent_prompt=Un nuevo correo de confirmación se ha enviado a <b>%s</b>. Por favor, comprueba tu bandeja de entrada en las siguientes %d horas para completar el proceso de registro.
active_your_account=Activa tu cuenta active_your_account=Activa tu cuenta
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=Lo sentimos, estás solicitando el reenvío del mail de activación con demasiada frecuencia. Por favor, espera 3 minutos. resent_limit_prompt=Lo sentimos, estás solicitando el reenvío del mail de activación con demasiada frecuencia. Por favor, espera 3 minutos.
has_unconfirmed_mail=Hola %s, tu correo electrónico (<b>%s</b>) no está confirmado. Si no has recibido un correo de confirmación o necesitas que lo enviemos de nuevo, por favor, haz click en el siguiente botón. has_unconfirmed_mail=Hola %s, tu correo electrónico (<b>%s</b>) no está confirmado. Si no has recibido un correo de confirmación o necesitas que lo enviemos de nuevo, por favor, haz click en el siguiente botón.
resend_mail=Haz click aquí para reenviar tu correo electrónico de activación resend_mail=Haz click aquí para reenviar tu correo electrónico de activación
@ -220,7 +222,7 @@ org_still_own_repo=Esta organización es dueña de uno o más repositorios, tien
target_branch_not_exist=La rama de destino no existe target_branch_not_exist=La rama de destino no existe
[user] [user]
change_avatar=Change your avatar change_avatar=Cambiar tu avatar
join_on=Registrado el join_on=Registrado el
repositories=Repositorios repositories=Repositorios
activity=Actividad pública activity=Actividad pública
@ -409,6 +411,7 @@ file_raw=Raw
file_history=Histórico file_history=Histórico
file_view_raw=Ver Raw file_view_raw=Ver Raw
file_permalink=Permalink file_permalink=Permalink
file_too_large=This file is too large to be shown
commits.commits=Commits commits.commits=Commits
commits.search=Buscar Commits commits.search=Buscar Commits
@ -690,7 +693,7 @@ diff.show_unified_view=Unificar vista
diff.stats_desc=Se han <strong>modificado %d ficheros</strong> con <strong>%d adiciones</strong> y <strong>%d borrados</strong> diff.stats_desc=Se han <strong>modificado %d ficheros</strong> con <strong>%d adiciones</strong> y <strong>%d borrados</strong>
diff.bin=BIN diff.bin=BIN
diff.view_file=Ver fichero diff.view_file=Ver fichero
diff.file_supressed=El diff del archivo ha sido suprimido porque es demasiado grande diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Some files were not shown because too many files changed in this diff diff.too_many_files=Some files were not shown because too many files changed in this diff
release.releases=Releases release.releases=Releases
@ -889,6 +892,7 @@ users.edit_account=Editar Cuenta
users.max_repo_creation=Límite máximo de repositorios users.max_repo_creation=Límite máximo de repositorios
users.max_repo_creation_desc=(Configura a -1 para usar el límite global por defecto) users.max_repo_creation_desc=(Configura a -1 para usar el límite global por defecto)
users.is_activated=Esta cuenta está activada users.is_activated=Esta cuenta está activada
users.prohibit_login=This account is prohibited to login
users.is_admin=Esta cuenta tiene permisos de administrador users.is_admin=Esta cuenta tiene permisos de administrador
users.allow_git_hook=Esta cuenta tiene permisos para crear hooks de Git users.allow_git_hook=Esta cuenta tiene permisos para crear hooks de Git
users.allow_import_local=Esta cuenta dispone de permisos para importar repositorios locales users.allow_import_local=Esta cuenta dispone de permisos para importar repositorios locales

6
conf/locale/locale_fi-FI.ini

@ -148,6 +148,8 @@ forget_password=Unohtuiko salasana?
sign_up_now=Tarvitsetko tilin? Rekisteröidy nyt. sign_up_now=Tarvitsetko tilin? Rekisteröidy nyt.
confirmation_mail_sent_prompt=Uusi varmistus sähköposti on lähetetty osoitteeseen <b>%s</b>, ole hyvä ja tarkista saapuneet seuraavan %d tunnin sisällä saadaksesi rekisteröintiprosessin valmiiksi. confirmation_mail_sent_prompt=Uusi varmistus sähköposti on lähetetty osoitteeseen <b>%s</b>, ole hyvä ja tarkista saapuneet seuraavan %d tunnin sisällä saadaksesi rekisteröintiprosessin valmiiksi.
active_your_account=Aktivoi tilisi active_your_account=Aktivoi tilisi
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=Sori, olet jo tilannut aktivointi sähköpostin lähiaikoina. Ole hyvä ja odota 3 minuuttia ja yritä sitten uudelleen. resent_limit_prompt=Sori, olet jo tilannut aktivointi sähköpostin lähiaikoina. Ole hyvä ja odota 3 minuuttia ja yritä sitten uudelleen.
has_unconfirmed_mail=Hei %s, sinulla on varmistamaton sähköposti osoite (<b>%s</b>). Jos et ole saanut varmistus sähköpostia tai tarvitset uudelleenlähetyksen, ole hyvä ja klikkaa allaolevaa painiketta. has_unconfirmed_mail=Hei %s, sinulla on varmistamaton sähköposti osoite (<b>%s</b>). Jos et ole saanut varmistus sähköpostia tai tarvitset uudelleenlähetyksen, ole hyvä ja klikkaa allaolevaa painiketta.
resend_mail=Klikkaa tästä uudelleenlähettääksesi aktivointi sähköpostisi resend_mail=Klikkaa tästä uudelleenlähettääksesi aktivointi sähköpostisi
@ -409,6 +411,7 @@ file_raw=Raaka
file_history=Historia file_history=Historia
file_view_raw=Näytä raaka file_view_raw=Näytä raaka
file_permalink=Pysyvä linkki file_permalink=Pysyvä linkki
file_too_large=This file is too large to be shown
commits.commits=Commitit commits.commits=Commitit
commits.search=Etsi commiteista commits.search=Etsi commiteista
@ -690,7 +693,7 @@ diff.show_unified_view=Yhdistetty näkymä
diff.stats_desc=<strong>%d muutettua tiedostoa</strong> jossa <strong>%d lisäystä</strong> ja <strong>%d poistoa</strong> diff.stats_desc=<strong>%d muutettua tiedostoa</strong> jossa <strong>%d lisäystä</strong> ja <strong>%d poistoa</strong>
diff.bin=BIN diff.bin=BIN
diff.view_file=Näytä tiedosto diff.view_file=Näytä tiedosto
diff.file_supressed=File diff supressed because it is too large diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Some files were not shown because too many files changed in this diff diff.too_many_files=Some files were not shown because too many files changed in this diff
release.releases=Julkaisut release.releases=Julkaisut
@ -889,6 +892,7 @@ users.edit_account=Muokkaa tiliä
users.max_repo_creation=Maksimi repojen määrä jonka voi luoda users.max_repo_creation=Maksimi repojen määrä jonka voi luoda
users.max_repo_creation_desc=(Aseta -1 käyttääksesi globaalia oletusrajaa) users.max_repo_creation_desc=(Aseta -1 käyttääksesi globaalia oletusrajaa)
users.is_activated=Tämä tili on aktivoitu users.is_activated=Tämä tili on aktivoitu
users.prohibit_login=This account is prohibited to login
users.is_admin=Tällä tilillä on ylläpito-oikeudet users.is_admin=Tällä tilillä on ylläpito-oikeudet
users.allow_git_hook=Tällä tilillä on oikeudet luoda Git koukkuja users.allow_git_hook=Tällä tilillä on oikeudet luoda Git koukkuja
users.allow_import_local=Tällä tilillä on oikeudet tuoda paikallisia repoja users.allow_import_local=Tällä tilillä on oikeudet tuoda paikallisia repoja

18
conf/locale/locale_fr-FR.ini

@ -148,6 +148,8 @@ forget_password=Mot de passe oublié ?
sign_up_now=Pas de compte ? Inscrivez-vous maintenant. sign_up_now=Pas de compte ? Inscrivez-vous maintenant.
confirmation_mail_sent_prompt=Un nouveau mail de confirmation à été envoyé à <b>%s</b>. Veuillez vérifier votre boîte de réception dans un délai de %d heures pour compléter votre enregistrement. confirmation_mail_sent_prompt=Un nouveau mail de confirmation à été envoyé à <b>%s</b>. Veuillez vérifier votre boîte de réception dans un délai de %d heures pour compléter votre enregistrement.
active_your_account=Activer votre compte active_your_account=Activer votre compte
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=Désolé, vos tentatives d'activation sont trop fréquentes. Veuillez réessayer dans 3 minutes. resent_limit_prompt=Désolé, vos tentatives d'activation sont trop fréquentes. Veuillez réessayer dans 3 minutes.
has_unconfirmed_mail=Bonjour %s, votre adresse e-mail (<b>%s</b>) n'a pas été confirmée. Si vous n'avez reçu aucun mail de confirmation ou souhaitez renouveler l'envoi, cliquez sur le bouton ci-dessous. has_unconfirmed_mail=Bonjour %s, votre adresse e-mail (<b>%s</b>) n'a pas été confirmée. Si vous n'avez reçu aucun mail de confirmation ou souhaitez renouveler l'envoi, cliquez sur le bouton ci-dessous.
resend_mail=Cliquez ici pour renvoyer un mail de confirmation resend_mail=Cliquez ici pour renvoyer un mail de confirmation
@ -351,7 +353,7 @@ auto_init=Initialiser ce dépôt avec le modèle et les fichiers sélectionnés
create_repo=Créer un dépôt create_repo=Créer un dépôt
default_branch=Branche par défaut default_branch=Branche par défaut
mirror_prune=Purger mirror_prune=Purger
mirror_prune_desc=Remove any remote-tracking references that no longer exist on the remote mirror_prune_desc=Supprimez toute référence de suivi à distance qui n'existe plus sur le dépôt distant
mirror_interval=Intervalle du miroir (heure) mirror_interval=Intervalle du miroir (heure)
mirror_address=Adresse du miroir mirror_address=Adresse du miroir
mirror_address_desc=Veuillez inclure les informations d'identification nécessaires dans l'adresse. mirror_address_desc=Veuillez inclure les informations d'identification nécessaires dans l'adresse.
@ -409,6 +411,7 @@ file_raw=Raw
file_history=Historique file_history=Historique
file_view_raw=Voir le Raw file_view_raw=Voir le Raw
file_permalink=Lien permanent file_permalink=Lien permanent
file_too_large=This file is too large to be shown
commits.commits=Commits commits.commits=Commits
commits.search=Rechercher des commits commits.search=Rechercher des commits
@ -581,9 +584,9 @@ settings.external_wiki_url_desc=Les visiteurs seront redirigés vers cette URL l
settings.issues_desc=Activer le bug-tracker léger intégré settings.issues_desc=Activer le bug-tracker léger intégré
settings.use_external_issue_tracker=Utiliser un bug-tracker externe settings.use_external_issue_tracker=Utiliser un bug-tracker externe
settings.tracker_url_format=Format d'URL du bug tracker settings.tracker_url_format=Format d'URL du bug tracker
settings.tracker_issue_style=External Issue Tracker Naming Style: settings.tracker_issue_style=Style de nommage des bugs du tracker externe :
settings.tracker_issue_style.numeric=Numeric <span class="ui light grey text">(1234)</span> settings.tracker_issue_style.numeric=Numérique <span class="ui light grey text">(1234)</span>
settings.tracker_issue_style.alphanumeric=Alphanumeric <span class="ui light grey text">(ABC-123, DEFG-234, ...)</span> settings.tracker_issue_style.alphanumeric=Alphanumérique <span class="ui light grey text"> (ABC-123, DEFG-234,...)</span>
settings.tracker_url_format_desc=Vous pouvez utiliser l'espace réservé <code>{user} {repo} {index}</code> pour le nom d'utilisateur, le nom du dépôt et le numéro de bug. settings.tracker_url_format_desc=Vous pouvez utiliser l'espace réservé <code>{user} {repo} {index}</code> pour le nom d'utilisateur, le nom du dépôt et le numéro de bug.
settings.pulls_desc=Activer les pull requests pour accepter les contributions publiques settings.pulls_desc=Activer les pull requests pour accepter les contributions publiques
settings.danger_zone=Zone de danger settings.danger_zone=Zone de danger
@ -606,7 +609,7 @@ settings.delete=Supprimer ce dépôt
settings.delete_desc=Attention, cette action est action irréversible. Soyez sûr de vous. settings.delete_desc=Attention, cette action est action irréversible. Soyez sûr de vous.
settings.delete_notices_1=- Cette opération <strong>ne peut pas </strong> être annulée. settings.delete_notices_1=- Cette opération <strong>ne peut pas </strong> être annulée.
settings.delete_notices_2=- Cette opération supprimera définitivement le dépôt, y compris les données Git, les tickets, les commentaires et les accès des collaborateurs. settings.delete_notices_2=- Cette opération supprimera définitivement le dépôt, y compris les données Git, les tickets, les commentaires et les accès des collaborateurs.
settings.delete_notices_fork_1=- All forks will become independent after deletion. settings.delete_notices_fork_1=-Tous les forks deviendront indépendants après l’effacement.
settings.deletion_success=Le dépôt a été supprimé avec succès! settings.deletion_success=Le dépôt a été supprimé avec succès!
settings.update_settings_success=Options mises à jour avec succès. settings.update_settings_success=Options mises à jour avec succès.
settings.transfer_owner=Nouveau propriétaire settings.transfer_owner=Nouveau propriétaire
@ -690,8 +693,8 @@ diff.show_unified_view=Vue unifiée
diff.stats_desc=<strong> %d fichiers modifiés</strong> avec <strong>%d ajouts</strong> et <strong>%d suppressions</strong> diff.stats_desc=<strong> %d fichiers modifiés</strong> avec <strong>%d ajouts</strong> et <strong>%d suppressions</strong>
diff.bin=BIN diff.bin=BIN
diff.view_file=Voir le fichier diff.view_file=Voir le fichier
diff.file_supressed=File diff supressed because it is too large diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Some files were not shown because too many files changed in this diff diff.too_many_files=Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff
release.releases=Versions release.releases=Versions
release.new_release=Nouvelle version release.new_release=Nouvelle version
@ -889,6 +892,7 @@ users.edit_account=Modifier le Compte
users.max_repo_creation=Nombre maximum de dépôts créés users.max_repo_creation=Nombre maximum de dépôts créés
users.max_repo_creation_desc=(Mettre à -1 pour utiliser la limite globale par défaut) users.max_repo_creation_desc=(Mettre à -1 pour utiliser la limite globale par défaut)
users.is_activated=Ce compte est activé users.is_activated=Ce compte est activé
users.prohibit_login=This account is prohibited to login
users.is_admin=Ce compte possède un niveau d'accès administrateur 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_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.allow_import_local=Ce compte dispose des permissions nécessaire à l'import des dépôts locaux

6
conf/locale/locale_it-IT.ini

@ -148,6 +148,8 @@ forget_password=Password dimenticata?
sign_up_now=Bisogno di un account? Iscriviti ora. sign_up_now=Bisogno di un account? Iscriviti ora.
confirmation_mail_sent_prompt=Una nuova email di conferma è stata inviata a <b>%s</b>, verifica la tua casella di posta entro le prossime %d ore per completare la registrazione. confirmation_mail_sent_prompt=Una nuova email di conferma è stata inviata a <b>%s</b>, verifica la tua casella di posta entro le prossime %d ore per completare la registrazione.
active_your_account=Attiva il tuo Account active_your_account=Attiva il tuo Account
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=Siamo spiacenti, si stanno inviando e-mail di attivazione troppo spesso. Si prega di attendere 3 minuti. resent_limit_prompt=Siamo spiacenti, si stanno inviando e-mail di attivazione troppo spesso. Si prega di attendere 3 minuti.
has_unconfirmed_mail=Ciao %s, hai un indirizzo di posta elettronica non confermato (<b>%s</b>). Se non hai ricevuto una e-mail di conferma o vuoi riceverla nuovamente, fare clic sul pulsante qui sotto. has_unconfirmed_mail=Ciao %s, hai un indirizzo di posta elettronica non confermato (<b>%s</b>). Se non hai ricevuto una e-mail di conferma o vuoi riceverla nuovamente, fare clic sul pulsante qui sotto.
resend_mail=Clicca qui per inviare nuovamente l'e-mail di attivazione resend_mail=Clicca qui per inviare nuovamente l'e-mail di attivazione
@ -409,6 +411,7 @@ file_raw=Originale
file_history=Cronologia file_history=Cronologia
file_view_raw=Vedi originale file_view_raw=Vedi originale
file_permalink=Permalink file_permalink=Permalink
file_too_large=This file is too large to be shown
commits.commits=Commits commits.commits=Commits
commits.search=Ricerca una versione commits.search=Ricerca una versione
@ -690,7 +693,7 @@ diff.show_unified_view=Visualizzazione unificata
diff.stats_desc=<strong>%d ha cambiato i file</strong> con <strong>%d aggiunte</strong> e <strong>%d eliminazioni</strong> diff.stats_desc=<strong>%d ha cambiato i file</strong> con <strong>%d aggiunte</strong> e <strong>%d eliminazioni</strong>
diff.bin=BIN diff.bin=BIN
diff.view_file=Vedi File diff.view_file=Vedi File
diff.file_supressed=File diff supressed because it is too large diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Some files were not shown because too many files changed in this diff diff.too_many_files=Some files were not shown because too many files changed in this diff
release.releases=Rilasci release.releases=Rilasci
@ -889,6 +892,7 @@ users.edit_account=Modifica Account
users.max_repo_creation=Limite massimo per la creazione di Repository users.max_repo_creation=Limite massimo per la creazione di Repository
users.max_repo_creation_desc=(Inserire -1 per usare il limite globale di default) users.max_repo_creation_desc=(Inserire -1 per usare il limite globale di default)
users.is_activated=Questo account è attivato users.is_activated=Questo account è attivato
users.prohibit_login=This account is prohibited to login
users.is_admin=Questo account ha permessi di amministratore 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_git_hook=Questo account ha il permesso di creare hooks di Git
users.allow_import_local=Questo account dispone delle autorizzazioni per importare repository locali users.allow_import_local=Questo account dispone delle autorizzazioni per importare repository locali

6
conf/locale/locale_ja-JP.ini

@ -148,6 +148,8 @@ forget_password=パスワードを忘れましたか?
sign_up_now=アカウントが必要ですか?今すぐ登録しましょう! sign_up_now=アカウントが必要ですか?今すぐ登録しましょう!
confirmation_mail_sent_prompt=新しい確認メールを <b>%s</b> に送りました。登録を完了させるために、%d時間以内にあなたのメールボックスを確認してください。 confirmation_mail_sent_prompt=新しい確認メールを <b>%s</b> に送りました。登録を完了させるために、%d時間以内にあなたのメールボックスを確認してください。
active_your_account=アカウントを有効化 active_your_account=アカウントを有効化
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=申し訳ありませんが、アクティベーションメールは頻繁に送信しています。3 分お待ちください。 resent_limit_prompt=申し訳ありませんが、アクティベーションメールは頻繁に送信しています。3 分お待ちください。
has_unconfirmed_mail=こんにちは %s さん、あなたの電子メール アドレス (<b>%s</b>) は未確認です。もし確認メールをまだ確認できていないか、改めて再送信する場合は、下のボタンをクリックしてください。 has_unconfirmed_mail=こんにちは %s さん、あなたの電子メール アドレス (<b>%s</b>) は未確認です。もし確認メールをまだ確認できていないか、改めて再送信する場合は、下のボタンをクリックしてください。
resend_mail=アクティベーションメールを再送信するにはここをクリック resend_mail=アクティベーションメールを再送信するにはここをクリック
@ -409,6 +411,7 @@ file_raw=Raw
file_history=履歴 file_history=履歴
file_view_raw=Rawデータを見る file_view_raw=Rawデータを見る
file_permalink=パーマリンク file_permalink=パーマリンク
file_too_large=This file is too large to be shown
commits.commits=コミット commits.commits=コミット
commits.search=コミットの検索 commits.search=コミットの検索
@ -690,7 +693,7 @@ diff.show_unified_view=Unified View
diff.stats_desc=共有<strong>%d 個のファイルを変更した</strong>、<strong>%d 個の追加</strong> と <strong>%d 個の削除</strong>を含む diff.stats_desc=共有<strong>%d 個のファイルを変更した</strong>、<strong>%d 個の追加</strong> と <strong>%d 個の削除</strong>を含む
diff.bin=BIN diff.bin=BIN
diff.view_file=ファイルの表示 diff.view_file=ファイルの表示
diff.file_supressed=File diff supressed because it is too large diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Some files were not shown because too many files changed in this diff diff.too_many_files=Some files were not shown because too many files changed in this diff
release.releases=リリース release.releases=リリース
@ -889,6 +892,7 @@ users.edit_account=アカウントの編集
users.max_repo_creation=Maximum Repository Creation Limit users.max_repo_creation=Maximum Repository Creation Limit
users.max_repo_creation_desc=(Set -1 to use global default limit) users.max_repo_creation_desc=(Set -1 to use global default limit)
users.is_activated=アカウントがアクティブされました users.is_activated=アカウントがアクティブされました
users.prohibit_login=This account is prohibited to login
users.is_admin=このアカウントには管理者の権限を持つ users.is_admin=このアカウントには管理者の権限を持つ
users.allow_git_hook=このアカウントには Git のフックを作成する権限を持つ users.allow_git_hook=このアカウントには Git のフックを作成する権限を持つ
users.allow_import_local=This account has permissions to import local repositories users.allow_import_local=This account has permissions to import local repositories

6
conf/locale/locale_lv-LV.ini

@ -148,6 +148,8 @@ forget_password=Aizmirsi paroli?
sign_up_now=Nepieciešams konts? Reģistrējies tagad. sign_up_now=Nepieciešams konts? Reģistrējies tagad.
confirmation_mail_sent_prompt=Jauns apstiprināšanas e-pasts ir nosūtīts uz <b>%s</b>, lūdzu, pārbaudies savu e-pasta kontu tuvāko %d stundu laikā, lai pabeigtu reģistrācijas procesu. confirmation_mail_sent_prompt=Jauns apstiprināšanas e-pasts ir nosūtīts uz <b>%s</b>, lūdzu, pārbaudies savu e-pasta kontu tuvāko %d stundu laikā, lai pabeigtu reģistrācijas procesu.
active_your_account=Aktivizēt savu kontu active_your_account=Aktivizēt savu kontu
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=Atvainojiet, Jūs sūtījāt aktivizācijas e-pastu pārāk bieži. Lūdzu, gaidiet 3 minūtes. resent_limit_prompt=Atvainojiet, Jūs sūtījāt aktivizācijas e-pastu pārāk bieži. Lūdzu, gaidiet 3 minūtes.
has_unconfirmed_mail=Sveiki %s, Jums ir neapstiprināta e-pasta adrese (<b>%s</b>). Ja neesat saņēmis apstiprināšanas e-pastu vai Jums ir nepieciešams nosūtīt jaunu, lūdzu, nospiediet pogu, kas atrodas zemāk. has_unconfirmed_mail=Sveiki %s, Jums ir neapstiprināta e-pasta adrese (<b>%s</b>). Ja neesat saņēmis apstiprināšanas e-pastu vai Jums ir nepieciešams nosūtīt jaunu, lūdzu, nospiediet pogu, kas atrodas zemāk.
resend_mail=Nospiediet šeit, lai vēlreiz nosūtītu aktivizācijas e-pastu resend_mail=Nospiediet šeit, lai vēlreiz nosūtītu aktivizācijas e-pastu
@ -409,6 +411,7 @@ file_raw=Neapstrādāts
file_history=Vēsture file_history=Vēsture
file_view_raw=Rādīt neapstrādātu file_view_raw=Rādīt neapstrādātu
file_permalink=Patstāvīgā saite file_permalink=Patstāvīgā saite
file_too_large=This file is too large to be shown
commits.commits=Revīzijas commits.commits=Revīzijas
commits.search=Meklēt revīzijas commits.search=Meklēt revīzijas
@ -690,7 +693,7 @@ diff.show_unified_view=Apvienotais skats
diff.stats_desc=<strong>%d mainītis faili</strong> ar <strong>%d papildinājumiem</strong> un <strong>%d dzēšanām</strong> diff.stats_desc=<strong>%d mainītis faili</strong> ar <strong>%d papildinājumiem</strong> un <strong>%d dzēšanām</strong>
diff.bin=BIN diff.bin=BIN
diff.view_file=Parādīt failu diff.view_file=Parādīt failu
diff.file_supressed=File diff supressed because it is too large diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Some files were not shown because too many files changed in this diff diff.too_many_files=Some files were not shown because too many files changed in this diff
release.releases=Laidieni release.releases=Laidieni
@ -889,6 +892,7 @@ users.edit_account=Labot kontu
users.max_repo_creation=Maksimāls repozitoriju veidošanas limits users.max_repo_creation=Maksimāls repozitoriju veidošanas limits
users.max_repo_creation_desc=(Uzlikt -1 lai izmantotu globālu limitu pēc noklusējuma) users.max_repo_creation_desc=(Uzlikt -1 lai izmantotu globālu limitu pēc noklusējuma)
users.is_activated=Konts ir aktivizēts users.is_activated=Konts ir aktivizēts
users.prohibit_login=This account is prohibited to login
users.is_admin=Šim kontam ir administratora piekļuves tiesības 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_git_hook=Šim kontam ir tiesības pievienot/labot Git āķus
users.allow_import_local=Šim kontam ir tiesības importēt lokālus repozitorijus users.allow_import_local=Šim kontam ir tiesības importēt lokālus repozitorijus

6
conf/locale/locale_nl-NL.ini

@ -148,6 +148,8 @@ forget_password=Wachtwoord vergeten?
sign_up_now=Een account nodig? Meld u nu aan. sign_up_now=Een account nodig? Meld u nu aan.
confirmation_mail_sent_prompt=Een bevestigingsemail is gestuurd naar <b>%s</b>, Bevestig u aanvraag binnen %d uren om uw registratie te voltooien. confirmation_mail_sent_prompt=Een bevestigingsemail is gestuurd naar <b>%s</b>, Bevestig u aanvraag binnen %d uren om uw registratie te voltooien.
active_your_account=Activeer uw account active_your_account=Activeer uw account
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=Sorry, u heeft te snel na elkaar een aanvraag gedaan voor een activatie mail. Wacht drie minuten voor uw volgende aanvraag. resent_limit_prompt=Sorry, u heeft te snel na elkaar een aanvraag gedaan voor een activatie mail. Wacht drie minuten voor uw volgende aanvraag.
has_unconfirmed_mail=Beste %s, u heeft een onbevestigd e-mailadres (<b>%s</b>). Als u nog geen bevestiging heeft ontvangen, of u een nieuwe aanvraag wilt doen, klik dan op de onderstaande knop. has_unconfirmed_mail=Beste %s, u heeft een onbevestigd e-mailadres (<b>%s</b>). Als u nog geen bevestiging heeft ontvangen, of u een nieuwe aanvraag wilt doen, klik dan op de onderstaande knop.
resend_mail=Klik hier om uw activatie mail nog een keer te verzenden resend_mail=Klik hier om uw activatie mail nog een keer te verzenden
@ -409,6 +411,7 @@ file_raw=Ruwe
file_history=Geschiedenis file_history=Geschiedenis
file_view_raw=Weergave ruwe file_view_raw=Weergave ruwe
file_permalink=Permalink file_permalink=Permalink
file_too_large=This file is too large to be shown
commits.commits=Commits commits.commits=Commits
commits.search=Zoeken commits.search=Zoeken
@ -690,7 +693,7 @@ diff.show_unified_view=Gecombineerde weergave
diff.stats_desc=<strong>%d gewijzigde bestanden</strong> met <strong>toevoegingen van %d</strong> en <strong>%d verwijderingen</strong> diff.stats_desc=<strong>%d gewijzigde bestanden</strong> met <strong>toevoegingen van %d</strong> en <strong>%d verwijderingen</strong>
diff.bin=BIN diff.bin=BIN
diff.view_file=Bestand weergeven diff.view_file=Bestand weergeven
diff.file_supressed=File diff supressed because it is too large diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Some files were not shown because too many files changed in this diff diff.too_many_files=Some files were not shown because too many files changed in this diff
release.releases=Releases release.releases=Releases
@ -889,6 +892,7 @@ users.edit_account=Bewerk account
users.max_repo_creation=Maximum-limiet voor aanmaken van repositories users.max_repo_creation=Maximum-limiet voor aanmaken van repositories
users.max_repo_creation_desc=(Zet op -1 om de globale limiet te gebruiken) users.max_repo_creation_desc=(Zet op -1 om de globale limiet te gebruiken)
users.is_activated=Dit account is geactiveerd users.is_activated=Dit account is geactiveerd
users.prohibit_login=This account is prohibited to login
users.is_admin=Dit account heeft beheerdersrechten users.is_admin=Dit account heeft beheerdersrechten
users.allow_git_hook=Deze account beschikt over machtigingen voor het maken van Git haken users.allow_git_hook=Deze account beschikt over machtigingen voor het maken van Git haken
users.allow_import_local=Dit account mag lokale repositories importeren users.allow_import_local=Dit account mag lokale repositories importeren

6
conf/locale/locale_pl-PL.ini

@ -148,6 +148,8 @@ forget_password=Zapomniałeś hasła?
sign_up_now=Potrzebujesz konta? Zarejestruj się teraz. sign_up_now=Potrzebujesz konta? Zarejestruj się teraz.
confirmation_mail_sent_prompt=Nowa wiadomość e-mail z potwierdzeniem została wysłana do <b>%s</b>, proszę sprawdzić swoją skrzynkę odbiorczą w ciągu najbliższych godzin %d aby dokończyć proces rejestracji. confirmation_mail_sent_prompt=Nowa wiadomość e-mail z potwierdzeniem została wysłana do <b>%s</b>, proszę sprawdzić swoją skrzynkę odbiorczą w ciągu najbliższych godzin %d aby dokończyć proces rejestracji.
active_your_account=Aktywuj swoje konto active_your_account=Aktywuj swoje konto
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=Niestety, zbyt często wysyłasz e-mail aktywacyjny. Proszę odczekać 3 minuty. resent_limit_prompt=Niestety, zbyt często wysyłasz e-mail aktywacyjny. Proszę odczekać 3 minuty.
has_unconfirmed_mail=Witaj, %s, masz niepotwierdzony adres e-mail (<b>%s</b>). Jeśli nie otrzymałeś wiadomości e-mail z potwierdzeniem lub potrzebujesz wysłać nową, kliknij na poniższy przycisk. has_unconfirmed_mail=Witaj, %s, masz niepotwierdzony adres e-mail (<b>%s</b>). Jeśli nie otrzymałeś wiadomości e-mail z potwierdzeniem lub potrzebujesz wysłać nową, kliknij na poniższy przycisk.
resend_mail=Kliknij tutaj, aby wysłać e-mail aktywacyjny resend_mail=Kliknij tutaj, aby wysłać e-mail aktywacyjny
@ -409,6 +411,7 @@ file_raw=Czysty
file_history=Historia file_history=Historia
file_view_raw=Zobacz czysty file_view_raw=Zobacz czysty
file_permalink=Bezpośredni odnośnik file_permalink=Bezpośredni odnośnik
file_too_large=This file is too large to be shown
commits.commits=Commity commits.commits=Commity
commits.search=Przeszukaj commity commits.search=Przeszukaj commity
@ -690,7 +693,7 @@ diff.show_unified_view=Zunifikowany widok
diff.stats_desc=<strong>%d zmienionych plików</strong> z <strong>%d dodań</strong> i <strong>%d usunięć</strong> diff.stats_desc=<strong>%d zmienionych plików</strong> z <strong>%d dodań</strong> i <strong>%d usunięć</strong>
diff.bin=BIN diff.bin=BIN
diff.view_file=Wyświetl plik diff.view_file=Wyświetl plik
diff.file_supressed=File diff supressed because it is too large diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Some files were not shown because too many files changed in this diff diff.too_many_files=Some files were not shown because too many files changed in this diff
release.releases=Wydania release.releases=Wydania
@ -889,6 +892,7 @@ users.edit_account=Edytuj konto
users.max_repo_creation=Maksymalna liczba repozytoriów users.max_repo_creation=Maksymalna liczba repozytoriów
users.max_repo_creation_desc=(Ustaw -1, aby użyć globalnego limitu) users.max_repo_creation_desc=(Ustaw -1, aby użyć globalnego limitu)
users.is_activated=To konto jest aktywne users.is_activated=To konto jest aktywne
users.prohibit_login=This account is prohibited to login
users.is_admin=To konto ma uprawnienia administratora users.is_admin=To konto ma uprawnienia administratora
users.allow_git_hook=To konto posiada uprawnienia do tworzenia hooków Git users.allow_git_hook=To konto posiada uprawnienia do tworzenia hooków Git
users.allow_import_local=To konto ma uprawnienia do importu lokalnych repozytoriów users.allow_import_local=To konto ma uprawnienia do importu lokalnych repozytoriów

6
conf/locale/locale_pt-BR.ini

@ -148,6 +148,8 @@ forget_password=Esqueceu a senha?
sign_up_now=Precisa de uma conta? Cadastre-se agora. sign_up_now=Precisa de uma conta? Cadastre-se agora.
confirmation_mail_sent_prompt=Um novo e-mail de confirmação foi enviado para <b>%s</b>, por favor, verifique sua caixa de entrada nas próximas %d horas para completar seu registro. confirmation_mail_sent_prompt=Um novo e-mail de confirmação foi enviado para <b>%s</b>, por favor, verifique sua caixa de entrada nas próximas %d horas para completar seu registro.
active_your_account=Ativar Sua Conta active_your_account=Ativar Sua Conta
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=Desculpe, você está enviando um e-mail de ativação com muita frequência. Por favor, aguarde 3 minutos. resent_limit_prompt=Desculpe, você está enviando um e-mail de ativação com muita frequência. Por favor, aguarde 3 minutos.
has_unconfirmed_mail=Oi %s, você possui um endereço de e-mail não confirmado (<b>%s</b>). Se você não recebeu um e-mail de confirmação ou precisa reenviar um novo, clique no botão abaixo. has_unconfirmed_mail=Oi %s, você possui um endereço de e-mail não confirmado (<b>%s</b>). Se você não recebeu um e-mail de confirmação ou precisa reenviar um novo, clique no botão abaixo.
resend_mail=Clique aqui para reenviar seu e-mail de ativação resend_mail=Clique aqui para reenviar seu e-mail de ativação
@ -409,6 +411,7 @@ file_raw=Cru
file_history=Histórico file_history=Histórico
file_view_raw=Ver cru file_view_raw=Ver cru
file_permalink=Link permanente file_permalink=Link permanente
file_too_large=This file is too large to be shown
commits.commits=Commits commits.commits=Commits
commits.search=Pesquisar commits commits.search=Pesquisar commits
@ -690,7 +693,7 @@ diff.show_unified_view=Visão unificada
diff.stats_desc=<strong> %d arquivos alterados</strong> com <strong>%d adições</strong> e <strong>%d exclusões</strong> diff.stats_desc=<strong> %d arquivos alterados</strong> com <strong>%d adições</strong> e <strong>%d exclusões</strong>
diff.bin=BIN diff.bin=BIN
diff.view_file=Ver Arquivo diff.view_file=Ver Arquivo
diff.file_supressed=Diff do arquivo suprimido porque é muito extenso diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff diff.too_many_files=Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff
release.releases=Versões release.releases=Versões
@ -889,6 +892,7 @@ users.edit_account=Editar Conta
users.max_repo_creation=Limite máximo de criação de repositórios users.max_repo_creation=Limite máximo de criação de repositórios
users.max_repo_creation_desc=(Use "-1" para utilizar o limite padrão) users.max_repo_creation_desc=(Use "-1" para utilizar o limite padrão)
users.is_activated=Esta conta está ativada users.is_activated=Esta conta está ativada
users.prohibit_login=This account is prohibited to login
users.is_admin=Esta conta tem permissões de administrador 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_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.allow_import_local=Esta conta tem permissões para importar repositórios locais

6
conf/locale/locale_ru-RU.ini

@ -148,6 +148,8 @@ forget_password=Забыли пароль?
sign_up_now=Нужен аккаунт? Зарегистрируйтесь. sign_up_now=Нужен аккаунт? Зарегистрируйтесь.
confirmation_mail_sent_prompt=Новое письмо для подтверждения было направлено на <b>%s</b>, пожалуйста, проверьте ваш почтовый ящик в течение %d часов для завершения регистрации. confirmation_mail_sent_prompt=Новое письмо для подтверждения было направлено на <b>%s</b>, пожалуйста, проверьте ваш почтовый ящик в течение %d часов для завершения регистрации.
active_your_account=Активируйте свой аккаунт active_your_account=Активируйте свой аккаунт
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=Извините, вы уже запросили активацию по электронной почте недавно. Пожалуйста, подождите 3 минуты, а затем повторите попытку. resent_limit_prompt=Извините, вы уже запросили активацию по электронной почте недавно. Пожалуйста, подождите 3 минуты, а затем повторите попытку.
has_unconfirmed_mail=Здравствуйте, %s! У вас есть неподтвержденный адрес электронной почты (<b>%s</b>). Если вам не приходило письмо с подтверждением или нужно выслать новое письмо, нажмите на кнопку ниже. has_unconfirmed_mail=Здравствуйте, %s! У вас есть неподтвержденный адрес электронной почты (<b>%s</b>). Если вам не приходило письмо с подтверждением или нужно выслать новое письмо, нажмите на кнопку ниже.
resend_mail=Нажмите здесь, чтобы переотправить активационное письмо resend_mail=Нажмите здесь, чтобы переотправить активационное письмо
@ -409,6 +411,7 @@ file_raw=Исходник
file_history=История file_history=История
file_view_raw=Посмотреть исходник file_view_raw=Посмотреть исходник
file_permalink=Постоянная ссылка file_permalink=Постоянная ссылка
file_too_large=This file is too large to be shown
commits.commits=Коммиты commits.commits=Коммиты
commits.search=Поиск коммитов commits.search=Поиск коммитов
@ -690,7 +693,7 @@ diff.show_unified_view=Единый вид
diff.stats_desc=<strong> %d измененных файлов</strong> с <strong>%d добавлено</strong> и <strong>%d удалено</strong> diff.stats_desc=<strong> %d измененных файлов</strong> с <strong>%d добавлено</strong> и <strong>%d удалено</strong>
diff.bin=BIN diff.bin=BIN
diff.view_file=Просмотреть файл diff.view_file=Просмотреть файл
diff.file_supressed=Разница между файлами не показана из-за своего большого размера diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Некоторые файлы не были показать из-за большого количества измененных файлов diff.too_many_files=Некоторые файлы не были показать из-за большого количества измененных файлов
release.releases=Релизы release.releases=Релизы
@ -889,6 +892,7 @@ users.edit_account=Изменение учетной записи
users.max_repo_creation=Ограничение максимального количества создаваемых репозиториев users.max_repo_creation=Ограничение максимального количества создаваемых репозиториев
users.max_repo_creation_desc=(Установить -1 для использования стандартного глобального значения предела) users.max_repo_creation_desc=(Установить -1 для использования стандартного глобального значения предела)
users.is_activated=Эта учетная запись активирована users.is_activated=Эта учетная запись активирована
users.prohibit_login=This account is prohibited to login
users.is_admin=У этой учетной записи есть права администратора users.is_admin=У этой учетной записи есть права администратора
users.allow_git_hook=Пользователь имеет право создать Git перехватчик users.allow_git_hook=Пользователь имеет право создать Git перехватчик
users.allow_import_local=Пользователь имеет право импортировать локальные репозитории users.allow_import_local=Пользователь имеет право импортировать локальные репозитории

6
conf/locale/locale_tr-TR.ini

@ -148,6 +148,8 @@ forget_password=Parolanızı mı unuttunuz?
sign_up_now=Bir hesaba mı ihtiyacınız var? Şimdi kaydolun. sign_up_now=Bir hesaba mı ihtiyacınız var? Şimdi kaydolun.
confirmation_mail_sent_prompt=<b>%s</b> adresinize yeni bir doğrulama e-postası gönderildi, kaydolma aşamalarını tamamlamak için lütfen %d saat içinde e-posta adresinizi kontrol edin. confirmation_mail_sent_prompt=<b>%s</b> adresinize yeni bir doğrulama e-postası gönderildi, kaydolma aşamalarını tamamlamak için lütfen %d saat içinde e-posta adresinizi kontrol edin.
active_your_account=Hesabınızı Aktifleştirin active_your_account=Hesabınızı Aktifleştirin
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=Üzgünüz, zaten bir doğrulama e-postası talep ettiniz. Lütfen 3 dakika bekleyip tekrar deneyin. resent_limit_prompt=Üzgünüz, zaten bir doğrulama e-postası talep ettiniz. Lütfen 3 dakika bekleyip tekrar deneyin.
has_unconfirmed_mail=Merhaba %s, doğrulanmamış bir e-posta adresin var (<b>%s</b>). Bir doğrulama e-postası almadıysanız ya da yenisine ihtiyacınız varsa lütfen aşağıdaki düğmeye tıklayın. has_unconfirmed_mail=Merhaba %s, doğrulanmamış bir e-posta adresin var (<b>%s</b>). Bir doğrulama e-postası almadıysanız ya da yenisine ihtiyacınız varsa lütfen aşağıdaki düğmeye tıklayın.
resend_mail=Doğrulama e-postasını tekrar almak için buraya tıklayın resend_mail=Doğrulama e-postasını tekrar almak için buraya tıklayın
@ -409,6 +411,7 @@ file_raw=Ham
file_history=Geçmiş file_history=Geçmiş
file_view_raw=Ham Görünüm file_view_raw=Ham Görünüm
file_permalink=Kalıcı Bağlantı file_permalink=Kalıcı Bağlantı
file_too_large=This file is too large to be shown
commits.commits=İşlemeler commits.commits=İşlemeler
commits.search=İşleme Arama commits.search=İşleme Arama
@ -690,7 +693,7 @@ diff.show_unified_view=Birleşik Görünüm
diff.stats_desc=<strong> %d değiştirilmiş dosya</strong> ile <strong>%d ekleme</strong> ve <strong>%d silme</strong> diff.stats_desc=<strong> %d değiştirilmiş dosya</strong> ile <strong>%d ekleme</strong> ve <strong>%d silme</strong>
diff.bin=BIN diff.bin=BIN
diff.view_file=Dosyayı Görüntüle diff.view_file=Dosyayı Görüntüle
diff.file_supressed=File diff supressed because it is too large diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Some files were not shown because too many files changed in this diff diff.too_many_files=Some files were not shown because too many files changed in this diff
release.releases=Sürümler release.releases=Sürümler
@ -889,6 +892,7 @@ users.edit_account=Hesabı Düzenle
users.max_repo_creation=Maksimum Depo Oluşturma Limiti users.max_repo_creation=Maksimum Depo Oluşturma Limiti
users.max_repo_creation_desc=(Genel varsayılan limiti kullanmak için -1 yazın) users.max_repo_creation_desc=(Genel varsayılan limiti kullanmak için -1 yazın)
users.is_activated=Bu hesap aktivleştirildi users.is_activated=Bu hesap aktivleştirildi
users.prohibit_login=This account is prohibited to login
users.is_admin=Bu hesap, yönetici izinlerine sahiptir users.is_admin=Bu hesap, yönetici izinlerine sahiptir
users.allow_git_hook=Bu hesap, Git istekleri oluşturmak için gereken yetkilere sahip users.allow_git_hook=Bu hesap, Git istekleri oluşturmak için gereken yetkilere sahip
users.allow_import_local=Bu hesap, yerel depoları içeri aktarmak için gereken yetkilere sahip users.allow_import_local=Bu hesap, yerel depoları içeri aktarmak için gereken yetkilere sahip

6
conf/locale/locale_zh-CN.ini

@ -148,6 +148,8 @@ forget_password=忘记密码?
sign_up_now=还没帐户?马上注册。 sign_up_now=还没帐户?马上注册。
confirmation_mail_sent_prompt=一封新的确认邮件已经被发送至 <b>%s</b>,请检查您的收件箱并在 %d 小时内完成确认注册操作。 confirmation_mail_sent_prompt=一封新的确认邮件已经被发送至 <b>%s</b>,请检查您的收件箱并在 %d 小时内完成确认注册操作。
active_your_account=激活您的帐户 active_your_account=激活您的帐户
prohibit_login=禁止登录
prohibit_login_desc=您的帐户被禁止登录,请联系网站管理员。
resent_limit_prompt=对不起,您请求发送激活邮件过于频繁,请等待 3 分钟后再试! resent_limit_prompt=对不起,您请求发送激活邮件过于频繁,请等待 3 分钟后再试!
has_unconfirmed_mail=%s 您好,系统检测到您有一封发送至 <b>%s</b> 但未被确认的邮件。如果您未收到激活邮件,或需要重新发送,请单击下方的按钮。 has_unconfirmed_mail=%s 您好,系统检测到您有一封发送至 <b>%s</b> 但未被确认的邮件。如果您未收到激活邮件,或需要重新发送,请单击下方的按钮。
resend_mail=单击此处重新发送确认邮件 resend_mail=单击此处重新发送确认邮件
@ -409,6 +411,7 @@ file_raw=原始文件
file_history=文件历史 file_history=文件历史
file_view_raw=查看原始文件 file_view_raw=查看原始文件
file_permalink=永久链接 file_permalink=永久链接
file_too_large=文件过大导致无法显示
commits.commits=次代码提交 commits.commits=次代码提交
commits.search=搜索提交历史 commits.search=搜索提交历史
@ -690,7 +693,7 @@ diff.show_unified_view=合并视图
diff.stats_desc=共有 <strong> %d 个文件被更改</strong>,包括 <strong>%d 次插入</strong> 和 <strong>%d 次删除</strong> diff.stats_desc=共有 <strong> %d 个文件被更改</strong>,包括 <strong>%d 次插入</strong> 和 <strong>%d 次删除</strong>
diff.bin=二进制 diff.bin=二进制
diff.view_file=查看文件 diff.view_file=查看文件
diff.file_supressed=文件差异内容过多而无法显示 diff.file_suppressed=文件差异内容过多而无法显示
diff.too_many_files=部分文件因为文件数量过多而无法显示 diff.too_many_files=部分文件因为文件数量过多而无法显示
release.releases=版本发布 release.releases=版本发布
@ -889,6 +892,7 @@ users.edit_account=编辑用户信息
users.max_repo_creation=最大允许创建仓库数量 users.max_repo_creation=最大允许创建仓库数量
users.max_repo_creation_desc=(设置为 -1 表示使用全局默认值) users.max_repo_creation_desc=(设置为 -1 表示使用全局默认值)
users.is_activated=该用户已被激活 users.is_activated=该用户已被激活
users.prohibit_login=该帐户被禁止登录
users.is_admin=该用户具有管理员权限 users.is_admin=该用户具有管理员权限
users.allow_git_hook=该用户具有创建 Git 钩子的权限 users.allow_git_hook=该用户具有创建 Git 钩子的权限
users.allow_import_local=该用户具有导入本地仓库的权限 users.allow_import_local=该用户具有导入本地仓库的权限

6
conf/locale/locale_zh-HK.ini

@ -148,6 +148,8 @@ forget_password=忘記密碼?
sign_up_now=還沒帳戶?馬上註冊。 sign_up_now=還沒帳戶?馬上註冊。
confirmation_mail_sent_prompt=一封新的確認郵件已經被發送至 <b>%s</b>,請檢查您的收件箱並在 %d 小時內完成確認註冊操作。 confirmation_mail_sent_prompt=一封新的確認郵件已經被發送至 <b>%s</b>,請檢查您的收件箱並在 %d 小時內完成確認註冊操作。
active_your_account=激活您的帳戶 active_your_account=激活您的帳戶
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=對不起,您請求發送激活郵件過於頻繁,請等待 3 分鐘後再試! resent_limit_prompt=對不起,您請求發送激活郵件過於頻繁,請等待 3 分鐘後再試!
has_unconfirmed_mail=%s 您好,您有一封發送至( <b>%s</b>) 但未被確認的郵件。如果您未收到激活郵件,或需要重新發送,請單擊下方的按鈕。 has_unconfirmed_mail=%s 您好,您有一封發送至( <b>%s</b>) 但未被確認的郵件。如果您未收到激活郵件,或需要重新發送,請單擊下方的按鈕。
resend_mail=單擊此處重新發送確認郵件 resend_mail=單擊此處重新發送確認郵件
@ -409,6 +411,7 @@ file_raw=原始文件
file_history=文件歷史 file_history=文件歷史
file_view_raw=查看原始文件 file_view_raw=查看原始文件
file_permalink=永久連結 file_permalink=永久連結
file_too_large=This file is too large to be shown
commits.commits=次代碼提交 commits.commits=次代碼提交
commits.search=搜索提交歷史 commits.search=搜索提交歷史
@ -690,7 +693,7 @@ diff.show_unified_view=統一視圖
diff.stats_desc=共有 <strong> %d 個文件被更改</strong>,包括 <strong>%d 次插入</strong> 和 <strong>%d 次删除</strong> diff.stats_desc=共有 <strong> %d 個文件被更改</strong>,包括 <strong>%d 次插入</strong> 和 <strong>%d 次删除</strong>
diff.bin=二進制 diff.bin=二進制
diff.view_file=查看文件 diff.view_file=查看文件
diff.file_supressed=File diff supressed because it is too large diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=Some files were not shown because too many files changed in this diff diff.too_many_files=Some files were not shown because too many files changed in this diff
release.releases=版本發佈 release.releases=版本發佈
@ -889,6 +892,7 @@ users.edit_account=編輯用戶信息
users.max_repo_creation=最大儲存庫新增限制 users.max_repo_creation=最大儲存庫新增限制
users.max_repo_creation_desc=(設定 -1 使用全域預設限制) users.max_repo_creation_desc=(設定 -1 使用全域預設限制)
users.is_activated=該用戶已被激活 users.is_activated=該用戶已被激活
users.prohibit_login=This account is prohibited to login
users.is_admin=該用戶具有管理員權限 users.is_admin=該用戶具有管理員權限
users.allow_git_hook=該帳戶具有創建 Git 鉤子的權限 users.allow_git_hook=該帳戶具有創建 Git 鉤子的權限
users.allow_import_local=該用戶具有導入本地倉庫的權限 users.allow_import_local=該用戶具有導入本地倉庫的權限

6
conf/locale/locale_zh-TW.ini

@ -148,6 +148,8 @@ forget_password=忘記密碼?
sign_up_now=還沒帳戶?馬上註冊。 sign_up_now=還沒帳戶?馬上註冊。
confirmation_mail_sent_prompt=一封新的確認郵件已經被發送至 <b>%s</b>,請檢查您的收件箱並在 %d 小時內完成確認註冊操作。 confirmation_mail_sent_prompt=一封新的確認郵件已經被發送至 <b>%s</b>,請檢查您的收件箱並在 %d 小時內完成確認註冊操作。
active_your_account=激活您的帳戶 active_your_account=激活您的帳戶
prohibit_login=Login Prohibited
prohibit_login_desc=Your account is prohibited to login, please contact site admin.
resent_limit_prompt=對不起,您請求發送激活郵件過於頻繁,請等待 3 分鐘後再試! resent_limit_prompt=對不起,您請求發送激活郵件過於頻繁,請等待 3 分鐘後再試!
has_unconfirmed_mail=%s 您好,您有一封發送至( <b>%s</b>) 但未被確認的郵件。如果您未收到激活郵件,或需要重新發送,請單擊下方的按鈕。 has_unconfirmed_mail=%s 您好,您有一封發送至( <b>%s</b>) 但未被確認的郵件。如果您未收到激活郵件,或需要重新發送,請單擊下方的按鈕。
resend_mail=單擊此處重新發送確認郵件 resend_mail=單擊此處重新發送確認郵件
@ -409,6 +411,7 @@ file_raw=原始文件
file_history=文件歷史 file_history=文件歷史
file_view_raw=查看原始文件 file_view_raw=查看原始文件
file_permalink=永久連結 file_permalink=永久連結
file_too_large=This file is too large to be shown
commits.commits=次代碼提交 commits.commits=次代碼提交
commits.search=搜索提交歷史 commits.search=搜索提交歷史
@ -690,7 +693,7 @@ diff.show_unified_view=統一視圖
diff.stats_desc=共有 <strong> %d 個文件被更改</strong>,包括 <strong>%d 次插入</strong> 和 <strong>%d 次删除</strong> diff.stats_desc=共有 <strong> %d 個文件被更改</strong>,包括 <strong>%d 次插入</strong> 和 <strong>%d 次删除</strong>
diff.bin=二進制 diff.bin=二進制
diff.view_file=查看文件 diff.view_file=查看文件
diff.file_supressed=文件差異過大導致無法顯示 diff.file_suppressed=File diff suppressed because it is too large
diff.too_many_files=部分文件因文件數量過多而無法顯示 diff.too_many_files=部分文件因文件數量過多而無法顯示
release.releases=版本發佈 release.releases=版本發佈
@ -889,6 +892,7 @@ users.edit_account=編輯用戶信息
users.max_repo_creation=最大儲存庫新增限制 users.max_repo_creation=最大儲存庫新增限制
users.max_repo_creation_desc=(設定 -1 使用全域預設限制) users.max_repo_creation_desc=(設定 -1 使用全域預設限制)
users.is_activated=該用戶已被激活 users.is_activated=該用戶已被激活
users.prohibit_login=This account is prohibited to login
users.is_admin=該用戶具有管理員權限 users.is_admin=該用戶具有管理員權限
users.allow_git_hook=該帳戶具有創建 Git 鉤子的權限 users.allow_git_hook=該帳戶具有創建 Git 鉤子的權限
users.allow_import_local=該用戶具有導入本地倉庫的權限 users.allow_import_local=該用戶具有導入本地倉庫的權限

2
glide.lock generated

@ -41,7 +41,7 @@ imports:
- name: github.com/gogits/cron - name: github.com/gogits/cron
version: 96040e4fab17baa0391ce571694e4ccb5fce5dac version: 96040e4fab17baa0391ce571694e4ccb5fce5dac
- name: github.com/gogits/git-module - name: github.com/gogits/git-module
version: db93fa550116997bbe0b62baa653b8e6f4135258 version: 53bcb7352ff838610c537c9b589ca79bca92c661
- name: github.com/gogits/go-gogs-client - name: github.com/gogits/go-gogs-client
version: ee68cd9eefff11615f336e9965762f6736eeecc8 version: ee68cd9eefff11615f336e9965762f6736eeecc8
- name: github.com/issue9/identicon - name: github.com/issue9/identicon

2
gogs.go

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

6
models/git_diff.go

@ -160,6 +160,7 @@ type DiffFile struct {
IsDeleted bool IsDeleted bool
IsBin bool IsBin bool
IsRenamed bool IsRenamed bool
IsSubmodule bool
Sections []*DiffSection Sections []*DiffSection
IsIncomplete bool IsIncomplete bool
} }
@ -306,7 +307,7 @@ func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (*
} }
curFileLinesCount = 0 curFileLinesCount = 0
// Check file diff type. // Check file diff type and is submodule.
for { for {
line, err := input.ReadString('\n') line, err := input.ReadString('\n')
if err != nil { if err != nil {
@ -333,6 +334,9 @@ func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (*
curFile.Name = b curFile.Name = b
} }
if curFile.Type > 0 { if curFile.Type > 0 {
if strings.HasSuffix(line, " 160000\n") {
curFile.IsSubmodule = true
}
break break
} }
} }

18
models/issue.go

@ -73,15 +73,19 @@ func (i *Issue) BeforeUpdate() {
i.DeadlineUnix = i.Deadline.UTC().Unix() i.DeadlineUnix = i.Deadline.UTC().Unix()
} }
func (issue *Issue) loadAttributes() (err error) { func (issue *Issue) loadAttributes(e Engine) (err error) {
issue.Repo, err = GetRepositoryByID(issue.RepoID) issue.Repo, err = getRepositoryByID(e, issue.RepoID)
if err != nil { if err != nil {
return fmt.Errorf("GetRepositoryByID: %v", err) return fmt.Errorf("getRepositoryByID: %v", err)
} }
return nil return nil
} }
func (issue *Issue) LoadAttributes() (err error) {
return issue.loadAttributes(x)
}
func (i *Issue) AfterSet(colName string, _ xorm.Cell) { func (i *Issue) AfterSet(colName string, _ xorm.Cell) {
var err error var err error
switch colName { switch colName {
@ -398,7 +402,7 @@ func newIssue(e *xorm.Session, repo *Repository, issue *Issue, labelIDs []int64,
} }
} }
return issue.loadAttributes() return issue.loadAttributes(e)
} }
// NewIssue creates new issue with labels for repository. // NewIssue creates new issue with labels for repository.
@ -462,7 +466,7 @@ func GetIssueByRef(ref string) (*Issue, error) {
return nil, err return nil, err
} }
return issue, issue.loadAttributes() return issue, issue.LoadAttributes()
} }
// GetIssueByIndex returns issue by given index in repository. // GetIssueByIndex returns issue by given index in repository.
@ -477,7 +481,7 @@ func GetIssueByIndex(repoID, index int64) (*Issue, error) {
} else if !has { } else if !has {
return nil, ErrIssueNotExist{0, repoID, index} return nil, ErrIssueNotExist{0, repoID, index}
} }
return issue, issue.loadAttributes() return issue, issue.LoadAttributes()
} }
// GetIssueByID returns an issue by given ID. // GetIssueByID returns an issue by given ID.
@ -489,7 +493,7 @@ func GetIssueByID(id int64) (*Issue, error) {
} else if !has { } else if !has {
return nil, ErrIssueNotExist{id, 0, 0} return nil, ErrIssueNotExist{id, 0, 0}
} }
return issue, issue.loadAttributes() return issue, issue.LoadAttributes()
} }
type IssuesOptions struct { type IssuesOptions struct {

2
models/login.go

@ -296,7 +296,7 @@ func LoginUserLDAPSource(u *User, loginName, passwd string, source *LoginSource,
username = loginName username = loginName
} }
// Validate username make sure it satisfies requirement. // Validate username make sure it satisfies requirement.
if !binding.AlphaDashDotPattern.MatchString(username) { if binding.AlphaDashDotPattern.MatchString(username) {
return nil, fmt.Errorf("Invalid pattern for attribute 'username' [%s]: must be valid alpha or numeric or dash(-_) or dot characters", username) return nil, fmt.Errorf("Invalid pattern for attribute 'username' [%s]: must be valid alpha or numeric or dash(-_) or dot characters", username)
} }

5
models/user.go

@ -12,7 +12,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"image" "image"
"image/jpeg"
_ "image/jpeg" _ "image/jpeg"
"image/png" "image/png"
"os" "os"
@ -222,7 +221,7 @@ func (u *User) GenerateRandomAvatar() error {
} }
defer fw.Close() defer fw.Close()
if err = jpeg.Encode(fw, img, nil); err != nil { if err = png.Encode(fw, img); err != nil {
return fmt.Errorf("Encode: %v", err) return fmt.Errorf("Encode: %v", err)
} }
@ -321,7 +320,7 @@ func (u *User) UploadAvatar(data []byte) error {
return fmt.Errorf("Decode: %v", err) return fmt.Errorf("Decode: %v", err)
} }
m := resize.Resize(290, 290, img, resize.NearestNeighbor) m := resize.Resize(avatar.AVATAR_SIZE, avatar.AVATAR_SIZE, img, resize.NearestNeighbor)
sess := x.NewSession() sess := x.NewSession()
defer sessionRelease(sess) defer sessionRelease(sess)

4
modules/avatar/avatar.go

@ -14,7 +14,7 @@ import (
"github.com/issue9/identicon" "github.com/issue9/identicon"
) )
const _RANDOM_AVATAR_SIZE = 200 const AVATAR_SIZE = 290
// RandomImage generates and returns a random avatar image unique to input data // RandomImage generates and returns a random avatar image unique to input data
// in custom size (height and width). // in custom size (height and width).
@ -39,5 +39,5 @@ func RandomImageSize(size int, data []byte) (image.Image, error) {
// RandomImage generates and returns a random avatar image unique to input data // RandomImage generates and returns a random avatar image unique to input data
// in default size (height and width). // in default size (height and width).
func RandomImage(data []byte) (image.Image, error) { func RandomImage(data []byte) (image.Image, error) {
return RandomImageSize(_RANDOM_AVATAR_SIZE, data) return RandomImageSize(AVATAR_SIZE, data)
} }

1
public/js/gogs.js

@ -1458,5 +1458,6 @@ $(window).load(function () {
}); });
$(function() { $(function() {
if ($('.user.signin').length >0) return;
$('form').areYouSure(); $('form').areYouSure();
}); });

2
templates/.VERSION

@ -1 +1 @@
0.9.46.0717 0.9.48.0722

2
templates/repo/diff_box.tmpl

@ -68,6 +68,7 @@
{{end}} {{end}}
</div> </div>
<span class="file">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}</span> <span class="file">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}</span>
{{if not $file.IsSubmodule}}
<div class="ui right"> <div class="ui right">
{{if $file.IsDeleted}} {{if $file.IsDeleted}}
<a class="ui basic tiny button" rel="nofollow" href="{{EscapePound $.BeforeSourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> <a class="ui basic tiny button" rel="nofollow" href="{{EscapePound $.BeforeSourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
@ -75,6 +76,7 @@
<a class="ui basic tiny button" rel="nofollow" href="{{EscapePound $.SourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> <a class="ui basic tiny button" rel="nofollow" href="{{EscapePound $.SourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a>
{{end}} {{end}}
</div> </div>
{{end}}
</h4> </h4>
<div class="ui attached table segment"> <div class="ui attached table segment">
{{if not $file.IsRenamed}} {{if not $file.IsRenamed}}

Loading…
Cancel
Save