diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
commit | 659b8a12ece7110608ee84748e57647c08d1dbda (patch) | |
tree | 1d8350cdad20ad1eb8c67a4d17a18ff7183f22e5 /config/locales/eo.yml | |
parent | c2e528916cae422baee3d72a3b4409a23c476b3f (diff) | |
parent | 63c7b9157274f57c496399a1a5c728b32415034c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes
Diffstat (limited to 'config/locales/eo.yml')
-rw-r--r-- | config/locales/eo.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 892070914..f1a9ff79d 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -40,6 +40,7 @@ eo: following: Sekvatoj media: Aŭdovidaĵoj moved_html: "%{name} moviĝis al %{new_profile_link}:" + network_hidden: Tiu informo ne estas disponebla nothing_here: Estas nenio ĉi tie! people_followed_by: Sekvatoj de %{name} people_who_follow: Sekvantoj de %{name} @@ -670,6 +671,7 @@ eo: video: one: "%{count} video" other: "%{count} videoj" + boosted_from_html: Diskonigita de %{acct_link} content_warning: 'Enhava averto: %{warning}' disallowed_hashtags: one: 'enhavas malpermesitan kradvorton: %{tags}' @@ -700,6 +702,7 @@ eo: themes: contrast: Forta kontrasto default: Mastodon + mastodon-light: Mastodon (hela) time: formats: default: "%Y-%m-%d %H:%M" |