diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
| commit | f9d000ebaec7732d5fcd46aa6685108a2619966b (patch) | |
| tree | 9593841cf520b117ca4c3d5b68b19e9124c852da /config/locales/eu.yml | |
| parent | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (diff) | |
| parent | c6598b17d9212c2d48395da73fa9529025d704cc (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.
Diffstat (limited to 'config/locales/eu.yml')
| -rw-r--r-- | config/locales/eu.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/eu.yml b/config/locales/eu.yml index cd82a5d9a..4cd4c00f8 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -23,7 +23,7 @@ eu: hosted_on: Mastodon %{domain} domeinuan ostatatua instance_actor_flash: 'Kontu hau zerbitzaria bera adierazten duen aktore birtual bat da, ez norbanako bat. Federaziorako erabiltzen da eta ez zenuke blokeatu behar instantzia osoa blokeatu nahi ez baduzu, kasu horretan domeinua blokeatzea egokia litzateke. -' + ' learn_more: Ikasi gehiago privacy_policy: Pribatutasun politika see_whats_happening: Ikusi zer gertatzen ari den |