diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /config/locales/it.yml | |
parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'config/locales/it.yml')
-rw-r--r-- | config/locales/it.yml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/config/locales/it.yml b/config/locales/it.yml index cc79f352b..7478fbab7 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -45,7 +45,7 @@ it: people_followed_by: Persone seguite da %{name} people_who_follow: Persone che seguono %{name} posts: Posts - posts_with_replies: Toot e repliche + posts_with_replies: Toot e risposte remote_follow: Segui da remoto reserved_username: Il nome utente è riservato roles: @@ -554,8 +554,10 @@ it: generic: Browser sconosciuto current_session: Sessione corrente description: "%{browser} su %{platform}" + explanation: Questi sono i browser da cui attualmente è avvenuto l'accesso al tuo account Mastodon. platforms: other: piattaforma sconosciuta + title: Sessioni settings: authorized_apps: Applicazioni autorizzate back: Torna a Mastodon @@ -573,9 +575,18 @@ it: your_apps: Le tue applicazioni statuses: attached: + description: 'Allegato: %{attached}' + image: + one: "%{count} immagine" + other: "%{count} immagini" video: one: "%{count} video" other: "%{count} video" + boosted_from_html: Condiviso da %{acct_link} + disallowed_hashtags: + one: 'contiene un hashtag non permesso: %{tags}' + other: 'contiene gli hashtags non permessi: %{tags}' + language_detection: Individua lingua automaticamente open_in_web: Apri sul Web over_character_limit: Limite caratteri superato di %{max} pin_errors: |