From 20efc6b56c4b56352496e33b3dcde5a4ae2f8a66 Mon Sep 17 00:00:00 2001 From: delvh Date: Wed, 25 Aug 2021 15:47:05 +0200 Subject: [PATCH] Unify migration descriptions (#16781) * Unify migration descriptions * Clarify that pure Git migration differs from other migrations Co-authored-by: Norwin * Use Pull Requests for Gitea migration Co-authored-by: Norwin Co-authored-by: zeripath --- options/locale/locale_en-US.ini | 12 ++++++------ templates/repo/migrate/gitea.tmpl | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index e5561b6d72..0a030b9b05 100644 --- 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 %s ... migrate.migrating_failed = Migrating from %s 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 52528fc57c..901524d112 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -54,7 +54,7 @@
- +