diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-28 11:33:34 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-28 11:33:34 +0100 |
| commit | a2e7997592dd86baa7595c41eed274be4c200d07 (patch) | |
| tree | b4c21af8bdf541d8156beb29e9f53766bd1fbadd /config/locales/simple_form.gd.yml | |
| parent | 6517b7b9f02f8590a8f9c5aa04e3ef9efeb4e757 (diff) | |
| parent | cec1e902e006730f68bde0a4334e5b819a12a475 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.
Diffstat (limited to 'config/locales/simple_form.gd.yml')
| -rw-r--r-- | config/locales/simple_form.gd.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml index 28dc0625e..090fbc552 100644 --- a/config/locales/simple_form.gd.yml +++ b/config/locales/simple_form.gd.yml @@ -250,7 +250,7 @@ gd: theme: An t-ùrlar bunaiteach thumbnail: Dealbhag an fhrithealaiche timeline_preview: Ceadaich inntrigeadh gun ùghdarrachadh air na loidhnichean-ama phoblach - trendable_by_default: Ceadaich treandaichean gu lèirmheas ro làimh + trendable_by_default: Ceadaich treandaichean gun lèirmheas ro làimh trends: Cuir na treandaichean an comas interactions: must_be_follower: Bac na brathan nach eil o luchd-leantainn |