{{if .Failed}}
-
+
{{else}}
-
+
{{end}}
+
{{end}}
%[1]s zu %[3]s umbenannt
commit_repo=hat %[3]s auf %[4]s gepusht
-create_issue=`hat Ticket %[3]s#%[2]s geöffnet`
-close_issue=`Ticket %[3]s#%[2]s geschlossen`
-reopen_issue=`Ticket %[3]s#%[2]s wiedereröffnet`
+create_issue=`hat das Issue %[3]s#%[2]s geöffnet`
+close_issue=`hat das Issue %[3]s#%[2]s geschlossen`
+reopen_issue=`hat das Issue %[3]s#%[2]s wiedereröffnet`
create_pull_request=`hat den Pull-Request %[3]s#%[2]s erstellt`
close_pull_request=`Pull-Request %[3]s#%[2]s wurde geschlossen`
reopen_pull_request=`Pull-Request %[3]s#%[2]s wurde wiedereröffnet`
-comment_issue=`Ticket %[3]s#%[2]s wurde kommentiert`
+comment_issue=`hat das Issue %[3]s#%[2]s kommentiert`
comment_pull=`Pull-Request %[3]s#%[2]s wurde kommentiert`
merge_pull_request=`Pull-Request %[3]s#%[2]s wurde zusammengeführt`
auto_merge_pull_request=`Pull-Request %[3]s#%[2]s wurde automatisch zusammengeführt`
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 6cb830b6d..b2eeab617 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -80,6 +80,7 @@ milestones = Milestones
ok = OK
cancel = Cancel
+retry = Retry
rerun = Re-run
rerun_all = Re-run all jobs
save = Save
@@ -1150,10 +1151,10 @@ file_view_rendered = View Rendered
file_view_raw = View Raw
file_permalink = Permalink
file_too_large = The file is too large to be shown.
-invisible_runes_header = `This file contains invisible Unicode characters!`
-invisible_runes_description = `This file contains invisible Unicode characters that may be processed differently from what appears below. If your use case is intentional and legitimate, you can safely ignore this warning. Use the Escape button to reveal hidden characters.`
-ambiguous_runes_header = `This file contains ambiguous Unicode characters!`
-ambiguous_runes_description = `This file contains ambiguous Unicode characters that may be confused with others in your current locale. If your use case is intentional and legitimate, you can safely ignore this warning. Use the Escape button to highlight these characters.`
+invisible_runes_header = `This file contains invisible Unicode characters`
+invisible_runes_description = `This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.`
+ambiguous_runes_header = `This file contains ambiguous Unicode characters`
+ambiguous_runes_description = `This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.`
invisible_runes_line = `This line has invisible unicode characters`
ambiguous_runes_line = `This line has ambiguous unicode characters`
ambiguous_character = `%[1]c [U+%04[1]X] can be confused with %[2]c [U+%04[2]X]`
@@ -1784,6 +1785,8 @@ pulls.delete.text = Do you really want to delete this pull request? (This will p
pulls.recently_pushed_new_branches = You pushed on branch %[1]s %[2]s
+pull.deleted_branch = (deleted):%s
+
milestones.new = New Milestone
milestones.closed = Closed %s
milestones.update_ago = Updated %s
@@ -2507,7 +2510,7 @@ tag.create_success = Tag "%s" has been created.
topic.manage_topics = Manage Topics
topic.done = Done
topic.count_prompt = You cannot select more than 25 topics
-topic.format_prompt = Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
+topic.format_prompt = Topics must start with a letter or number, can include dashes ('-') and dots ('.'), can be up to 35 characters long. Letters must be lowercase.
find_file.go_to_file = Go to file
find_file.no_matching = No matching file found
diff --git a/routers/web/repo/migrate.go b/routers/web/repo/migrate.go
index b918650d1..a6125a1a5 100644
--- a/routers/web/repo/migrate.go
+++ b/routers/web/repo/migrate.go
@@ -259,6 +259,15 @@ func setMigrationContextData(ctx *context.Context, serviceType structs.GitServic
ctx.Data["service"] = serviceType
}
+func MigrateRetryPost(ctx *context.Context) {
+ if err := task.RetryMigrateTask(ctx.Repo.Repository.ID); err != nil {
+ log.Error("Retry task failed: %v", err)
+ ctx.ServerError("task.RetryMigrateTask", err)
+ return
+ }
+ ctx.JSONOK()
+}
+
func MigrateCancelPost(ctx *context.Context) {
migratingTask, err := admin_model.GetMigratingTask(ctx.Repo.Repository.ID)
if err != nil {
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index d76e90bf2..0be8bede7 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -610,7 +610,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
if pull.IsSameRepo() {
ctx.Data["HeadTarget"] = pull.HeadBranch
} else if pull.HeadRepo == nil {
- ctx.Data["HeadTarget"] = "