diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-05-21 01:58:07 -0500 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-05-21 03:17:31 -0500 |
| commit | d6f37c6ae01c57164a69c6b7e4934d844a0c2a3a (patch) | |
| tree | d6fc393472fc7b3e056cb1a5a7c13c3bd1de77f6 /config/locales | |
| parent | cbdadfb5fa8088edb4b0ec879faf58b0d8272664 (diff) | |
handle importing posts from json dumps
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 0931713e5..a371a5c7c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -714,7 +714,6 @@ en: domain_blocking: Domain blocking list following: Following list muting: Muting list - profile: Profile information (JSON) statuses: Roars (JSON) upload: Upload in_memoriam_html: In Memoriam. diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 126a8e52f..289523f3d 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -48,7 +48,7 @@ en: featured_tag: name: 'You might want to use one of these:' imports: - data: CSV file exported from another Monsterpit server + data: CSV or JSON file exported from another server invite_request: text: This will help us review your join request sessions: |