diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-22 10:06:11 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-04-22 10:06:11 +0200 |
| commit | abfdafef1ededdb87f018414edd6b25fa9a70525 (patch) | |
| tree | 7a9855d79d125333a6b1307215b73dd507475320 /config/locales/simple_form.gd.yml | |
| parent | f30c5e7f15f967019245d2c78f3c2e89800eb838 (diff) | |
| parent | 4db8230194258a9a1c3d17d7261608515f3f2067 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.
Diffstat (limited to 'config/locales/simple_form.gd.yml')
| -rw-r--r-- | config/locales/simple_form.gd.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml index c86fc5a0c..a34865ff7 100644 --- a/config/locales/simple_form.gd.yml +++ b/config/locales/simple_form.gd.yml @@ -59,7 +59,6 @@ gd: setting_show_application: Chithear cò an aplacaid a chleachd thu airson post a sgrìobhadh ann an seallaidhean mionaideach nam postaichean agad setting_use_blurhash: Tha caiseadan stèidhichte air dathan nan nithean lèirsinneach a chaidh fhalach ach chan fhaicear am mion-fhiosrachadh setting_use_pending_items: Falaich ùrachaidhean na loidhne-ama air cùlaibh briogaidh seach a bhith a’ sgroladh nam postaichean gu fèin-obrachail - username: Bidh ainm-cleachdaiche àraidh agad air %{domain} whole_word: Mur eil ach litrichean is àireamhan san fhacal-luirg, cha dèid a chur an sàs ach ma bhios e a’ maidseadh an fhacail shlàin domain_allow: domain: "’S urrainn dhan àrainn seo dàta fhaighinn on fhrithealaiche seo agus thèid an dàta a thig a-steach uaithe a phròiseasadh ’s a stòradh" |