about summary refs log tree commit diff
path: root/config/locales/ga.yml
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-02-25 14:00:40 +0100
committerClaire <claire.github-309c@sitedethib.com>2023-02-25 14:00:40 +0100
commit4ed09276d5267181061dff438a0b10770db9f226 (patch)
treecb8f358d58669626332ea01bcf0186d08b5eac90 /config/locales/ga.yml
parent45087c1092143e95dfcc85b6c9abc5c6c0a0a5c2 (diff)
parent730bb3e211a84a2f30e3e2bbeae3f77149824a68 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
Diffstat (limited to 'config/locales/ga.yml')
-rw-r--r--config/locales/ga.yml4
1 files changed, 0 insertions, 4 deletions
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 073f2bad0..4aa2ae98b 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -433,10 +433,6 @@ ga:
     next: An céad eile
     older: Níos sine
     prev: Ceann roimhe seo
-  preferences:
-    other: Eile
-    posting_defaults: Posting defaults
-    public_timelines: Public timelines
   relationships:
     follow_selected_followers: Lean leantóirí roghnaithe
     followers: Leantóirí