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/co.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/co.yml')
| -rw-r--r-- | config/locales/co.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/locales/co.yml b/config/locales/co.yml index 6608f05a9..4326dde67 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -46,7 +46,6 @@ co: people_who_follow: Seguitanu %{name} posts: Statuti posts_with_replies: Statuti è risposte - remote_follow: Siguità d’altrò reserved_username: Stu cugnome hè riservatu roles: admin: Amministratore @@ -488,7 +487,6 @@ co: unlocked_warning_title: U vostru contu hè pubblicu generic: changes_saved_msg: Cambiamenti salvati! - powered_by: mossu da %{link} save_changes: Salvà e mudificazione validation_errors: one: Qualcosa ùn và bè! Verificate u prublemu quì sottu @@ -523,8 +521,6 @@ co: expires_at: Spira uses: Utiliza title: Invità ghjente - landing_strip_html: "<strong>%{name}</strong> hè nant’à %{link_to_root_path}. Pudete seguitallu·a o cumunicà cù ellu·a cù un contu in qualche parte di u fediverse." - landing_strip_signup_html: Pudete ancu <a href="%{sign_up_path}">arrigistravi quì</a>. lists: errors: limit: Ùn pudete più creà altre liste @@ -691,7 +687,6 @@ co: unlisted: Micca listatu unlisted_long: Tuttu u mondu pò vede, mà micca indè e linee pubbliche stream_entries: - click_to_show: Cliccà per vede pinned: Statutu puntarulatu reblogged: spartutu sensitive_content: Cuntenutu sensibile |