diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 13:23:02 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 13:23:02 +0100 |
| commit | f8e07ca5cdd0d4203d31aa5f0fce79690d5a5190 (patch) | |
| tree | 928e06a97ccd3c3eeef3b3c0ac03c8f59d516e59 /config/locales/te.yml | |
| parent | 6b6e633c095485f95350c4308a942192e5fe8806 (diff) | |
| parent | 496a6b3dc5274cca08fe58c1d9a7cdc7d10d325b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).
Diffstat (limited to 'config/locales/te.yml')
| -rw-r--r-- | config/locales/te.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/te.yml b/config/locales/te.yml index f28b56052..bde34980a 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -2,4 +2,6 @@ te: about: about_this: గురించి + administered_by: 'నిర్వహణలో:' contact: సంప్రదించండి + contact_unavailable: వర్తించదు |