diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 19:31:32 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 21:49:35 +0200 |
| commit | 1488be7d9683fb3442c6f7bd4fd911d224f0c929 (patch) | |
| tree | 42548a596bb118e08c14c4d0ae9eacb3e8b2f36b /config/locales/hy.yml | |
| parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
| parent | d22f3a7d5140ef1c3ae6e9bd2241bbb5289af8d1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json
Diffstat (limited to 'config/locales/hy.yml')
| -rw-r--r-- | config/locales/hy.yml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/config/locales/hy.yml b/config/locales/hy.yml index 86645a574..197ddae79 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -1,5 +1,16 @@ --- hy: + about: + active_count_after: ակտիվ + see_whats_happening: Տես ինչ ա կատարվում + status_count_after: + one: ստատուս + other: ստատուս + what_is_mastodon: Ի՞նչ է Մաստոդոնը + accounts: + media: Մեդիա + auth: + login: Մտնել errors: '403': You don't have permission to view this page. '404': The page you are looking for isn't here. @@ -15,3 +26,7 @@ hy: '43200': 12 hours '604800': 1 week '86400': 1 day + sessions: + platforms: + android: Անդրոիդ + linux: Լինուքս |