From d9e3b1d7fc3f07260ca5417c63dfb243bbb71729 Mon Sep 17 00:00:00 2001 From: fnetx Date: Wed, 14 Dec 2022 19:23:56 +0100 Subject: [PATCH 1/4] [I18N] Rename upstream files (cherry picked from commit 2d67a9a62163957eef9dd26379a229b8af741655) (cherry picked from commit 4eac51f6a4200e01aa72fa0eaac5d72d57ed0c8e) (cherry picked from commit 34401a28f5d1180ac580c3410209b5291428a156) (cherry picked from commit 7210b45a61f52b3c6396c339dc525d5b58c32b54) (cherry picked from commit cc741116d2e1423d005869b244054b41b402dc3e) (cherry picked from commit 67a160ef0abca208610d1395a2218aab26c181a3) (cherry picked from commit adb258767259f3e8802485990a0625bc151f364b) (cherry picked from commit 1b57a3d6011d4b9790199cc1beb4d2220f45bb09) (cherry picked from commit 02fbbf05384190ca3f81e6bd920e3cbe2a9cd260) (cherry picked from commit 164af88c4b002cc8fcaaba0551608a25236a836d) (cherry picked from commit 5102d0aded75df2d171fbc9d5763f5918663fe7e) (cherry picked from commit f1e1e620f475d2935c2cb487574af93a5e9bb90e) (cherry picked from commit 2bd4ab7b4635fff63552c003782f05e63fb84f3d) (cherry picked from commit 28b511a33a2b778cf456bfaae02dc431d3c4d48e) (cherry picked from commit dc501ba1c160ed5c401c9e21fcfddd21ee00254d) (cherry picked from commit 252d336537286da57ec486cb43906c026c72943a) (cherry picked from commit 8208f11db036e2d80b28a03d523f766ed69bfa43) (cherry picked from commit c108b03fca4a3baeb2f372b1a74d0290c909ed82) (cherry picked from commit 27de4593fd08f50b53f222963a160d2a77d85538) (cherry picked from commit 45777f90d0cb016b93b7ec49d425aa5aa439b2bc) (cherry picked from commit 70207a140050316fbdb4b8a98d43299c5f7fc30e) (cherry picked from commit 855dfc96d79b486fa3385af1d16489b014147d5f) --- options/locale/{locale_cs-CZ.ini => gitea_cs-CZ.ini} | 0 options/locale/{locale_de-DE.ini => gitea_de-DE.ini} | 0 options/locale/{locale_el-GR.ini => gitea_el-GR.ini} | 0 options/locale/{locale_en-US.ini => gitea_en-US.ini} | 0 options/locale/{locale_es-ES.ini => gitea_es-ES.ini} | 0 options/locale/{locale_fa-IR.ini => gitea_fa-IR.ini} | 0 options/locale/{locale_fi-FI.ini => gitea_fi-FI.ini} | 0 options/locale/{locale_fr-FR.ini => gitea_fr-FR.ini} | 0 options/locale/{locale_hu-HU.ini => gitea_hu-HU.ini} | 0 options/locale/{locale_id-ID.ini => gitea_id-ID.ini} | 0 options/locale/{locale_is-IS.ini => gitea_is-IS.ini} | 0 options/locale/{locale_it-IT.ini => gitea_it-IT.ini} | 0 options/locale/{locale_ja-JP.ini => gitea_ja-JP.ini} | 0 options/locale/{locale_ko-KR.ini => gitea_ko-KR.ini} | 0 options/locale/{locale_lv-LV.ini => gitea_lv-LV.ini} | 0 options/locale/{locale_nl-NL.ini => gitea_nl-NL.ini} | 0 options/locale/{locale_pl-PL.ini => gitea_pl-PL.ini} | 0 options/locale/{locale_pt-BR.ini => gitea_pt-BR.ini} | 0 options/locale/{locale_pt-PT.ini => gitea_pt-PT.ini} | 0 options/locale/{locale_ru-RU.ini => gitea_ru-RU.ini} | 0 options/locale/{locale_si-LK.ini => gitea_si-LK.ini} | 0 options/locale/{locale_sk-SK.ini => gitea_sk-SK.ini} | 0 options/locale/{locale_sv-SE.ini => gitea_sv-SE.ini} | 0 options/locale/{locale_tr-TR.ini => gitea_tr-TR.ini} | 0 options/locale/{locale_uk-UA.ini => gitea_uk-UA.ini} | 0 options/locale/{locale_zh-CN.ini => gitea_zh-CN.ini} | 0 options/locale/{locale_zh-HK.ini => gitea_zh-HK.ini} | 0 options/locale/{locale_zh-TW.ini => gitea_zh-TW.ini} | 0 28 files changed, 0 insertions(+), 0 deletions(-) rename options/locale/{locale_cs-CZ.ini => gitea_cs-CZ.ini} (100%) rename options/locale/{locale_de-DE.ini => gitea_de-DE.ini} (100%) rename options/locale/{locale_el-GR.ini => gitea_el-GR.ini} (100%) rename options/locale/{locale_en-US.ini => gitea_en-US.ini} (100%) rename options/locale/{locale_es-ES.ini => gitea_es-ES.ini} (100%) rename options/locale/{locale_fa-IR.ini => gitea_fa-IR.ini} (100%) rename options/locale/{locale_fi-FI.ini => gitea_fi-FI.ini} (100%) rename options/locale/{locale_fr-FR.ini => gitea_fr-FR.ini} (100%) rename options/locale/{locale_hu-HU.ini => gitea_hu-HU.ini} (100%) rename options/locale/{locale_id-ID.ini => gitea_id-ID.ini} (100%) rename options/locale/{locale_is-IS.ini => gitea_is-IS.ini} (100%) rename options/locale/{locale_it-IT.ini => gitea_it-IT.ini} (100%) rename options/locale/{locale_ja-JP.ini => gitea_ja-JP.ini} (100%) rename options/locale/{locale_ko-KR.ini => gitea_ko-KR.ini} (100%) rename options/locale/{locale_lv-LV.ini => gitea_lv-LV.ini} (100%) rename options/locale/{locale_nl-NL.ini => gitea_nl-NL.ini} (100%) rename options/locale/{locale_pl-PL.ini => gitea_pl-PL.ini} (100%) rename options/locale/{locale_pt-BR.ini => gitea_pt-BR.ini} (100%) rename options/locale/{locale_pt-PT.ini => gitea_pt-PT.ini} (100%) rename options/locale/{locale_ru-RU.ini => gitea_ru-RU.ini} (100%) rename options/locale/{locale_si-LK.ini => gitea_si-LK.ini} (100%) rename options/locale/{locale_sk-SK.ini => gitea_sk-SK.ini} (100%) rename options/locale/{locale_sv-SE.ini => gitea_sv-SE.ini} (100%) rename options/locale/{locale_tr-TR.ini => gitea_tr-TR.ini} (100%) rename options/locale/{locale_uk-UA.ini => gitea_uk-UA.ini} (100%) rename options/locale/{locale_zh-CN.ini => gitea_zh-CN.ini} (100%) rename options/locale/{locale_zh-HK.ini => gitea_zh-HK.ini} (100%) rename options/locale/{locale_zh-TW.ini => gitea_zh-TW.ini} (100%) diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/gitea_cs-CZ.ini similarity index 100% rename from options/locale/locale_cs-CZ.ini rename to options/locale/gitea_cs-CZ.ini diff --git a/options/locale/locale_de-DE.ini b/options/locale/gitea_de-DE.ini similarity index 100% rename from options/locale/locale_de-DE.ini rename to options/locale/gitea_de-DE.ini diff --git a/options/locale/locale_el-GR.ini b/options/locale/gitea_el-GR.ini similarity index 100% rename from options/locale/locale_el-GR.ini rename to options/locale/gitea_el-GR.ini diff --git a/options/locale/locale_en-US.ini b/options/locale/gitea_en-US.ini similarity index 100% rename from options/locale/locale_en-US.ini rename to options/locale/gitea_en-US.ini diff --git a/options/locale/locale_es-ES.ini b/options/locale/gitea_es-ES.ini similarity index 100% rename from options/locale/locale_es-ES.ini rename to options/locale/gitea_es-ES.ini diff --git a/options/locale/locale_fa-IR.ini b/options/locale/gitea_fa-IR.ini similarity index 100% rename from options/locale/locale_fa-IR.ini rename to options/locale/gitea_fa-IR.ini diff --git a/options/locale/locale_fi-FI.ini b/options/locale/gitea_fi-FI.ini similarity index 100% rename from options/locale/locale_fi-FI.ini rename to options/locale/gitea_fi-FI.ini diff --git a/options/locale/locale_fr-FR.ini b/options/locale/gitea_fr-FR.ini similarity index 100% rename from options/locale/locale_fr-FR.ini rename to options/locale/gitea_fr-FR.ini diff --git a/options/locale/locale_hu-HU.ini b/options/locale/gitea_hu-HU.ini similarity index 100% rename from options/locale/locale_hu-HU.ini rename to options/locale/gitea_hu-HU.ini diff --git a/options/locale/locale_id-ID.ini b/options/locale/gitea_id-ID.ini similarity index 100% rename from options/locale/locale_id-ID.ini rename to options/locale/gitea_id-ID.ini diff --git a/options/locale/locale_is-IS.ini b/options/locale/gitea_is-IS.ini similarity index 100% rename from options/locale/locale_is-IS.ini rename to options/locale/gitea_is-IS.ini diff --git a/options/locale/locale_it-IT.ini b/options/locale/gitea_it-IT.ini similarity index 100% rename from options/locale/locale_it-IT.ini rename to options/locale/gitea_it-IT.ini diff --git a/options/locale/locale_ja-JP.ini b/options/locale/gitea_ja-JP.ini similarity index 100% rename from options/locale/locale_ja-JP.ini rename to options/locale/gitea_ja-JP.ini diff --git a/options/locale/locale_ko-KR.ini b/options/locale/gitea_ko-KR.ini similarity index 100% rename from options/locale/locale_ko-KR.ini rename to options/locale/gitea_ko-KR.ini diff --git a/options/locale/locale_lv-LV.ini b/options/locale/gitea_lv-LV.ini similarity index 100% rename from options/locale/locale_lv-LV.ini rename to options/locale/gitea_lv-LV.ini diff --git a/options/locale/locale_nl-NL.ini b/options/locale/gitea_nl-NL.ini similarity index 100% rename from options/locale/locale_nl-NL.ini rename to options/locale/gitea_nl-NL.ini diff --git a/options/locale/locale_pl-PL.ini b/options/locale/gitea_pl-PL.ini similarity index 100% rename from options/locale/locale_pl-PL.ini rename to options/locale/gitea_pl-PL.ini diff --git a/options/locale/locale_pt-BR.ini b/options/locale/gitea_pt-BR.ini similarity index 100% rename from options/locale/locale_pt-BR.ini rename to options/locale/gitea_pt-BR.ini diff --git a/options/locale/locale_pt-PT.ini b/options/locale/gitea_pt-PT.ini similarity index 100% rename from options/locale/locale_pt-PT.ini rename to options/locale/gitea_pt-PT.ini diff --git a/options/locale/locale_ru-RU.ini b/options/locale/gitea_ru-RU.ini similarity index 100% rename from options/locale/locale_ru-RU.ini rename to options/locale/gitea_ru-RU.ini diff --git a/options/locale/locale_si-LK.ini b/options/locale/gitea_si-LK.ini similarity index 100% rename from options/locale/locale_si-LK.ini rename to options/locale/gitea_si-LK.ini diff --git a/options/locale/locale_sk-SK.ini b/options/locale/gitea_sk-SK.ini similarity index 100% rename from options/locale/locale_sk-SK.ini rename to options/locale/gitea_sk-SK.ini diff --git a/options/locale/locale_sv-SE.ini b/options/locale/gitea_sv-SE.ini similarity index 100% rename from options/locale/locale_sv-SE.ini rename to options/locale/gitea_sv-SE.ini diff --git a/options/locale/locale_tr-TR.ini b/options/locale/gitea_tr-TR.ini similarity index 100% rename from options/locale/locale_tr-TR.ini rename to options/locale/gitea_tr-TR.ini diff --git a/options/locale/locale_uk-UA.ini b/options/locale/gitea_uk-UA.ini similarity index 100% rename from options/locale/locale_uk-UA.ini rename to options/locale/gitea_uk-UA.ini diff --git a/options/locale/locale_zh-CN.ini b/options/locale/gitea_zh-CN.ini similarity index 100% rename from options/locale/locale_zh-CN.ini rename to options/locale/gitea_zh-CN.ini diff --git a/options/locale/locale_zh-HK.ini b/options/locale/gitea_zh-HK.ini similarity index 100% rename from options/locale/locale_zh-HK.ini rename to options/locale/gitea_zh-HK.ini diff --git a/options/locale/locale_zh-TW.ini b/options/locale/gitea_zh-TW.ini similarity index 100% rename from options/locale/locale_zh-TW.ini rename to options/locale/gitea_zh-TW.ini From 7277b3095d429dc52018ff887aa27881daa4b7c2 Mon Sep 17 00:00:00 2001 From: fnetx Date: Wed, 14 Dec 2022 19:55:13 +0100 Subject: [PATCH 2/4] [I18N] Add Locale merger script (cherry picked from commit ecc3dae2acaf567cd6b2888cc5c582588c7bfc53) (cherry picked from commit c6c3fc6ace6b6aa4f4877c5a96da54899f2dc2fa) (cherry picked from commit 4833bd594a49b70896c023b41da8a87ba33add0e) [I18N] in the home page replace GitHub with Forgejo The english string that shows on the home page to encourage for contribution no longer reference GitHub. But some translations still do. In this context, and this context only, replace it with Forgejo even though it may not be correct in some cases. Refs: https://codeberg.org/forgejo/forgejo/pulls/450 (cherry picked from commit 71de77f5ae59617eadda9e4992f1867a7acb7f17) (cherry picked from commit 0b5195e4e4ee1c4829d7f4e127cc48d5c0eb3d72) (cherry picked from commit 1252e83f8c7b22e06bb37622900741caa209e9eb) (cherry picked from commit 2ceb1b2b5faa32ca71716ed4c98d18b0942909e7) (cherry picked from commit 59233055b1a8e9bc79c5501d6e2c2649a6d1b26b) (cherry picked from commit 378ed6a21e0a57c3bb5211eb8ade4db499cdd7d9) (cherry picked from commit 2d661119c3b8a8278458005273f6a32fa3216050) (cherry picked from commit 2a95ff4107786bbf6c5b141a42e2efbd1bb897f8) (cherry picked from commit 012b5444a80cf2aaa61b2b65efebfe0691725422) (cherry picked from commit 2aaee4f7c4132af6f9a6e0d9aafe0218603b8a5c) (cherry picked from commit 52b3f53cb7dfc86a1287baa40f5f5b6dce946a27) (cherry picked from commit 24e665abe748ff34163e7c870aa0b90ffca86c26) (cherry picked from commit 335f8b2bd1971ce3b39b57b2cfd6d8c9af85ab75) (cherry picked from commit da3890938b7a13a467520fccfa6187376eab3050) (cherry picked from commit 5d0cdd5fe228906d378152b2472f7399fa9e3c45) (cherry picked from commit 81d325dfd31f3e4d8a499934d9a4ea4c8c781310) (cherry picked from commit edd6cdc50eb686e92feff9fb50ac009624491d5e) (cherry picked from commit f92199a1d7e3c58ee8bf93e98d8d0b39004f4247) (cherry picked from commit f2beae60c341a180a9a86a985c1dcdc22f7cd9e2) (cherry picked from commit 708ebe98f3c68c4534ae41f75b0e529cc90d3f9b) --- build/merge-forgejo-locales.go | 97 ++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 build/merge-forgejo-locales.go diff --git a/build/merge-forgejo-locales.go b/build/merge-forgejo-locales.go new file mode 100644 index 0000000000..0e6b345f23 --- /dev/null +++ b/build/merge-forgejo-locales.go @@ -0,0 +1,97 @@ +// Copyright 2022 The Forgejo Authors c/o Codeberg e.V.. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +//go:build ignore + +package main + +import ( + "bufio" + "os" + "regexp" + "strings" + + "gopkg.in/ini.v1" +) + +const ( + trimPrefix = "gitea_" + sourceFolder = "options/locales/" +) + +// returns list of locales, still containing the file extension! +func generate_locale_list() []string { + localeFiles, _ := os.ReadDir(sourceFolder) + locales := []string{} + for _, localeFile := range localeFiles { + if !localeFile.IsDir() && strings.HasPrefix(localeFile.Name(), trimPrefix) { + locales = append(locales, strings.TrimPrefix(localeFile.Name(), trimPrefix)) + } + } + return locales +} + +// replace all occurrences of Gitea with Forgejo +func renameGiteaForgejo(filename string) []byte { + file, err := os.Open(filename) + if err != nil { + panic(err) + } + + replacer := strings.NewReplacer( + "Gitea", "Forgejo", + "https://docs.gitea.io/en-us/install-from-binary/", "https://forgejo.org/download/#installation-from-binary", + "https://github.com/go-gitea/gitea/tree/master/docker", "https://forgejo.org/download/#container-image", + "https://docs.gitea.io/en-us/install-from-package/", "https://forgejo.org/download", + "https://code.gitea.io/gitea", "https://forgejo.org/download", + "code.gitea.io/gitea", "Forgejo", + `GitHub`, `Codeberg`, + "https://github.com/go-gitea/gitea", "https://codeberg.org/forgejo/forgejo", + "https://blog.gitea.io", "https://forgejo.org/news", + ) + + out := make([]byte, 0, 1024) + scanner := bufio.NewScanner(file) + scanner.Split(bufio.ScanLines) + for scanner.Scan() { + line := scanner.Text() + + if strings.HasPrefix(line, "license_desc=") { + line = strings.Replace(line, "GitHub", "Forgejo", 1) + } + + if strings.HasPrefix(line, "[") && strings.HasSuffix(line, "]") { + out = append(out, []byte("\n"+line+"\n")...) + } else if strings.HasPrefix(line, "settings.web_hook_name_gitea") { + out = append(out, []byte("\n"+line+"\n")...) + out = append(out, []byte("settings.web_hook_name_forgejo = Forgejo\n")...) + } else if strings.HasPrefix(line, "migrate.gitea.description") { + re := regexp.MustCompile(`(.*Gitea)`) + out = append(out, []byte(re.ReplaceAllString(line, "${1}/Forgejo")+"\n")...) + } else { + out = append(out, []byte(replacer.Replace(line)+"\n")...) + } + } + file.Close() + return out +} + +func main() { + locales := generate_locale_list() + var err error + var localeFile *ini.File + for _, locale := range locales { + giteaLocale := sourceFolder + "gitea_" + locale + localeFile, err = ini.LoadSources(ini.LoadOptions{ + IgnoreInlineComment: true, + }, giteaLocale, renameGiteaForgejo(giteaLocale)) + if err != nil { + panic(err) + } + err = localeFile.SaveTo("options/locale/locale_" + locale) + if err != nil { + panic(err) + } + } +} From 7e4fe00b59aaa175a4f716e22499ad54eaf9cf5e Mon Sep 17 00:00:00 2001 From: fnetx Date: Wed, 14 Dec 2022 19:56:57 +0100 Subject: [PATCH 3/4] [I18N] Makefile + gitignore (cherry picked from commit 68c744111d02a0cd93716a8f75442ad85f44243b) (cherry picked from commit 30d7c4a8998baf957b8a156789cc6601d4e87628) (cherry picked from commit 220ac0a6d3579da5d9c1a028cdd59511f3e97a88) (cherry picked from commit 21cb16af9502c0c14aae30eee3a65d4c14be3cbe) (cherry picked from commit 41a9373e3e78f050bb07ea475fdbf3261cf694b2) (cherry picked from commit 69030f7803c175706946af5fb8956d19aa7d2bec) (cherry picked from commit 92c4d4d2e6bf7f100feb5c85a9ae78afea2adbd8) (cherry picked from commit c1bfd1730e79c6c1720df99f367ddc030282f7e3) (cherry picked from commit 18a9a9e73cdea5bd501b10a2fde0d39be74d7f25) (cherry picked from commit 07f988207303011b3f645dc515ff855c0317507f) (cherry picked from commit e71b8061d4297fe2336cbf404046c1fdd8332fc6) (cherry picked from commit 225b30f1f77cd5edd06ca4a271a64029b0391d7e) (cherry picked from commit fdf98910039a98009e3c38be00db1785fe4292e7) (cherry picked from commit df2f4134764a4811a4f012193b93b2d1b8a2749b) (cherry picked from commit b01c755aaf634dd0f4c436ad90eda47f6e901afd) (cherry picked from commit acd4275acbada93b49c0baabfc5bd9db2ebbca6c) [I18N] Add Locale merger script (squash: compile on windows) Fixes: https://codeberg.org/forgejo/forgejo/issues/798 (cherry picked from commit b47b205e85f115b2493bd4c3a25c199196228d7a) (cherry picked from commit 1521f0bfd6747d0ad0d9c5e70c4c0b1d948e178e) (cherry picked from commit 757bcefa610a2b102b32c32ee6749a9fb2479d8f) (cherry picked from commit b4902ce28bdd8a871f6123cb3ac68fef282a6285) (cherry picked from commit 5fd0fe1f14b57206b860cf0eb1bf05252285c627) (cherry picked from commit bcd099acfab008f514d30bd5657a6a7390339233) (cherry picked from commit c82d4963c299cdc3f3fd478e8946c1d7adae1ef2) --- .gitignore | 3 +++ Makefile | 14 ++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index fe8184f0dc..707371e52f 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,6 @@ prime/ # Manpage /man + +# Generated merged Forgejo+Gitea language files +/options/locale/locale_* diff --git a/Makefile b/Makefile index 901c798f73..40ba7ff77c 100644 --- a/Makefile +++ b/Makefile @@ -821,10 +821,14 @@ generate: generate-backend generate-backend: $(TAGS_PREREQ) generate-go .PHONY: generate-go -generate-go: $(TAGS_PREREQ) +generate-go: $(TAGS_PREREQ) merge-locales @echo "Running go generate..." @CC= GOOS= GOARCH= $(GO) generate -tags '$(TAGS)' $(GO_PACKAGES) +.PHONY: merge-locales +merge-locales: + @CC= GOOS= GOARCH= $(GO) run build/merge-forgejo-locales.go + .PHONY: security-check security-check: go run $(GOVULNCHECK_PACKAGE) ./... @@ -994,13 +998,7 @@ lockfile-check: .PHONY: update-translations update-translations: - mkdir -p ./translations - cd ./translations && curl -L https://crowdin.com/download/project/gitea.zip > gitea.zip && unzip gitea.zip - rm ./translations/gitea.zip - $(SED_INPLACE) -e 's/="/=/g' -e 's/"$$//g' ./translations/*.ini - $(SED_INPLACE) -e 's/\\"/"/g' ./translations/*.ini - mv ./translations/*.ini ./options/locale/ - rmdir ./translations + # noop to detect merge conflicts (potentially needs updating the scripts) and avoid breaking with Gitea .PHONY: generate-license generate-license: From 4ad492cb0c751508a4bc0cc0a55d36cd56c107de Mon Sep 17 00:00:00 2001 From: fnetx Date: Thu, 15 Dec 2022 15:56:35 +0100 Subject: [PATCH 4/4] [I18N] Move source locales to other folder (cherry picked from commit d38ad85a05cb3547ad1c3f90531811aa9c78ca9d) (cherry picked from commit b94f9b8c1bdc62d7437c42c4aa333c7ed30a9b9b) (cherry picked from commit c728ce8b32b0ff52e14083d2118f6b1f233307ce) (cherry picked from commit 2911286336f93bbf6a6dec63cf62cb1514475eff) (cherry picked from commit bd4dc797c7cc599d2aca05b7d1ee2a6532dd0358) (cherry picked from commit 35889addf9ee26e084ff2f525e5fb078b5d261bd) (cherry picked from commit 9eaf321db44b70613e9f10e32f8e8628bd720610) (cherry picked from commit 7b64ef0c9b4dc1add73d91e126388cb835a3f472) (cherry picked from commit 6cd86bf244a29b888eb0218061aa95ee75ced790) (cherry picked from commit 275dd36f580c9553bc78dd1b7afb672c51e35e9f) (cherry picked from commit d5ace5a0ae27ad7c30ee5fff0f821cab4144979c) (cherry picked from commit c067466f8c28229228ae185267e228d552bb38e3) (cherry picked from commit 0d51a2228fe85c5ab097475987c4faf411df4658) (cherry picked from commit 4973e19dd3b043ce6de2a33d36dadbf4155a0075) (cherry picked from commit f553b4d54385439e3496a7890182b2a70d84a42d) (cherry picked from commit 18312a6f74f664021df7e3beb373ef1e368198ac) (cherry picked from commit d09dc97f8bdee6279ac9e47d4d45d241f9522251) (cherry picked from commit 40fc74f88779366ee3c3656137d8049b918cc35c) (cherry picked from commit 8fb25bb8026b168283314da712c1b915e1d84614) (cherry picked from commit 1a63b2db812d37c540e8ea0516d2be691a9ad127) (cherry picked from commit 90f9c8f518cce74846715e219cea142a44cbe080) (cherry picked from commit b962476df95dd5d527a05069c2b28b9901a08719) --- options/{locale => locales}/gitea_cs-CZ.ini | 0 options/{locale => locales}/gitea_de-DE.ini | 0 options/{locale => locales}/gitea_el-GR.ini | 0 options/{locale => locales}/gitea_en-US.ini | 0 options/{locale => locales}/gitea_es-ES.ini | 0 options/{locale => locales}/gitea_fa-IR.ini | 0 options/{locale => locales}/gitea_fi-FI.ini | 0 options/{locale => locales}/gitea_fr-FR.ini | 0 options/{locale => locales}/gitea_hu-HU.ini | 0 options/{locale => locales}/gitea_id-ID.ini | 0 options/{locale => locales}/gitea_is-IS.ini | 0 options/{locale => locales}/gitea_it-IT.ini | 0 options/{locale => locales}/gitea_ja-JP.ini | 0 options/{locale => locales}/gitea_ko-KR.ini | 0 options/{locale => locales}/gitea_lv-LV.ini | 0 options/{locale => locales}/gitea_nl-NL.ini | 0 options/{locale => locales}/gitea_pl-PL.ini | 0 options/{locale => locales}/gitea_pt-BR.ini | 0 options/{locale => locales}/gitea_pt-PT.ini | 0 options/{locale => locales}/gitea_ru-RU.ini | 0 options/{locale => locales}/gitea_si-LK.ini | 0 options/{locale => locales}/gitea_sk-SK.ini | 0 options/{locale => locales}/gitea_sv-SE.ini | 0 options/{locale => locales}/gitea_tr-TR.ini | 0 options/{locale => locales}/gitea_uk-UA.ini | 0 options/{locale => locales}/gitea_zh-CN.ini | 0 options/{locale => locales}/gitea_zh-HK.ini | 0 options/{locale => locales}/gitea_zh-TW.ini | 0 28 files changed, 0 insertions(+), 0 deletions(-) rename options/{locale => locales}/gitea_cs-CZ.ini (100%) rename options/{locale => locales}/gitea_de-DE.ini (100%) rename options/{locale => locales}/gitea_el-GR.ini (100%) rename options/{locale => locales}/gitea_en-US.ini (100%) rename options/{locale => locales}/gitea_es-ES.ini (100%) rename options/{locale => locales}/gitea_fa-IR.ini (100%) rename options/{locale => locales}/gitea_fi-FI.ini (100%) rename options/{locale => locales}/gitea_fr-FR.ini (100%) rename options/{locale => locales}/gitea_hu-HU.ini (100%) rename options/{locale => locales}/gitea_id-ID.ini (100%) rename options/{locale => locales}/gitea_is-IS.ini (100%) rename options/{locale => locales}/gitea_it-IT.ini (100%) rename options/{locale => locales}/gitea_ja-JP.ini (100%) rename options/{locale => locales}/gitea_ko-KR.ini (100%) rename options/{locale => locales}/gitea_lv-LV.ini (100%) rename options/{locale => locales}/gitea_nl-NL.ini (100%) rename options/{locale => locales}/gitea_pl-PL.ini (100%) rename options/{locale => locales}/gitea_pt-BR.ini (100%) rename options/{locale => locales}/gitea_pt-PT.ini (100%) rename options/{locale => locales}/gitea_ru-RU.ini (100%) rename options/{locale => locales}/gitea_si-LK.ini (100%) rename options/{locale => locales}/gitea_sk-SK.ini (100%) rename options/{locale => locales}/gitea_sv-SE.ini (100%) rename options/{locale => locales}/gitea_tr-TR.ini (100%) rename options/{locale => locales}/gitea_uk-UA.ini (100%) rename options/{locale => locales}/gitea_zh-CN.ini (100%) rename options/{locale => locales}/gitea_zh-HK.ini (100%) rename options/{locale => locales}/gitea_zh-TW.ini (100%) diff --git a/options/locale/gitea_cs-CZ.ini b/options/locales/gitea_cs-CZ.ini similarity index 100% rename from options/locale/gitea_cs-CZ.ini rename to options/locales/gitea_cs-CZ.ini diff --git a/options/locale/gitea_de-DE.ini b/options/locales/gitea_de-DE.ini similarity index 100% rename from options/locale/gitea_de-DE.ini rename to options/locales/gitea_de-DE.ini diff --git a/options/locale/gitea_el-GR.ini b/options/locales/gitea_el-GR.ini similarity index 100% rename from options/locale/gitea_el-GR.ini rename to options/locales/gitea_el-GR.ini diff --git a/options/locale/gitea_en-US.ini b/options/locales/gitea_en-US.ini similarity index 100% rename from options/locale/gitea_en-US.ini rename to options/locales/gitea_en-US.ini diff --git a/options/locale/gitea_es-ES.ini b/options/locales/gitea_es-ES.ini similarity index 100% rename from options/locale/gitea_es-ES.ini rename to options/locales/gitea_es-ES.ini diff --git a/options/locale/gitea_fa-IR.ini b/options/locales/gitea_fa-IR.ini similarity index 100% rename from options/locale/gitea_fa-IR.ini rename to options/locales/gitea_fa-IR.ini diff --git a/options/locale/gitea_fi-FI.ini b/options/locales/gitea_fi-FI.ini similarity index 100% rename from options/locale/gitea_fi-FI.ini rename to options/locales/gitea_fi-FI.ini diff --git a/options/locale/gitea_fr-FR.ini b/options/locales/gitea_fr-FR.ini similarity index 100% rename from options/locale/gitea_fr-FR.ini rename to options/locales/gitea_fr-FR.ini diff --git a/options/locale/gitea_hu-HU.ini b/options/locales/gitea_hu-HU.ini similarity index 100% rename from options/locale/gitea_hu-HU.ini rename to options/locales/gitea_hu-HU.ini diff --git a/options/locale/gitea_id-ID.ini b/options/locales/gitea_id-ID.ini similarity index 100% rename from options/locale/gitea_id-ID.ini rename to options/locales/gitea_id-ID.ini diff --git a/options/locale/gitea_is-IS.ini b/options/locales/gitea_is-IS.ini similarity index 100% rename from options/locale/gitea_is-IS.ini rename to options/locales/gitea_is-IS.ini diff --git a/options/locale/gitea_it-IT.ini b/options/locales/gitea_it-IT.ini similarity index 100% rename from options/locale/gitea_it-IT.ini rename to options/locales/gitea_it-IT.ini diff --git a/options/locale/gitea_ja-JP.ini b/options/locales/gitea_ja-JP.ini similarity index 100% rename from options/locale/gitea_ja-JP.ini rename to options/locales/gitea_ja-JP.ini diff --git a/options/locale/gitea_ko-KR.ini b/options/locales/gitea_ko-KR.ini similarity index 100% rename from options/locale/gitea_ko-KR.ini rename to options/locales/gitea_ko-KR.ini diff --git a/options/locale/gitea_lv-LV.ini b/options/locales/gitea_lv-LV.ini similarity index 100% rename from options/locale/gitea_lv-LV.ini rename to options/locales/gitea_lv-LV.ini diff --git a/options/locale/gitea_nl-NL.ini b/options/locales/gitea_nl-NL.ini similarity index 100% rename from options/locale/gitea_nl-NL.ini rename to options/locales/gitea_nl-NL.ini diff --git a/options/locale/gitea_pl-PL.ini b/options/locales/gitea_pl-PL.ini similarity index 100% rename from options/locale/gitea_pl-PL.ini rename to options/locales/gitea_pl-PL.ini diff --git a/options/locale/gitea_pt-BR.ini b/options/locales/gitea_pt-BR.ini similarity index 100% rename from options/locale/gitea_pt-BR.ini rename to options/locales/gitea_pt-BR.ini diff --git a/options/locale/gitea_pt-PT.ini b/options/locales/gitea_pt-PT.ini similarity index 100% rename from options/locale/gitea_pt-PT.ini rename to options/locales/gitea_pt-PT.ini diff --git a/options/locale/gitea_ru-RU.ini b/options/locales/gitea_ru-RU.ini similarity index 100% rename from options/locale/gitea_ru-RU.ini rename to options/locales/gitea_ru-RU.ini diff --git a/options/locale/gitea_si-LK.ini b/options/locales/gitea_si-LK.ini similarity index 100% rename from options/locale/gitea_si-LK.ini rename to options/locales/gitea_si-LK.ini diff --git a/options/locale/gitea_sk-SK.ini b/options/locales/gitea_sk-SK.ini similarity index 100% rename from options/locale/gitea_sk-SK.ini rename to options/locales/gitea_sk-SK.ini diff --git a/options/locale/gitea_sv-SE.ini b/options/locales/gitea_sv-SE.ini similarity index 100% rename from options/locale/gitea_sv-SE.ini rename to options/locales/gitea_sv-SE.ini diff --git a/options/locale/gitea_tr-TR.ini b/options/locales/gitea_tr-TR.ini similarity index 100% rename from options/locale/gitea_tr-TR.ini rename to options/locales/gitea_tr-TR.ini diff --git a/options/locale/gitea_uk-UA.ini b/options/locales/gitea_uk-UA.ini similarity index 100% rename from options/locale/gitea_uk-UA.ini rename to options/locales/gitea_uk-UA.ini diff --git a/options/locale/gitea_zh-CN.ini b/options/locales/gitea_zh-CN.ini similarity index 100% rename from options/locale/gitea_zh-CN.ini rename to options/locales/gitea_zh-CN.ini diff --git a/options/locale/gitea_zh-HK.ini b/options/locales/gitea_zh-HK.ini similarity index 100% rename from options/locale/gitea_zh-HK.ini rename to options/locales/gitea_zh-HK.ini diff --git a/options/locale/gitea_zh-TW.ini b/options/locales/gitea_zh-TW.ini similarity index 100% rename from options/locale/gitea_zh-TW.ini rename to options/locales/gitea_zh-TW.ini