realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

Unify migration descriptions (#16781)

Browse source 
* Unify migration descriptions

* Clarify that pure Git migration differs from other migrations

Co-authored-by: Norwin <noerw@users.noreply.github.com>

* Use Pull Requests for Gitea migration

Co-authored-by: Norwin <noerw@users.noreply.github.com>
Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
delvh 2021-08-25 15:47:05 +02:00 committed by GitHub
parent b88dbe1208
commit 20efc6b56c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
options/locale/locale_en-US.ini
View file

@ -900,12 +900,12 @@ migrate.migrate = Migrate From %s
migrate.migrating = Migrating from <b>%s</b> ... migrate.migrating = Migrating from <b>%s</b> ...
migrate.migrating_failed = Migrating from <b>%s</b> failed. migrate.migrating_failed = Migrating from <b>%s</b> failed.
migrate.migrating_failed.error = Error: %s migrate.migrating_failed.error = Error: %s
migrate.github.description = Migrating data from Github.com or Github Enterprise. migrate.github.description = Migrate data from github.com or other Github instances.
migrate.git.description = Migrating or Mirroring git data from Git services migrate.git.description = Migrate a repository only from any Git service.
migrate.gitlab.description = Migrating data from GitLab.com or Self-Hosted gitlab server. migrate.gitlab.description = Migrate data from gitlab.com or other GitLab instances.
migrate.gitea.description = Migrating data from Gitea.com or Self-Hosted Gitea server. migrate.gitea.description = Migrate data from gitea.com or other Gitea instances.
migrate.gogs.description = Migrating data from notabug.org or other Self-Hosted Gogs server. migrate.gogs.description = Migrate data from notabug.org or other Gogs instances.
migrate.onedev.description = Migrating data from code.onedev.io or Self-Hosted OneDev server. migrate.onedev.description = Migrate data from code.onedev.io or other OneDev instances.
migrate.migrating_git = Migrating Git Data migrate.migrating_git = Migrating Git Data
migrate.migrating_topics = Migrating Topics migrate.migrating_topics = Migrating Topics
migrate.migrating_milestones = Migrating Milestones migrate.migrating_milestones = Migrating Milestones

2
templates/repo/migrate/gitea.tmpl
View file

@ -54,7 +54,7 @@
<label></label> <label></label>
<div class="ui checkbox"> <div class="ui checkbox">
<input name="pull_requests" type="checkbox" {{if .pull_requests}} checked{{end}}> <input name="pull_requests" type="checkbox" {{if .pull_requests}} checked{{end}}>
<label>{{.i18n.Tr "repo.migrate_items_merge_requests" | Safe}}</label> <label>{{.i18n.Tr "repo.migrate_items_pullrequests" | Safe}}</label>
</div> </div>
<div class="ui checkbox"> <div class="ui checkbox">
<input name="releases" type="checkbox" {{if .releases}} checked{{end}}> <input name="releases" type="checkbox" {{if .releases}} checked{{end}}>