Merge branch 'main' into remove-iouitl

lunny · web-flow · commit 128f00aa33ba · 2022-01-10T09:19:12.000+08:00
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
@@ -313,7 +313,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 - `PORT_TO_REDIRECT`: **80**: Port for the http redirection service to listen on. Used when `REDIRECT_OTHER_PORT` is true.
 - `SSL_MIN_VERSION`: **TLSv1.2**: Set the minimum version of ssl support.
 - `SSL_MAX_VERSION`: **\<empty\>**: Set the maximum version of ssl support.
-- `SSL_CURVE_PREFERENCES`: **X25519,P256**: Set the prefered curves,
+- `SSL_CURVE_PREFERENCES`: **X25519,P256**: Set the preferred curves,
 - `SSL_CIPHER_SUITES`: **ecdhe_ecdsa_with_aes_256_gcm_sha384,ecdhe_rsa_with_aes_256_gcm_sha384,ecdhe_ecdsa_with_aes_128_gcm_sha256,ecdhe_rsa_with_aes_128_gcm_sha256,ecdhe_ecdsa_with_chacha20_poly1305,ecdhe_rsa_with_chacha20_poly1305**: Set the preferred cipher suites.
   - If there is not hardware support for AES suites by default the cha cha suites will be preferred over the AES suites
   - supported suites as of go 1.17 are:
diff --git a/docs/content/doc/developers/guidelines-backend.md b/docs/content/doc/developers/guidelines-backend.md
@@ -43,8 +43,8 @@ To maintain understandable code and avoid circular dependencies it is important
   - `modules/git`: Package to interactive with `Git` command line or Gogit package.
 - `public`: Compiled frontend files (javascript, images, css, etc.)
 - `routers`: Handling of server requests. As it uses other Gitea packages to serve the request, other packages (models, modules or services) shall not depend on routers.
-  - `routers/api` Conatins routers for `/api/v1` aims to handle RESTful API requests. 
-  - `routers/install` Could only reponse when system is INSTALL mode. 
+  - `routers/api` Contains routers for `/api/v1` aims to handle RESTful API requests. 
+  - `routers/install` Could only respond when system is in INSTALL mode (INSTALL_LOCK=false). 
   - `routers/private` will only be invoked by internal sub commands, especially `serv` and `hooks`. 
   - `routers/web` will handle HTTP requests from web browsers or Git SMART HTTP protocols.
 - `services`: Support functions for common routing operations or command executions. Uses `models` and `modules` to handle the requests.
@@ -103,7 +103,7 @@ i.e. `servcies/user`, `models/repository`.
 
 ### Import Alias
 
-Since there are many package levels and sub packages, so you will find `modules/user`, `models/user`, `services/user`. When these packages are import into one Go file, it's difficult to know which package we are using and if it's a variable name or an import name. So we recommand to always use import alias. To differ from package variables which are commonly use camelCase, just use **snake_case** as import package alias.
+Since there are some packages which use the same package name, it is possible that you find packages like `modules/user`, `models/user`, and `services/user`. When these packages are imported in one Go file, it's difficult to know which package we are using and if it's a variable name or an import name. So, we always recommend to use import aliases. To differ from package variables which are commonly in camelCase, just use **snake_case** for import aliases.
 i.e. `import user_service "code.gitea.io/gitea/services/user"`
 
 ### Future Tasks
diff --git a/docs/content/doc/installation/with-docker.en-us.md b/docs/content/doc/installation/with-docker.en-us.md
@@ -337,7 +337,7 @@ In the next step a file named `/app/gitea/gitea` (with executable permissions) n
 ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"
 ```
 
-Here you should also make sure that you've set the permisson of `/app/gitea/gitea` correctly:
+Here you should also make sure that you've set the permission of `/app/gitea/gitea` correctly:
 
 ```bash
 sudo chmod +x /app/gitea/gitea
diff --git a/docs/content/doc/upgrade/from-gogs.en-us.md b/docs/content/doc/upgrade/from-gogs.en-us.md
@@ -81,7 +81,7 @@ Upgrade to [`gitea 1.6.4`](https://dl.gitea.io/gitea/1.6.4/) first. Download the
 the destination platform from the [downloads page](https://dl.gitea.io/gitea/1.6.4/) and replace the binary.
 Run Gitea at least once and check that everything works as expected.
 
-Then repeat the procedure, but this time using the [lastest release](https://dl.gitea.io/gitea/{{< version >}}/).
+Then repeat the procedure, but this time using the [latest release](https://dl.gitea.io/gitea/{{< version >}}/).
 
 ## Upgrading from a more recent version of Gogs
 
diff --git a/docs/content/doc/usage/command-line.en-us.md b/docs/content/doc/usage/command-line.en-us.md
@@ -130,7 +130,7 @@ Admin operations:
         - `--custom-email-url`: Use a custom Email URL (option for GitHub).
         - `--icon-url`: Custom icon URL for OAuth2 login source.
         - `--override-local-2fa`: Allow source to override local 2FA. (Optional)
-        - `--scopes`: Addtional scopes to request for this OAuth2 source. (Optional)
+        - `--scopes`: Additional scopes to request for this OAuth2 source. (Optional)
         - `--required-claim-name`: Claim name that has to be set to allow users to login with this source. (Optional)
         - `--required-claim-value`: Claim value that has to be set to allow users to login with this source. (Optional)
         - `--group-claim-name`: Claim name providing group names for this source. (Optional)
@@ -153,7 +153,7 @@ Admin operations:
         - `--custom-email-url`: Use a custom Email URL (option for GitHub).
         - `--icon-url`: Custom icon URL for OAuth2 login source.
         - `--override-local-2fa`: Allow source to override local 2FA. (Optional)
-        - `--scopes`: Addtional scopes to request for this OAuth2 source.
+        - `--scopes`: Additional scopes to request for this OAuth2 source.
         - `--required-claim-name`: Claim name that has to be set to allow users to login with this source. (Optional)
         - `--required-claim-value`: Claim value that has to be set to allow users to login with this source. (Optional)
         - `--group-claim-name`: Claim name providing group names for this source. (Optional)
diff --git a/docs/content/doc/usage/reverse-proxies.en-us.md b/docs/content/doc/usage/reverse-proxies.en-us.md
@@ -312,7 +312,7 @@ backend gitea
     server localhost:3000 check
 ```
 
-If you redirect the http content to https, the configuration work the same way, just remember that the connexion between HAProxy and Gitea will be done via http so you do not have to enable https in Gitea's configuration.
+If you redirect the http content to https, the configuration work the same way, just remember that the connection between HAProxy and Gitea will be done via http so you do not have to enable https in Gitea's configuration.
 
 ## HAProxy with a sub-path
 
diff --git a/options/locale/locale_bg-BG.ini b/options/locale/locale_bg-BG.ini
@@ -572,6 +572,7 @@ file_history=История
 file_view_raw=Виж директен файл
 file_permalink=Постоянна връзка
 file_too_large=Този файл е твърде голям за да се визуализира.
+
 video_not_supported_in_browser=Вашият браузър не поддържа HTML5 видео тагове.
 audio_not_supported_in_browser=Вашият браузър не поддържа HTML5 аудио тагове.
 symbolic_link=Символен линк
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
@@ -915,6 +915,7 @@ file_view_rendered=Zobrazit vykreslené
 file_view_raw=Zobrazit v surovém stavu
 file_permalink=Trvalý odkaz
 file_too_large=Soubor je příliš velký pro zobrazení.
+
 video_not_supported_in_browser=Váš prohlížeč nepodporuje značku pro HTML5 video.
 audio_not_supported_in_browser=Váš prohlížeč nepodporuje značku pro HTML5 audio.
 stored_lfs=Uloženo pomocí Git LFS
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
@@ -969,6 +969,7 @@ file_view_rendered=Ansicht rendern
 file_view_raw=Originalformat anzeigen
 file_permalink=Permalink
 file_too_large=Die Datei ist zu groß zum Anzeigen.
+
 file_copy_permalink=Permalink kopieren
 video_not_supported_in_browser=Dein Browser unterstützt das HTML5 'video'-Tag nicht.
 audio_not_supported_in_browser=Dein Browser unterstützt den HTML5 'audio'-Tag nicht.
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
@@ -1005,6 +1005,7 @@ file_view_rendered=Προβολή Απόδοσης
 file_view_raw=Προβολή Ακατέργαστου
 file_permalink=Permalink
 file_too_large=Το αρχείο είναι πολύ μεγάλο για να εμφανιστεί.
+
 file_copy_permalink=Αντιγραφή Permalink
 video_not_supported_in_browser=Το πρόγραμμα περιήγησής σας δεν υποστηρίζει την ετικέτα HTML5 'video'.
 audio_not_supported_in_browser=Το πρόγραμμα περιήγησής σας δεν υποστηρίζει την ετικέτα HTML5 'audio'.
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
@@ -996,6 +996,7 @@ file_view_rendered=Ver procesado
 file_view_raw=Ver original
 file_permalink=Enlace permanente
 file_too_large=El archivo es demasiado grande para ser mostrado.
+
 file_copy_permalink=Copiar Permalink
 video_not_supported_in_browser=Su navegador no soporta el tag video de HTML5.
 audio_not_supported_in_browser=Su navegador no soporta el tag audio de HTML5.
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
@@ -765,6 +765,7 @@ file_history=تاریخچه
 file_view_raw=مشاهده خام
 file_permalink=پیوند همیشگی
 file_too_large=حجم این پرونده بیشتر از آن است که قابل نمایش باشد.
+
 video_not_supported_in_browser=مرورگر شما از تگ video که در HTML5 تعریف شده است، پشتیبانی نمی کند.
 audio_not_supported_in_browser=مرورگر شما از تگ audio که در HTML5 تعریف شده است، پشتیبانی نمی کند.
 stored_lfs=ذخیره شده با GIT LFS
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
@@ -572,6 +572,7 @@ file_raw=Raaka
 file_history=Historia
 file_view_raw=Näytä raaka
 file_permalink=Pysyvä linkki
+
 video_not_supported_in_browser=Selaimesi ei tue HTML5 video-tagia.
 audio_not_supported_in_browser=Selaimesi ei tue HTML5 audio-tagia.
 normal_view=Normaali näkymä
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
@@ -897,6 +897,7 @@ file_view_rendered=Voir le rendu
 file_view_raw=Voir le Raw
 file_permalink=Lien permanent
 file_too_large=Le fichier est trop gros pour être affiché.
+
 video_not_supported_in_browser=Votre navigateur ne supporte pas le tag HTML5 "video".
 audio_not_supported_in_browser=Votre navigateur ne supporte pas la balise « audio » HTML5.
 stored_lfs=Stocké avec Git LFS
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
@@ -718,6 +718,7 @@ file_history=Előzmények
 file_view_raw=Nyers fájl megtekintése
 file_permalink=Állandó hivatkozás
 file_too_large=Ez a fájl túl nagy ahhoz, hogy megjelenítsük.
+
 video_not_supported_in_browser=A böngésző nem támogatja a HTML5 video tag-et.
 audio_not_supported_in_browser=A böngésző nem támogatja a HTML5 audio tag-et.
 stored_lfs=Git LFS-el eltárolva
diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini
@@ -693,6 +693,7 @@ file_history=Riwayat
 file_view_raw=Lihat Mentah
 file_permalink=Permalink
 file_too_large=Berkas terlalu besar untuk ditampilkan.
+
 stored_lfs=Tersimpan dengan GIT LFS
 commit_graph=Grafik Komit
 blame=Salahkan
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
@@ -829,6 +829,7 @@ file_view_source=Visualizza sorgente
 file_view_raw=Vedi originale
 file_permalink=Permalink
 file_too_large=Il file è troppo grande per essere visualizzato.
+
 video_not_supported_in_browser=Il tuo browser non supporta i tag "video" di HTML5.
 audio_not_supported_in_browser=Il tuo browser non supporta il tag "video" di HTML5.
 stored_lfs=Memorizzati con Git LFS
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
@@ -1005,6 +1005,7 @@ file_view_rendered=レンダリング表示
 file_view_raw=Rawデータを見る
 file_permalink=パーマリンク
 file_too_large=このファイルは大きすぎるため、表示できません。
+
 file_copy_permalink=パーマリンクをコピー
 video_not_supported_in_browser=このブラウザはHTML5のvideoタグをサポートしていません。
 audio_not_supported_in_browser=このブラウザーはHTML5のaudioタグをサポートしていません。
diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini
@@ -648,6 +648,7 @@ file_history=히스토리
 file_view_raw=원본 보기
 file_permalink=고유링크
 file_too_large=보여주기에는 파일이 너무 큽니다.
+
 video_not_supported_in_browser=당신의 브라우저가 HTML5 'video' 태그를 지원하지 않습니다.
 audio_not_supported_in_browser=당신의 브라우저가 HTML5 'audio' 태그를 지원하지 않습니다.
 stored_lfs=Git LFS에 저장되어 있습니다
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
@@ -943,6 +943,7 @@ file_view_rendered=Skatīt rezultātu
 file_view_raw=Rādīt neapstrādātu
 file_permalink=Patstāvīgā saite
 file_too_large=Šis fails ir par lielu, lai to parādītu.
+
 video_not_supported_in_browser=Jūsu pārlūks neatbalsta HTML5 video.
 audio_not_supported_in_browser=Jūsu pārlūks neatbalsta HTML5 audio.
 stored_lfs=Saglabāts Git LFS
diff --git a/options/locale/locale_ml-IN.ini b/options/locale/locale_ml-IN.ini
@@ -670,6 +670,7 @@ file_history=നാള്‍വഴി
 file_view_raw=കലര്‍പ്പില്ലാതെ കാണുക
 file_permalink=സ്ഥിരമായ കണ്ണി
 file_too_large=ഈ ഫയൽ കാണിക്കാൻ കഴിയാത്തത്ര വലുതാണ്.
+
 video_not_supported_in_browser=നിങ്ങളുടെ ബ്രൌസർ HTML5 'വീഡിയോ' ടാഗിനെ പിന്തുണയ്ക്കുന്നില്ല.
 audio_not_supported_in_browser=നിങ്ങളുടെ ബ്ര browser സർ HTML5 'ഓഡിയോ' ടാഗിനെ പിന്തുണയ്ക്കുന്നില്ല.
 stored_lfs=ഗിറ്റു് LFS ഉപയോഗിച്ച് സംഭരിച്ചു
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
@@ -847,6 +847,7 @@ file_history=Geschiedenis
 file_view_raw=Weergave ruw bestand
 file_permalink=Permalink
 file_too_large=Dit bestand is te groot om te tonen.
+
 video_not_supported_in_browser=Je browser ondersteunt de HTML5 'video'-tag niet.
 audio_not_supported_in_browser=Je browser ondersteunt de HTML5 'audio'-tag niet.
 stored_lfs=Opgeslagen met Git LFS
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
@@ -763,6 +763,7 @@ file_history=Historia
 file_view_raw=Zobacz czysty
 file_permalink=Bezpośredni odnośnik
 file_too_large=Ten plik jest zbyt duży, aby go wyświetlić.
+
 video_not_supported_in_browser=Twoja przeglądarka nie obsługuje znacznika HTML5 "video".
 audio_not_supported_in_browser=Twoja przeglądarka nie obsługuje znacznika HTML5 "audio".
 stored_lfs=Przechowane za pomocą Git LFS
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
@@ -918,6 +918,7 @@ file_view_rendered=Ver Renderizado
 file_view_raw=Ver original
 file_permalink=Link permanente
 file_too_large=O arquivo é muito grande para ser mostrado.
+
 video_not_supported_in_browser=Seu navegador não suporta a tag 'video' do HTML5.
 audio_not_supported_in_browser=Seu navegador não suporta a tag 'audio' do HTML5.
 stored_lfs=Armazenado com Git LFS
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -317,6 +317,9 @@ oauth_signup_submit=Completar conta
 oauth_signin_tab=Vincular a uma conta existente
 oauth_signin_title=Inicie a sessão para autorizar a vinculação à conta
 oauth_signin_submit=Vincular conta
+oauth.signin.error=Ocorreu um erro durante o processamento do pedido de autorização. Se este erro persistir, contacte o administrador.
+oauth.signin.error.access_denied=O pedido de autorização foi negado.
+oauth.signin.error.temporarily_unavailable=A autorização falhou porque o servidor de autenticação está temporariamente indisponível. Tente mais tarde.
 openid_connect_submit=Estabelecer ligação
 openid_connect_title=Estabelecer ligação a uma conta existente
 openid_connect_desc=O URI do OpenID escolhido é desconhecido. Associe-o a uma nova conta aqui.
@@ -1005,6 +1008,16 @@ file_view_rendered=Ver resultado processado
 file_view_raw=Ver em bruto
 file_permalink=Ligação permanente
 file_too_large=O ficheiro é demasiado grande para ser apresentado.
+bidi_bad_header=`Este ficheiro contém caracteres Unicode Bidireccionais inesperados!`
+bidi_bad_description=`Este ficheiro contém caracteres Unicode Bidireccionais inesperados que podem ser processados de forma diferente do que aparece abaixo. Se o uso é intencional e legítimo, pode ignorar este aviso com segurança. Use o botão Revelar para mostrar os caracteres escondidos.`
+bidi_bad_description_escaped=`Este ficheiro contém caracteres Unicode Bidireccionais inesperados. Os caracteres escondidos unicode estão revelados abaixo. Use o botão Esconder para mostrar como é que eles são apresentados.`
+unicode_header=`Este ficheiro contém caracteres Unicode escondidos!`
+unicode_description=`Este ficheiro contém caracteres Unicode escondidos que podem ser processados de forma diferente do que aparece abaixo. Se o uso é intencional e legítimo, pode ignorar este aviso com segurança. Use o botão Revelar para mostrar os caracteres escondidos.`
+unicode_description_escaped=`Este ficheiro contém caracteres Unicode escondidos. Os caracteres unicode escondidos estão revelados abaixo. Use o botão Esconder para mostrar como é que eles são apresentados.`
+line_unicode=`Esta linha tem caracteres unicode escondidos`
+
+escape_control_characters=Revelar
+unescape_control_characters=Esconder
 file_copy_permalink=Copiar ligação permanente
 video_not_supported_in_browser=O seu navegador não suporta a etiqueta 'video' do HTML5.
 audio_not_supported_in_browser=O seu navegador não suporta a etiqueta 'audio' do HTML5.
@@ -2101,6 +2114,7 @@ diff.protected=Protegido
 diff.image.side_by_side=Lado a Lado
 diff.image.swipe=Deslizar
 diff.image.overlay=Sobrepor
+diff.has_escaped=Esta linha tem caracteres unicode escondidos
 
 releases.desc=Acompanhe as versões e as descargas do repositório.
 release.releases=Lançamentos
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
@@ -970,6 +970,7 @@ file_view_rendered=Просмотр отрендеренного
 file_view_raw=Посмотреть исходник
 file_permalink=Постоянная ссылка
 file_too_large=Этот файл слишком большой, поэтому он не может быть отображён.
+
 file_copy_permalink=Копировать постоянную ссылку
 video_not_supported_in_browser=Ваш браузер не поддерживает HTML5 'video' тэг.
 audio_not_supported_in_browser=Ваш браузер не поддерживает HTML5 'audio' тэг.
diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini
@@ -346,6 +346,7 @@ release=නිකුතුව
 releases=නිකුතු
 file_history=ඉතිහාසය
 file_view_source=මූලාශ්‍රය දකින්න
+
 commit_graph.color=වර්ණය
 download_file=ගොනුව බාගන්න
 
diff --git a/options/locale/locale_sr-SP.ini b/options/locale/locale_sr-SP.ini
@@ -258,6 +258,7 @@ file_history=Историја
 file_view_raw=Прегледај саму датотеку
 file_permalink=Пермалинк
 
+
 editor.preview_changes=Преглед промена
 editor.or=или
 editor.commit_changes=Изврши комит промена
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
@@ -790,6 +790,7 @@ file_history=Historik
 file_view_raw=Visa i råformat
 file_permalink=Permalänk
 file_too_large=Filen är för stor för att visas.
+
 video_not_supported_in_browser=Din webbläsare stödjer ej HTML5-taggen 'video'.
 audio_not_supported_in_browser=Din webbläsare stöder inte taggen 'audio' i HTML5.
 stored_lfs=Sparad med Git LFS
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
@@ -956,6 +956,7 @@ file_view_rendered=Oluşturulanları Görüntüle
 file_view_raw=Ham Görünüm
 file_permalink=Kalıcı Bağlantı
 file_too_large=Bu dosya görüntülemek için çok büyük.
+
 video_not_supported_in_browser=Tarayıcınız HTML5 'video' etiketini desteklemiyor.
 audio_not_supported_in_browser=Tarayıcınız HTML5 'audio' etiketini desteklemiyor.
 stored_lfs=Git LFS ile depolandı
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
@@ -925,6 +925,7 @@ file_view_rendered=Переглянути відрендерено
 file_view_raw=Перегляд Raw
 file_permalink=Постійне посилання
 file_too_large=Цей файл завеликий щоб бути показаним.
+
 video_not_supported_in_browser=Ваш браузер не підтримує тег 'video' HTML5.
 audio_not_supported_in_browser=Ваш браузер не підтримує тег HTML5 'audio'.
 stored_lfs=Збережено з Git LFS
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
