diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-12-15 10:38:54 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-12-15 10:45:53 +0100 |
commit | 65e994b29b7c3b06dc61ab5eed35b571ebafdf94 (patch) | |
tree | 4cb922f9abb201278312210d678f43ab976b6aea /config/locales/co.yml | |
parent | f0505a5b2e727da73c8aa651b804508a8187a3c4 (diff) | |
parent | 67b924e324220885b46d9e26c8beb6ee8d3cf8bf (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.
Diffstat (limited to 'config/locales/co.yml')
-rw-r--r-- | config/locales/co.yml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/config/locales/co.yml b/config/locales/co.yml index b4458f602..d2dcef9a4 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -48,6 +48,7 @@ co: other: Abbunati following: Abbunamenti joined: Quì dapoi %{date} + last_active: ultima attività link_verified_on: A pruprietà d'issu ligame hè stata verificata u %{date} media: Media moved_html: "%{name} hà cambiatu di contu, avà hè nant’à %{new_profile_link}:" @@ -114,6 +115,7 @@ co: media_attachments: Media aghjunti memorialize: Trasfurmà in mimuriale moderation: + active: Attivu all: Tutti silenced: Silenzati suspended: Suspesi @@ -439,6 +441,14 @@ co: proceed: Cuntinuà title: Suspende %{acct} warning_html: 'A suspensione di u contu sguasserà di manera <strong>irreversibile</strong> i so dati, cum''è:' + tags: + accounts: Conti + hidden: Piattatu + hide: Piattà di l'annuariu + name: Hashtag + title: Hashtag + unhide: Mustrà in l'annuariu + visible: Visibile title: Amministrazione admin_mailer: new_report: @@ -517,6 +527,15 @@ co: success_msg: U vostru contu hè statu sguassatu warning_html: Pudete esse sicuru·a solu chì u cuntenutu sarà sguassatu di st’istanza. S’ellu hè statu spartutu in altrò, sarà forse sempre quallà. warning_title: Dispunibilità di i cuntenuti sparsi + directories: + directory: Annuariu di i prufili + explanation: Scopre utilizatori à partesi di i so centri d'interessu + explore_mastodon: Scopre à %{title} + most_popular: I più pupulari + most_recently_active: Attività a più fresca + people: + one: "%{count} persona" + other: "%{count} persone" errors: '403': Ùn site micca auturizatu·a à vede sta pagina. '404': Sta pagina ùn esiste micca. |