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/gl.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/gl.yml')
| -rw-r--r-- | config/locales/gl.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/locales/gl.yml b/config/locales/gl.yml index d20e1559d..f38f65e5a 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -46,7 +46,6 @@ gl: people_who_follow: Personas que seguen a %{name} posts: Mensaxes posts_with_replies: Toots e respostas - remote_follow: Seguimento remoto reserved_username: O nome de usuaria está reservado roles: admin: Admin @@ -535,7 +534,6 @@ gl: unlocked_warning_title: A súa conta non está pechada generic: changes_saved_msg: Cambios gardados correctamente!! - powered_by: grazas a %{link} save_changes: Gardar cambios validation_errors: one: Algo non está ben de todo! Por favor revise abaixo o erro @@ -571,8 +569,6 @@ gl: expires_at: Caduca uses: Usos title: Convidar xente - landing_strip_html: "<strong>%{name}</strong> é unha usuaria en %{link_to_root_path}. Pode seguila ou interactuar con ela si ten unha conta en algún lugar do fediverso." - landing_strip_signup_html: Si non, pode <a href="%{sign_up_path}">rexistrarse aquí</a>. lists: errors: limit: Acadou o número máximo de listas @@ -741,7 +737,6 @@ gl: unlisted: Non listado unlisted_long: Visible para calquera, pero non listado en liñas de tempo públicas stream_entries: - click_to_show: Pulse para mostrar pinned: Mensaxe fixada reblogged: promovida sensitive_content: Contido sensible |