diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
| commit | 9adeaf2bfc1c16ca70e611b5288886b21414217b (patch) | |
| tree | 53372bc9bd6f38d158aad50c768e18773b7d3f3b /config/locales/eu.yml | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | 4bae4e972d43f71bffb888ac82c180b2fa3f1ada (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system
Diffstat (limited to 'config/locales/eu.yml')
| -rw-r--r-- | config/locales/eu.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/locales/eu.yml b/config/locales/eu.yml index bfa91beb8..999772cfe 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -344,9 +344,6 @@ eu: create: Gehitu domeinua title: Sarrera berria e-mail zerrenda beltzean title: E-mail zerrenda beltza - followers: - back_to_account: Itzuli kontura - title: "%{acct} kontuaren jarraitzaileak" instances: by_domain: Domeinua delivery_available: Bidalketa eskuragarri dago @@ -921,6 +918,7 @@ eu: duration_too_long: etorkizunean urrunegi dago duration_too_short: goizegi da expired: Inkesta amaitu da jada + invalid_choice: Hautatutako boto aukera ez da existitzen over_character_limit: bakoitzak gehienez %{max} karaktere izan ditzake too_few_options: elementu bat baino gehiago izan behar du too_many_options: ezin ditu %{max} elementu baino gehiago izan |