diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-05 19:35:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-05 19:35:56 +0200 |
| commit | 2d8be0a6e1fbe9da892937b05b373ab907d89b77 (patch) | |
| tree | 73eb669adcc8b13c63dded5a887cb5ecc817894d /config/locales/eu.yml | |
| parent | 9b3677d5097fb50f90a6abdce9d722e81d2db469 (diff) | |
| parent | 99f3a5554074d9a12619797c474b3de4c6085f02 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.
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 3e92dcd36..1a654ec9b 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 |