diff --git a/models/repo.go b/models/repo.go index d1cc290c44..52325f2623 100644 --- a/models/repo.go +++ b/models/repo.go @@ -781,7 +781,7 @@ var ( // DescriptionHTML does special handles to description and return HTML string. func (repo *Repository) DescriptionHTML() template.HTML { sanitize := func(s string) string { - return fmt.Sprintf(`%[1]s`, s) + return fmt.Sprintf(`%[1]s`, s) } return template.HTML(descPattern.ReplaceAllStringFunc(markup.Sanitize(repo.Description), sanitize)) } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index be0489680a..b2005b27fb 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -75,7 +75,7 @@ cancel = Cancel [install] install = Installation title = Initial Configuration -docker_helper = If you run Gitea inside Docker, please read the documentation before changing any settings. +docker_helper = If you run Gitea inside Docker, please read the documentation before changing any settings. requite_db_desc = Gitea requires MySQL, PostgreSQL, MSSQL, SQLite3 or TiDB. db_title = Database Settings db_type = Database Type @@ -495,7 +495,7 @@ visibility = Visibility visiblity_helper = Make Repository Private visiblity_helper_forced = Your site administrator forces new repositories to be private. visiblity_fork_helper = (Changing this will affect all forks.) -clone_helper = Need help cloning? Visit Help. +clone_helper = Need help cloning? Visit Help. fork_repo = Fork Repository fork_from = Fork From fork_visiblity_helper = The visibility of a forked repository cannot be changed. @@ -613,7 +613,7 @@ editor.directory_is_a_file = Directory name '%s' is already used as a filename i editor.file_is_a_symlink = '%s' is a symbolic link. Symbolic links cannot be edited in the web editor editor.filename_is_a_directory = Filename '%s' is already used as a directory name in this repository. editor.file_editing_no_longer_exists = The file being edited, '%s', no longer exists in this repository. -editor.file_changed_while_editing = The file contents have changed since you started editing. Click here to see them or Commit Changes again to overwrite them. +editor.file_changed_while_editing = The file contents have changed since you started editing. Click here to see them or Commit Changes again to overwrite them. editor.file_already_exists = A file named '%s' already exists in this repository. editor.no_changes_to_show = There are no changes to show. editor.fail_to_update_file = Failed to update/create file '%s' with error: %v @@ -994,7 +994,7 @@ settings.search_user_placeholder = Search user… settings.org_not_allowed_to_be_collaborator = Organizations cannot be added as a collaborator. settings.user_is_org_member = The user is an organization member who cannot be added as a collaborator. settings.add_webhook = Add Webhook -settings.hooks_desc = Webhooks automatically make HTTP POST requests to a server when certain Gitea events trigger. Read more in the webhooks guide. +settings.hooks_desc = Webhooks automatically make HTTP POST requests to a server when certain Gitea events trigger. Read more in the webhooks guide. settings.webhook_deletion = Remove Webhook settings.webhook_deletion_desc = Removing a webhook deletes its settings and delivery history. Continue? settings.webhook_deletion_success = The webhook has been removed. @@ -1011,7 +1011,7 @@ settings.githook_edit_desc = If the hook is inactive, sample content will be pre settings.githook_name = Hook Name settings.githook_content = Hook Content settings.update_githook = Update Hook -settings.add_webhook_desc = Gitea will send POST requests with a specified content type to the target URL. Read more in the webhooks guide. +settings.add_webhook_desc = Gitea will send POST requests with a specified content type to the target URL. Read more in the webhooks guide. settings.payload_url = Target URL settings.content_type = POST Content Type settings.secret = Secret diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 3ad5358d41..ed4e75ffc9 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -17,7 +17,7 @@
{{if .ShowFooterBranding}} - GitHub + GitHub {{end}}
@@ -30,7 +30,7 @@
JavaScript licenses {{if .EnableSwaggerEndpoint}}API{{end}} - {{.i18n.Tr "website"}} + {{.i18n.Tr "website"}} {{if (or .ShowFooterVersion .PageIsAdmin)}}{{GoVer}}{{end}}
diff --git a/templates/home.tmpl b/templates/home.tmpl index d115d8298c..4e03c0c1ae 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -20,7 +20,7 @@ Einfach zu installieren

- Starte einfach die Anwendung für deine Plattform. Gitea gibt es auch für Docker, Vagrant oder als Installationspaket. + Starte einfach die Anwendung für deine Plattform. Gitea gibt es auch für Docker, Vagrant oder als Installationspaket.

@@ -28,7 +28,7 @@ Plattformübergreifend

- Gitea läuft überall. Go kompiliert für: Windows, macOS, Linux, ARM, etc. Wähle dasjenige System, was dir am meisten gefällt! + Gitea läuft überall. Go kompiliert für: Windows, macOS, Linux, ARM, etc. Wähle dasjenige System, was dir am meisten gefällt!

@@ -46,7 +46,7 @@ Quelloffen

- Der komplette Code befindet sich auf GitHub! Unterstütze uns bei der Verbesserung dieses Projekts. Trau dich! + Der komplette Code befindet sich auf GitHub! Unterstütze uns bei der Verbesserung dieses Projekts. Trau dich!

@@ -57,7 +57,7 @@ 易安裝

- 直接用 執行檔安裝，還可以透過 Docker 或 Vagrant，以及 套件安装。 + 直接用 執行檔安裝，還可以透過 Docker 或 Vagrant，以及 套件安装。

@@ -65,7 +65,7 @@ 跨平台

- Gitea 可以運作在任何 Go 語言能夠編譯的平台: Windows, macOS, Linux, ARM 等等。挑一個您喜歡的就好。 + Gitea 可以運作在任何 Go 語言能夠編譯的平台: Windows, macOS, Linux, ARM 等等。挑一個您喜歡的就好。

@@ -83,7 +83,7 @@ 開源化

- 所有程式碼都在 GitHub 上，加入我們讓 Gitea 更好，別害羞，你可以做到的。 + 所有程式碼都在 GitHub 上，加入我們讓 Gitea 更好，別害羞，你可以做到的。

@@ -94,7 +94,7 @@ 易安装

- 您除了可以根据操作系统平台通过 二进制运行，还可以通过 Docker 或 Vagrant，以及 包管理 安装。 + 您除了可以根据操作系统平台通过 二进制运行，还可以通过 Docker 或 Vagrant，以及 包管理 安装。

@@ -102,7 +102,7 @@ 跨平台

- 任何 Go 语言 支持的平台都可以运行 Gitea，包括 Windows、Mac、Linux 以及 ARM。挑一个您喜欢的就行！ + 任何 Go 语言 支持的平台都可以运行 Gitea，包括 Windows、Mac、Linux 以及 ARM。挑一个您喜欢的就行！

@@ -120,7 +120,7 @@ 开源化

- 所有的代码都开源在 GitHub 上，赶快加入我们来共同发展这个伟大的项目！还等什么？成为贡献者吧！ + 所有的代码都开源在 GitHub 上，赶快加入我们来共同发展这个伟大的项目！还等什么？成为贡献者吧！

@@ -131,10 +131,10 @@ Facile à installer

- Il suffit de lancer l'exécutable correspondant à votre système. - Ou d'utiliser Gitea avec Docker ou - Vagrant - ou en l'installant depuis un package. + Il suffit de lancer l'exécutable correspondant à votre système. + Ou d'utiliser Gitea avec Docker ou + Vagrant + ou en l'installant depuis un package.

@@ -142,7 +142,7 @@ Multi-plateforme

- Gitea tourne partout où Go peut être compilé : Windows, macOS, Linux, ARM, etc. Choisissez votre préféré ! + Gitea tourne partout où Go peut être compilé : Windows, macOS, Linux, ARM, etc. Choisissez votre préféré !

@@ -160,7 +160,7 @@ Open Source

- Toutes les sources sont sur GitHub ! Rejoignez-nous et contribuez à rendre ce projet encore meilleur. + Toutes les sources sont sur GitHub ! Rejoignez-nous et contribuez à rendre ce projet encore meilleur.

@@ -171,7 +171,7 @@ Fácil de instalar

- Simplemente arranca el binario para tu plataforma. O usa Gitea con Docker o Vagrant, o utilice el paquete. + Simplemente arranca el binario para tu plataforma. O usa Gitea con Docker o Vagrant, o utilice el paquete.

@@ -179,7 +179,7 @@ Multiplatforma

- Gitea funciona en cualquier parte, Go puede compilarse en: Windows, macOS, Linux, ARM, etc. !Elige tu favorita! + Gitea funciona en cualquier parte, Go puede compilarse en: Windows, macOS, Linux, ARM, etc. !Elige tu favorita!

@@ -197,7 +197,7 @@ Open Source

- ¡Está todo en GitHub! Uniros contribuyendo a hacer este proyecto todavía mejor. ¡No seas tímido y colabora! + ¡Está todo en GitHub! Uniros contribuyendo a hacer este proyecto todavía mejor. ¡No seas tímido y colabora!

@@ -208,7 +208,7 @@ Fácil de instalar

- Simplesmente rode o executável para o seu sistema operacional. Ou obtenha o Gitea com o Docker ou Vagrant, ou baixe o pacote. + Simplesmente rode o executável para o seu sistema operacional. Ou obtenha o Gitea com o Docker ou Vagrant, ou baixe o pacote.

@@ -216,7 +216,7 @@ Multi-plataforma

- Gitea roda em qualquer sistema operacional em que Go consegue compilar: Windows, macOS, Linux, ARM, etc. Escolha qual você gosta mais! + Gitea roda em qualquer sistema operacional em que Go consegue compilar: Windows, macOS, Linux, ARM, etc. Escolha qual você gosta mais!

@@ -234,7 +234,7 @@ Código aberto

- Está tudo no GitHub! Contribua e torne este projeto ainda melhor. Não tenha vergonha de contribuir! + Está tudo no GitHub! Contribua e torne este projeto ainda melhor. Não tenha vergonha de contribuir!

@@ -245,7 +245,7 @@ Простой в установке

- Просто запустите исполняемый файл для вашей платформы. Изпользуйте Gitea с Docker или Vagrant, или загрузите пакет. + Просто запустите исполняемый файл для вашей платформы. Изпользуйте Gitea с Docker или Vagrant, или загрузите пакет.

@@ -253,7 +253,7 @@ Кроссплатформенный

- Gitea работает на любой операционной системе, которая может компилировать Go: Windows, macOS, Linux, ARM и т. д. Выбирайте, что вам больше нравится! + Gitea работает на любой операционной системе, которая может компилировать Go: Windows, macOS, Linux, ARM и т. д. Выбирайте, что вам больше нравится!

@@ -271,7 +271,7 @@ Открытый исходный код

- Всё это на GitHub! Присоединяйтесь к нам, внося вклад, чтобы сделать этот проект еще лучше. Не бойтесь помогать! + Всё это на GitHub! Присоединяйтесь к нам, внося вклад, чтобы сделать этот проект еще лучше. Не бойтесь помогать!

@@ -282,7 +282,7 @@ Makkelijk te installeren

- Je hoeft alleen maar de binary uit te voeren. Of gebruik Gitea met Docker, Vagrant, of download een installatiepakket. + Je hoeft alleen maar de binary uit te voeren. Of gebruik Gitea met Docker, Vagrant, of download een installatiepakket.

@@ -290,7 +290,7 @@ Cross-platform

- Gitea werkt op alles waar Go op kan compileren: Windows, macOS, Linux, ARM, etc. Kies het platform dat bij je past! + Gitea werkt op alles waar Go op kan compileren: Windows, macOS, Linux, ARM, etc. Kies het platform dat bij je past!

@@ -308,7 +308,7 @@ Open Source

- Alles staat op GitHub! Help ons door mee te bouwen aan Gitea, samen maken we dit project nog beter. Aarzel dus niet om een bijdrage te leveren! + Alles staat op GitHub! Help ons door mee te bouwen aan Gitea, samen maken we dit project nog beter. Aarzel dus niet om een bijdrage te leveren!

@@ -319,7 +319,7 @@ Easy to install

- Simply run the binary for your platform. Or ship Gitea with Docker or Vagrant, or get it packaged. + Simply run the binary for your platform. Or ship Gitea with Docker or Vagrant, or get it packaged.

@@ -327,7 +327,7 @@ Cross-platform

- Gitea runs anywhere Go can compile for: Windows, macOS, Linux, ARM, etc. Choose the one you love! + Gitea runs anywhere Go can compile for: Windows, macOS, Linux, ARM, etc. Choose the one you love!

@@ -345,7 +345,7 @@ Open Source

- It's all on GitHub! Join us by contributing to make this project even better. Don't be shy to be a contributor! + It's all on GitHub! Join us by contributing to make this project even better. Don't be shy to be a contributor!

diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl index ac552ca647..0f6afc196b 100644 --- a/templates/mail/auth/activate.tmpl +++ b/templates/mail/auth/activate.tmpl @@ -10,6 +10,6 @@

Please click the following link to activate your account within {{.ActiveCodeLives}}:

{{AppUrl}}user/activate?code={{.Code}}

Not working? Try copying and pasting it to your browser.

-

© {{AppName}}

+

© {{AppName}}

diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl index 5111de06c5..7c47aaa7b8 100644 --- a/templates/mail/auth/activate_email.tmpl +++ b/templates/mail/auth/activate_email.tmpl @@ -10,6 +10,6 @@

Please click the following link to verify your email address within {{.ActiveCodeLives}}:

{{AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}

Not working? Try copying and pasting it to your browser.

-

© {{AppName}}

+

© {{AppName}}

diff --git a/templates/mail/auth/register_notify.tmpl b/templates/mail/auth/register_notify.tmpl index a896f0e59d..4c2a9c43ad 100644 --- a/templates/mail/auth/register_notify.tmpl +++ b/templates/mail/auth/register_notify.tmpl @@ -10,6 +10,6 @@

You can now login via username: {{.Username}}.

{{AppUrl}}user/login

If this account has been created for you, please reset your password first.

-

© {{AppName}}

+

© {{AppName}}

diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl index ea233d8f5d..0a09c47e85 100644 --- a/templates/mail/auth/reset_passwd.tmpl +++ b/templates/mail/auth/reset_passwd.tmpl @@ -10,6 +10,6 @@

Please click the following link to reset your password within {{.ResetPwdCodeLives}}:

{{AppUrl}}user/reset_password?code={{.Code}}

Not working? Try copying and pasting it to your browser.

-

© {{AppName}}

+

© {{AppName}}

diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 0b5ae0facb..13b557bd7a 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -12,7 +12,7 @@ {{if .Org.Description}}

{{.Org.Description}}

{{end}}
{{if .Org.Location}}
{{.Org.Location}}
{{end}} - {{if .Org.Website}}
{{.Org.Website}}
{{end}} + {{if .Org.Website}}
{{.Org.Website}}
{{end}}
diff --git a/templates/repo/commit_status.tmpl b/templates/repo/commit_status.tmpl index d5f75c132a..f5bbbb02d6 100644 --- a/templates/repo/commit_status.tmpl +++ b/templates/repo/commit_status.tmpl @@ -1,15 +1,15 @@ {{if eq .State "pending"}} - + {{end}} {{if eq .State "success"}} - + {{end}} {{if eq .State "error"}} - + {{end}} {{if eq .State "failure"}} - + {{end}} {{if eq .State "warning"}} - -{{end}} \ No newline at end of file + +{{end}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 6f54cb9f61..a496b9b912 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -8,7 +8,7 @@ {{.Owner.Name}}
/
{{.Name}} - {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{$.Mirror.Address}}
{{end}} + {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{$.Mirror.Address}}
{{end}} {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RelLink 1 -1}}
{{end}} @@ -60,7 +60,7 @@ {{end}} {{if .Repository.UnitEnabled $.UnitTypeExternalTracker}} - + {{.i18n.Tr "repo.issues"}} {{end}} @@ -78,7 +78,7 @@ {{end}} {{if or (.Repository.UnitEnabled $.UnitTypeWiki) (.Repository.UnitEnabled $.UnitTypeExternalWiki)}} - + {{.i18n.Tr "repo.wiki"}} {{end}} diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index 3e360cb726..38d9145206 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -63,7 +63,7 @@