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/io.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/io.yml')
| -rw-r--r-- | config/locales/io.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/locales/io.yml b/config/locales/io.yml index bf15de488..71a7f2d94 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -22,7 +22,6 @@ io: people_followed_by: Sequati da %{name} people_who_follow: Sequanti di %{name} posts: Mesaji - remote_follow: Fore sequar unfollow: Dessequar admin: accounts: @@ -192,7 +191,6 @@ io: storage: Konservado di kontenajo generic: changes_saved_msg: Chanji senprobleme konservita! - powered_by: povigita da %{link} save_changes: Konservar la chanji validation_errors: one: Ulo ne eventis senprobleme! Voluntez konsultar la suba eror-raporto. @@ -205,8 +203,6 @@ io: following: Listo de sequati muting: Muting list upload: Kargar - landing_strip_html: "<strong>%{name}</strong> esas uzero en %{link_to_root_path}. Tu povas sequar lu o komunikar kun lu, se tu havas konto irgaloke en la Fediverse." - landing_strip_signup_html: Se tu ne havas, tu povas <a href="%{sign_up_path}">membreskar hike</a>. media_attachments: validations: images_and_video: Cannot attach a video to a status that already contains images @@ -274,7 +270,6 @@ io: public: Publika unlisted: Publika, ma ne aperos en publika tempolinei stream_entries: - click_to_show: Kliktar por montrar reblogged: diskonocigita sensitive_content: Titiliva kontenajo time: |