Unify migration descriptions (#16781)

* 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>

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

diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl
index 52528fc57c27f5988a55bc85c0c8ac88dfcfe1ea..901524d112272c6584b8d45f5d8d9ffe37d6e8b6 100644 (file)
--- a/templates/repo/migrate/gitea.tmpl
+++ b/templates/repo/migrate/gitea.tmpl
@@ -54,7 +54,7 @@
                                                        <label></label>
                                                        <div class="ui checkbox">
                                                                <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 class="ui checkbox">
                                                                <input name="releases" type="checkbox" {{if .releases}} checked{{end}}>