diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
| commit | ab5f450700085ce73621b28b813f2edc5f199785 (patch) | |
| tree | 766214b52ed217903ae821285391f8e2d4b5f545 /config/locales/eu.yml | |
| parent | 26c20a4ec7868753b284670575f28f201a5cef9f (diff) | |
| parent | 7f59206944193591d7aef5cbd73edc7f5303add7 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
Diffstat (limited to 'config/locales/eu.yml')
| -rw-r--r-- | config/locales/eu.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config/locales/eu.yml b/config/locales/eu.yml index dcfcd5b30..78cb82abe 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -29,10 +29,10 @@ eu: learn_more: Ikasi gehiago other_instances: Instantzien zerrenda source_code: Iturburu kodea - status_count_after: mezu - status_count_before: Idatzi dituzte - user_count_after: erabiltzaile - user_count_before: Baditugu + status_count_after: mezu idatzi dituzte + status_count_before: Hauek + user_count_after: erabiltzaile daude + user_count_before: Hemen what_is_mastodon: Zer da Mastodon? accounts: follow: Jarraitu @@ -514,6 +514,7 @@ eu: '86400': Egun 1 expires_in_prompt: Inoiz ez generate: Sortu + invited_by: 'Honek gonbidatu zaitu:' max_uses: one: Erabilera 1 other: "%{count} erabilera" |