diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-09-18 17:25:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-09-18 17:25:56 +0200 |
| commit | 5cadb4723832b91068ee51955b9d4b1336502369 (patch) | |
| tree | 2e915e53ee0d25ea63ee3910ae8ced44f3295e21 /config/locales/el.yml | |
| parent | ab646fac5f582fe9bef22d8b9a4995fbb4b42d7d (diff) | |
| parent | d0c2c5278391b82ba7fa2f230bf237805ff61a0c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code
Diffstat (limited to 'config/locales/el.yml')
| -rw-r--r-- | config/locales/el.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/el.yml b/config/locales/el.yml index 43fec340a..acc97d37e 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -626,7 +626,6 @@ el: x_months: "%{count}μ" x_seconds: "%{count}δ" deletes: - bad_password_msg: Καλή προσπάθεια χάκερς! Λάθος συνθηματικό confirm_password: Γράψε το τρέχον συνθηματικό σου για να πιστοποιήσεις την ταυτότητά σου proceed: Διαγραφή λογαριασμού success_msg: Ο λογαριασμός σου διαγράφηκε με επιτυχία |