diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-04 17:54:48 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-04 17:54:48 +0000 |
| commit | 8c8eb99d73aacd38781da2e6b151c9b76c1639a2 (patch) | |
| tree | 7533728f9f115f877806694960dcaeb48d28dbd7 /src/i18n | |
| parent | 3cd1deb133926281920f10c1ddd6eb694c09f44d (diff) | |
| parent | 54e7e0e31babbfb0c4ebc2e1a73012e1b1890231 (diff) | |
Merge branch 'feat/follows-following-pagination' into 'develop'
Follows + followers pagination #285
See merge request pleroma/pleroma-fe!510
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 10 | ||||
| -rw-r--r-- | src/i18n/fi.json | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index 29ac2b9a..f80d8ba2 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -17,7 +17,9 @@ }, "general": { "apply": "Apply", - "submit": "Submit" + "submit": "Submit", + "more": "More", + "generic_error": "An error occured" }, "login": { "login": "Log in", @@ -364,9 +366,9 @@ }, "upload":{ "error": { - "base": "Upload failed.", - "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]", - "default": "Try again later" + "base": "Upload failed.", + "file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]", + "default": "Try again later" }, "file_size_units": { "B": "B", diff --git a/src/i18n/fi.json b/src/i18n/fi.json index 0d62f295..5a0c1ea8 100644 --- a/src/i18n/fi.json +++ b/src/i18n/fi.json @@ -17,7 +17,9 @@ }, "general": { "apply": "Aseta", - "submit": "Lähetä" + "submit": "Lähetä", + "more": "Lisää", + "generic_error": "Virhe tapahtui" }, "login": { "login": "Kirjaudu sisään", |