peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/go-gitea/gitea

Browse Source
This commit is contained in:
kolaente 2018-04-16 19:35:03 +02:00
commit 8d2015f98f
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
31 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
options/locale/locale_bg-BG.ini
View File

@ -650,6 +650,7 @@ release.tag_name_invalid=Името на етикета е невалидно.
release.downloads=Изтегляния
[org]
org_name_holder=Име на организацията
org_full_name_holder=Пълно име на организацията

1
options/locale/locale_cs-CZ.ini
View File

@ -651,6 +651,7 @@ release.tag_name_invalid=Název štítku není platný.
release.downloads=Soubory ke stažení
[org]
org_name_holder=Název organizace
org_full_name_holder=Celý název organizace

8
options/locale/locale_de-DE.ini
View File

@ -910,6 +910,8 @@ settings.pulls.ignore_whitespace=Beim Überprüfen auf Konflikte Leerzeichenänd
settings.pulls.allow_merge_commits=Mergecommits erlauben
settings.pulls.allow_rebase_merge=Mergen von Commits durch Rebase erlauben
settings.pulls.allow_squash_commits=Squash-Commits vor dem Mergen erlauben
settings.admin_settings=Administratoreinstellungen
settings.admin_enable_health_check=Healthchecks (git fsck) für dieses Repo aktivieren
settings.danger_zone=Gefahrenzone
settings.new_owner_has_same_repo=Der neue Eigentümer hat bereits ein Repository mit dem gleichen Namen. Bitte wähle einen anderen Namen.
settings.convert=In ein normales Repository umwandeln
@ -1028,6 +1030,10 @@ settings.protect_whitelist_users=Benutzer, die in diese Branch pushen dürfen
settings.protect_whitelist_search_users=Benutzer suchen
settings.protect_whitelist_teams=Teams, deren Mitglieder in diese Branch pushen dürfen
settings.protect_whitelist_search_teams=Teams suchen
settings.protect_merge_whitelist_committers=Erlaube, wer Pull-Requests auf diese Branch mergen darf
settings.protect_merge_whitelist_committers_desc=Füge Benutzer oder Teams zur Whitelist hinzu. Nur Benutzer auf der Whitelist können Pull-Requests auf diese Branch mergen. Ist diese Option nicht ausgewählt, kann jeder Benutzer mit Schreibrechten Pull-Requests auf diese Branch mergen.
settings.protect_merge_whitelist_users=Benutzer, die in diese Pull-Requests auf diese Branch mergen dürfen
settings.protect_merge_whitelist_teams=Teams, deren Mitglieder Pull-Requests auf diese Branch mergen dürfen
settings.add_protected_branch=Schutz aktivieren
settings.delete_protected_branch=Schutz deaktivieren
settings.update_protect_branch_success=Die Protection-Optionen für Branch %s wurden erfolgreich geändert.
@ -1108,6 +1114,7 @@ branch.restore_success=%s wurde erfolgreich wiederhergestellt
branch.restore_failed=Wiederherstellung der Branch %s gescheitert.
branch.protected_deletion_failed=Es ist nicht möglich, die geschützte Branch %s zu löschen.
[org]
org_name_holder=Name der Organisation
org_full_name_holder=Vollständiger Name der Organisation
@ -1429,6 +1436,7 @@ config.active_code_lives=Aktivierungscode Lebensdauer
config.reset_password_code_lives=Ablaufdatum des Passworts zurücksetzen
config.default_keep_email_private=Standard-Wert für "E-Mail-Adressen Privat halten
config.default_allow_create_organization=Standardmäßige Erlaubnis eine Organisation zu erstellen
config.enable_timetracking=Zeiterfassung einschalten
config.default_enable_timetracking=Zeiterfassung standardmäßig aktivieren
config.default_allow_only_contributors_to_track_time=Nur Contributors standardmäßig erlauben, die Zeiterfassung zu nutzen
config.no_reply_address=No-Reply Adresse

1
options/locale/locale_es-ES.ini
View File

@ -999,6 +999,7 @@ branch.restore_success=%s restaurada con éxito
branch.restore_failed=Fallo al restaurar la rama %s.
branch.protected_deletion_failed=No es posible eliminar la rama protegida %s.
[org]
org_name_holder=Nombre de la organización
org_full_name_holder=Nombre completo de la organización

1
options/locale/locale_fi-FI.ini
View File

@ -622,6 +622,7 @@ release.tag_name_invalid=Tagin nimi ei kelpaa.
release.downloads=Lataukset
[org]
org_name_holder=Organisaatio
org_full_name_holder=Organisaation täydellinen nimi

1
options/locale/locale_fr-FR.ini
View File

@ -1087,6 +1087,7 @@ branch.restore_success=%s à été restaurée avec succès
branch.restore_failed=La restauration de la branche %s a échoué.
branch.protected_deletion_failed=Il n'est pas possible de supprimer la branche protégée %s.
[org]
org_name_holder=Nom de l'organisation
org_full_name_holder=Nom complet de l'organisation

1
options/locale/locale_hu-HU.ini
View File

@ -1114,6 +1114,7 @@ branch.restore_success=A(z) %s ág sikeresen visszaállítva
branch.restore_failed=A(z) %s ág visszaállítása sikertelen.
branch.protected_deletion_failed=Nem lehetséges a védett ágat (%s) törölni.
[org]
org_name_holder=Szervezet neve
org_full_name_holder=Szervezet teljes neve

1
options/locale/locale_id-ID.ini
View File

@ -1087,6 +1087,7 @@ branch.restore_success=%s berhasil dipulihkan
branch.restore_failed=Gagal mengembalikan cabang %s.
branch.protected_deletion_failed=Tidak mungkin menghapus cabang yang dilindungi %s.
[org]
org_name_holder=Nama Organisasi
org_full_name_holder=Organisasi Nama Lengkap

1
options/locale/locale_it-IT.ini
View File

@ -801,6 +801,7 @@ release.tag_name_already_exist=Un rilascio con questo tag esiste già.
release.downloads=Download
[org]
org_name_holder=Nome dell'Organizzazione
org_full_name_holder=Nome completo dell'organizzazione

1
options/locale/locale_ja-JP.ini
View File

@ -1085,6 +1085,7 @@ branch.restore_success=%s は正常に復元されました
branch.restore_failed=ブランチ %s を復元できませんでした。
branch.protected_deletion_failed=保護されたブランチ %s を削除することはできません。
[org]
org_name_holder=組織名
org_full_name_holder=組織のフルネーム

1
options/locale/locale_ko-KR.ini
View File

@ -884,6 +884,7 @@ branch.delete_notices_2=- 이 작업은 %s 브랜치에 있는 모든 것을 영
branch.deletion_success=%s 가 삭제 되었습니다.
branch.deletion_failed=%s 브랜치를 삭제하는데 실패 했습니다.
[org]
org_name_holder=조직 이름
org_full_name_holder=조직 전체 이름

1
options/locale/locale_lt-LT.ini
View File

@ -309,6 +309,7 @@ issues.save=Saugoti
[org]

1
options/locale/locale_lv-LV.ini
View File

@ -1114,6 +1114,7 @@ branch.restore_success=%s veiksmīgi atjaunots
branch.restore_failed=Neizdevās atjaunot atzaru %s.
branch.protected_deletion_failed=Nav iespējams dzēst aizsargātu zaru %s.
[org]
org_name_holder=Organizācijas nosaukums
org_full_name_holder=Organizācijas pilnais nosaukums

1
options/locale/locale_nb-NO.ini
View File

@ -168,6 +168,7 @@ admin_password=Passord
[org]

1
options/locale/locale_nl-NL.ini
View File

@ -1011,6 +1011,7 @@ branch.create_from=van '%s'
branch.create_success=Branch '%s' is met succes aangemaakt!
branch.deleted_by=Verwijderd door %s
[org]
org_name_holder=Organisatienaam
org_full_name_holder=Volledige naam organisatie

1
options/locale/locale_nn-NO.ini
View File

@ -64,6 +64,7 @@
[org]

1
options/locale/locale_no-NO.ini
View File

@ -115,6 +115,7 @@ smtp_from=Fra
[org]

1
options/locale/locale_pl-PL.ini
View File

@ -1079,6 +1079,7 @@ branch.restore_success=%s przywrócona pomyślnie
branch.restore_failed=Nie udało się odtworzyć gałęzi %s.
branch.protected_deletion_failed=Nie można usunąć chronionej gałęzi %s.
[org]
org_name_holder=Nazwa organizacji
org_full_name_holder=Pełna nazwa organizacji

1
options/locale/locale_pt-BR.ini
View File

@ -1114,6 +1114,7 @@ branch.restore_success=%s restaurado com sucesso
branch.restore_failed=Falha ao restaurar branch %s.
branch.protected_deletion_failed=Não é possível excluir a branch %s protegida.
[org]
org_name_holder=Nome da organização
org_full_name_holder=Nome completo da organização

2
options/locale/locale_ru-RU.ini
View File

@ -1114,6 +1114,7 @@ branch.restore_success=%s успешно восстановлен
branch.restore_failed=Не удалось восстановить ветку %s.
branch.protected_deletion_failed=Невозможно удалить защищённую ветку %s.
[org]
org_name_holder=Название организации
org_full_name_holder=Полное название организации
@ -1435,6 +1436,7 @@ config.active_code_lives=Время жизни кода для активаци
config.reset_password_code_lives=Время жизни кода на сброс пароля
config.default_keep_email_private=Значение по умолчанию для настройки приватности электронной почты
config.default_allow_create_organization=Право по умолчанию на создание организаций
config.enable_timetracking=Включить отслеживание времени
config.default_enable_timetracking=Включение отслеживания времени по умолчанию
config.default_allow_only_contributors_to_track_time=По умолчанию учитывать только участников разработки в подсчёте времени
config.no_reply_address=No-reply адрес

1
options/locale/locale_ru-UA.ini
View File

@ -64,6 +64,7 @@
[org]

1
options/locale/locale_sr-SP.ini
View File

@ -647,6 +647,7 @@ release.tag_name_invalid=Име ознаке није исправно.
release.downloads=Преузимања
[org]
org_name_holder=Име организације
org_full_name_holder=Пун назив организације

1
options/locale/locale_sv-SE.ini
View File

@ -950,6 +950,7 @@ branch.delete_notices_2=- Denna åtgärd kommer att permanent ta bort allt i gre
branch.deletion_success=%s har tagits bort.
branch.deletion_failed=Kunde inte ta bort grenen %s.
[org]
org_name_holder=Organisationsnamn
org_full_name_holder=Organisationens Fullständiga Namn

1
options/locale/locale_tr-TR.ini
View File

@ -1073,6 +1073,7 @@ branch.restore_success=%s başarıyla onarıldı
branch.restore_failed=Branş %s onarımı başarısız oldu.
branch.protected_deletion_failed=Korunan branş %s'i silmek mümkün değil.
[org]
org_name_holder=Organizasyon Adı
org_full_name_holder=Organizasyon Tam Adı

1
options/locale/locale_uk-UA.ini
View File

@ -466,6 +466,7 @@ settings.active=Активний
release.cancel=Відміна
[org]

1
options/locale/locale_zh-CN.ini
View File

@ -1114,6 +1114,7 @@ branch.restore_success=%s 成功恢复
branch.restore_failed=未能还原分支%s。
branch.protected_deletion_failed=不能删除受保护的分支%s。
[org]
org_name_holder=组织名称
org_full_name_holder=组织全名

1
options/locale/locale_zh-HK.ini
View File

@ -955,6 +955,7 @@ branch.deletion_success=%s 已被刪除。
branch.deletion_failed=刪除分支 %s 失敗。
branch.delete_branch_has_new_commits=不能刪除 %s，因為合併後已新增了新的提交。
[org]
org_name_holder=組織名稱
org_full_name_holder=組織全名

1
options/locale/locale_zh-TW.ini
View File

@ -1061,6 +1061,7 @@ branch.restore_success=%s 成功恢復
branch.restore_failed=還原分支 %s 失敗
branch.protected_deletion_failed=不可能刪除已受保護的分支 %s。
[org]
org_name_holder=組織名稱
org_full_name_holder=組織全名

2
public/css/index.css
View File

File diff suppressed because one or more lines are too long

3
public/less/_base.less
View File

@ -54,7 +54,7 @@ pre, code {
}
.full.height {
padding: 0;
margin: 0 0 -@footer-margin*2 0;
margin: 0 0 -@footer-margin 0;
min-height: 100%;
}
.following.bar {
@ -399,7 +399,6 @@ pre, code {
}
footer {
margin-top: @footer-margin+14px !important;
height: @footer-margin;
background-color: white;
border-top: 1px solid #d6d6d6;

12
templates/repo/activity.tmpl
View File

@ -30,9 +30,13 @@
<div class="column">
{{if gt .Activity.ActivePRCount 0}}
<div class="stats-table">
<a href="#merged-pull-requests" class="table-cell tiny background purple" style="width: {{.Activity.MergedPRPerc}}%"></a>
<a href="#merged-pull-requests" class="table-cell tiny background purple" style="width: {{.Activity.MergedPRPerc}}{{if ne .Activity.MergedPRPerc 0}}%{{end}}"></a>
<a href="#proposed-pull-requests" class="table-cell tiny background green"></a>
</div>
{{else}}
<div class="stats-table">
<a class="table-cell tiny background light grey"></a>
</div>
{{end}}
{{.i18n.Tr (TrN .i18n.Lang .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n") .Activity.ActivePRCount | Safe }}
</div>
@ -41,9 +45,13 @@
<div class="column">
{{if gt .Activity.ActiveIssueCount 0}}
<div class="stats-table">
<a href="#closed-issues" class="table-cell tiny background red" style="width: {{.Activity.ClosedIssuePerc}}%"></a>
<a href="#closed-issues" class="table-cell tiny background red" style="width: {{.Activity.ClosedIssuePerc}}{{if ne .Activity.ClosedIssuePerc 0}}%{{end}}"></a>
<a href="#new-issues" class="table-cell tiny background green"></a>
</div>
{{else}}
<div class="stats-table">
<a class="table-cell tiny background light grey"></a>
</div>
{{end}}
{{.i18n.Tr (TrN .i18n.Lang .Activity.ActiveIssueCount "repo.activity.active_issues_count_1" "repo.activity.active_issues_count_n") .Activity.ActiveIssueCount | Safe }}
</div>