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/oc.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/oc.yml')
| -rw-r--r-- | config/locales/oc.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/locales/oc.yml b/config/locales/oc.yml index f853d6cd4..2cbc8a8fb 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -46,7 +46,6 @@ oc: people_who_follow: Lo monde que sègon %{name} posts: Tuts posts_with_replies: Tuts e responsas - remote_follow: Sègre a distància reserved_username: Aqueste nom d’utilizaire es reservat roles: admin: Admin @@ -593,7 +592,6 @@ oc: unlocked_warning_title: Vòstre compte es pas clavat generic: changes_saved_msg: Cambiaments ben realizats ! - powered_by: propulsat per %{link} save_changes: Salvar los cambiaments validation_errors: one: I a quicòm que truca ! Mercés de corregir l’error çai-jos @@ -629,8 +627,6 @@ oc: expires_at: Expirats uses: Usatges title: Convidar de mond - landing_strip_html: "<strong>%{name}</strong> utiliza %{link_to_root_path}. Podètz lo/la sègre o interagir amb el o ela s’avètz un compte ont que siasque sul fediverse." - landing_strip_signup_html: S’es pas lo cas, podètz <a href="%{sign_up_path}">vos marcar aquí</a>. lists: errors: limit: Avètz atengut lo maximum de listas @@ -799,7 +795,6 @@ oc: unlisted: Pas listat unlisted_long: Tot lo monde pòt veire mai serà pas visible sul flux public stream_entries: - click_to_show: Clicatz per veire pinned: Tut penjat reblogged: a partejat sensitive_content: Contengut sensible |