diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-31 22:21:15 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-01 00:18:13 +0200 |
| commit | c1c514ca703f3e11adfe41734345b5277e886c50 (patch) | |
| tree | d8e088898292ca6da0f979b9244781b2ce116c7e /config/locales/ca.yml | |
| parent | 88b593a63ff3d607d6f98553654c46bc7cfc0b7b (diff) | |
| parent | 13ac8ca66ab01c92e4ebcc7221efb3d474c9fd0b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.
Diffstat (limited to 'config/locales/ca.yml')
| -rw-r--r-- | config/locales/ca.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 7133019d1..e4a62ffb1 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -46,7 +46,6 @@ ca: people_who_follow: Usuaris que segueixen %{name} posts: Toots posts_with_replies: Toots i respostes - remote_follow: Seguiment remot reserved_username: El nom d'usuari està reservat roles: admin: Administrador @@ -504,7 +503,6 @@ ca: unlocked_warning_title: El teu compte no està blocat generic: changes_saved_msg: Els canvis s'han desat correctament! - powered_by: amb tecnologia %{link} save_changes: Desa els canvis validation_errors: one: Alguna cosa no va bé! Si us plau, revisa l'error @@ -540,8 +538,6 @@ ca: expires_at: Caduca uses: Usos title: Convida persones - landing_strip_html: "<strong>%{name}</strong> és un usuari/a de %{link_to_root_path}. Pots seguir-lo/la o interactuar amb ell/a si tens un compte a qualsevol node del fediverse." - landing_strip_signup_html: Si no en tens, pots <a href="%{sign_up_path}">registrar-te aquí</a>. lists: errors: limit: Has assolit la quantitat màxima de llistes @@ -710,7 +706,6 @@ ca: unlisted: No llistat unlisted_long: Tothom ho pot veure, però no es mostra en la història federada stream_entries: - click_to_show: Clic per mostrar pinned: Toot fixat reblogged: ha impulsat sensitive_content: Contingut sensible |