diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-05 15:23:57 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-05 15:23:57 +0200 |
| commit | 00fcdebed758f031b486ec239fd425fc54a180b3 (patch) | |
| tree | 1211e136ba3e886ee8daaa5200babffc42375dd1 /config/locales | |
| parent | a9e8f98a9d32c57956d41009bd09a1f33310676e (diff) | |
| parent | 028ad4124cf1fdb28f5cf11bd7080e7a63f2f99e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/de.yml | 6 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config/locales/de.yml b/config/locales/de.yml index 0dcd86e98..e6f9da808 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -31,9 +31,9 @@ de: privacy_policy: Datenschutzerklärung source_code: Quellcode status_count_after: - one: Status - other: Status - status_count_before: die + one: Statusmeldung + other: Statusmeldungen + status_count_before: mit terms: Nutzungsbedingungen user_count_after: one: Benutzer diff --git a/config/locales/en.yml b/config/locales/en.yml index d1df0cc2b..5b46401e9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -919,6 +919,7 @@ en: tips: Tips title: Welcome aboard, %{name}! users: + follow_limit_reached: You cannot follow more than %{limit} people invalid_email: The e-mail address is invalid invalid_otp_token: Invalid two-factor code otp_lost_help_html: If you lost access to both, you may get in touch with %{email} |