Skip to content

Commit 509e35e

Browse files
zeripathzeripath
committed
Merge remote-tracking branch 'origin/main' into simplify-split-view-generation
2 parents 68db4f3 + 88abb0d commit 509e35e

40 files changed

+471
-263
lines changed

‎integrations/admin_user_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
)
1616

1717
func TestAdminViewUsers(t *testing.T) {
18-
prepareTestEnv(t)
18+
defer prepareTestEnv(t)()
1919

2020
session := loginUser(t, "user1")
2121
req := NewRequest(t, "GET", "/admin/users")
@@ -27,7 +27,7 @@ func TestAdminViewUsers(t *testing.T) {
2727
}
2828

2929
func TestAdminViewUser(t *testing.T) {
30-
prepareTestEnv(t)
30+
defer prepareTestEnv(t)()
3131

3232
session := loginUser(t, "user1")
3333
req := NewRequest(t, "GET", "/admin/users/1")
@@ -39,7 +39,7 @@ func TestAdminViewUser(t *testing.T) {
3939
}
4040

4141
func TestAdminEditUser(t *testing.T) {
42-
prepareTestEnv(t)
42+
defer prepareTestEnv(t)()
4343

4444
testSuccessfullEdit(t, models.User{ID: 2, Name: "newusername", LoginName: "otherlogin", Email: "[email protected]"})
4545
}

‎options/locale/locale_cs-CZ.ini

Lines changed: 186 additions & 123 deletions
Large diffs are not rendered by default.

‎options/locale/locale_de-DE.ini

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -896,11 +896,6 @@ migrate.migrate=Migrieren von %s
896896
migrate.migrating=Migriere von <b>%s</b> ...
897897
migrate.migrating_failed=Migrieren von <b>%s</b> fehlgeschlagen.
898898
migrate.migrating_failed.error=Fehler: %s
899-
migrate.github.description=Migriere Daten von Github.com oder Github Enterprise.
900-
migrate.git.description=Migriere oder spiegele git-Daten von Git-Services
901-
migrate.gitlab.description=Migriere Daten von GitLab.com oder einem selbst gehostetem gitlab Server.
902-
migrate.gitea.description=Migriere Daten von Gitea.com oder einem selbst gehostetem Gitea Server.
903-
migrate.gogs.description=Migriere Daten von notabug.org oder einem anderen, selbst gehosteten Gogs Server.
904899
migrate.migrating_git=Git Daten werden migriert
905900
migrate.migrating_topics=Themen werden migriert
906901
migrate.migrating_milestones=Meilensteine werden migriert

‎options/locale/locale_en-US.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2176,12 +2176,15 @@ members.member_role = Member Role:
21762176
members.owner = Owner
21772177
members.member = Member
21782178
members.remove = Remove
2179+
members.remove.detail = Remove %[1]s from %[2]s?
21792180
members.leave = Leave
2181+
members.leave.detail = Leave %s?
21802182
members.invite_desc = Add a new member to %s:
21812183
members.invite_now = Invite Now
21822184
21832185
teams.join = Join
21842186
teams.leave = Leave
2187+
teams.leave.detail = Leave %s?
21852188
teams.can_create_org_repo = Create repositories
21862189
teams.can_create_org_repo_helper = Members can create new repositories in organization. Creator will get administrator access to the new repository.
21872190
teams.read_access = Read Access

‎options/locale/locale_es-ES.ini

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -899,11 +899,6 @@ migrate.migrate=Migrar desde %s
899899
migrate.migrating=Migrando desde <b>%s</b>...
900900
migrate.migrating_failed=La migración desde <b>%s</b> ha fallado.
901901
migrate.migrating_failed.error=Error: %s
902-
migrate.github.description=Migrar datos de Github.com o Github Enterprise.
903-
migrate.git.description=Migrar o replicar de datos de git desde los servicios de Git
904-
migrate.gitlab.description=Migrar datos de GitLab.com o servidor gitlab autoalojado.
905-
migrate.gitea.description=Migrando datos de Gitea.com o servidor Gitea autoalojado.
906-
migrate.gogs.description=Migrando datos de notabug.org u otro servidor de Gogs autoalojado.
907902
migrate.migrating_git=Migrando datos de Git
908903
migrate.migrating_topics=Migrando Temas
909904
migrate.migrating_milestones=Migrando Hitos

‎options/locale/locale_fr-FR.ini

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -847,11 +847,6 @@ migrate.migrate=Migrer depuis %s
847847
migrate.migrating=Migration de <b>%s</b> ...
848848
migrate.migrating_failed=La migration de <b>%s</b> a échoué.
849849
migrate.migrating_failed.error=Erreur: %s
850-
migrate.github.description=Migration de données depuis Github.com ou Github Enterprise.
851-
migrate.git.description=Migration ou Miroir des données git depuis des services Git
852-
migrate.gitlab.description=Migration des données depuis GitLab.com ou d'un serveur gitlab hébergé.
853-
migrate.gitea.description=Migration des données depuis Gitea.com ou un serveur Gitea hébergé soi-même.
854-
migrate.gogs.description=Migration de données depuis notabug.org ou un autre serveur Gogs auto-hébergé.
855850
migrate.migrating_git=Migration des données Git
856851
migrate.migrating_topics=Migration des sujets
857852
migrate.migrating_milestones=Migration des jalons

‎options/locale/locale_it-IT.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -786,9 +786,6 @@ migrated_from_fake=Migrato da %[1]s
786786
migrate.migrate=Migra da %s
787787
migrate.migrating=Migrazione da <b>%s</b>...
788788
migrate.migrating_failed=Migrazione da <b>%s</b> fallita.
789-
migrate.github.description=Migrazione dati da Github.com o Github Enterprise.
790-
migrate.git.description=Migrazione o Mirroring dei dati git dai servizi Git
791-
migrate.gitlab.description=Migrazione dei dati dal server gitlab di GitLab.com o Self-Hosted.
792789

793790
mirror_from=mirror da
794791
forked_from=forkato da

‎options/locale/locale_ja-JP.ini

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -899,11 +899,6 @@ migrate.migrate=%s からの移行
899899
migrate.migrating=<b>%s</b> から移行しています ...
900900
migrate.migrating_failed=<b>%s</b> からの移行が失敗しました。
901901
migrate.migrating_failed.error=エラー: %s
902-
migrate.github.description=Github.com または Github Enterprise からデータを移行します。
903-
migrate.git.description=Gitサービスからgitデータを移行またはミラーを作成します
904-
migrate.gitlab.description=GitLab.com またはセルフホストのgitlabサーバーからデータを移行します。
905-
migrate.gitea.description=Gitea.comまたはセルフホストのGiteaサーバーからデータを移行します。
906-
migrate.gogs.description=notabug.org や、他のセルフホストのGogsサーバーからデータを移行します。
907902
migrate.migrating_git=Gitデータ移行中
908903
migrate.migrating_topics=トピック移行中
909904
migrate.migrating_milestones=マイルストーン移行中

‎options/locale/locale_lv-LV.ini

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -896,11 +896,6 @@ migrate.migrate=Migrēt no %s
896896
migrate.migrating=Migrācija no <b>%s</b> ...
897897
migrate.migrating_failed=Migrācija no <b>%s</b> neizdevās.
898898
migrate.migrating_failed.error=Kļūda: %s
899-
migrate.github.description=Migrēt datus no Github.com vai Github Enterprise servera.
900-
migrate.git.description=Migrēt vai spoguļot git datus no Git servisiem
901-
migrate.gitlab.description=Migrēt datus no Gitlab.com vai cita Gitlab servera.
902-
migrate.gitea.description=Migrēt datus no Gitea.com vai cita Gitea servera.
903-
migrate.gogs.description=Migrēt datus no notabug.org vai cita Gogs servera.
904899
migrate.migrating_git=Migrē git datus
905900
migrate.migrating_topics=Migrē tēmas
906901
migrate.migrating_milestones=Migrē atskaites punktus

‎options/locale/locale_nl-NL.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -780,9 +780,6 @@ migrated_from_fake=Gemigreerd van %[1]s
780780
migrate.migrate=Migreer van %s
781781
migrate.migrating=Migreren van <b>%s</b>...
782782
migrate.migrating_failed=Migreren van <b>%s</b> is mislukt.
783-
migrate.github.description=Gegevens migreren van Github.com of Github Enterprise.
784-
migrate.git.description=Migreren of Mirroring git gegevens van Git services
785-
migrate.gitlab.description=Gegevens migreren van GitLab.com of Self-Hosted gitlab server.
786783
787784
mirror_from=kopie van
788785
forked_from=geforked van

0 commit comments

Comments
 (0)