diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-02-26 17:04:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-26 17:04:44 +0100 |
| commit | 0158937fc2345a83f8ee5a64e85b14cabfe4b1e7 (patch) | |
| tree | 79872e72c27d6371620c0dd8f04700aa0094020c /config/locales/simple_form.oc.yml | |
| parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) | |
| parent | a5e7ada62fa2824be158f0b3bed7f3c39ce9c0fa (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - Dockerfile Took upstream version and reverted f13ebd02c91776ddb88b5178bf9015c6e0f1ca80. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.
Diffstat (limited to 'config/locales/simple_form.oc.yml')
| -rw-r--r-- | config/locales/simple_form.oc.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index 6ded448e9..ac2845335 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -33,11 +33,14 @@ oc: setting_display_media_show_all: Totjorn mostrar los mèdias marcats coma sensibles setting_hide_network: Vòstre perfil mostrarà pas los que vos sègon e lo monde que seguètz setting_noindex: Aquò es destinat a vòstre perfil public e vòstra pagina d’estatuts + setting_show_application: Lo nom de l’aplicacion qu’utilizatz per publicar serà mostrat dins la vista detalhada de vòstres tuts setting_theme: Aquò càmbia lo tèma grafic de Mastodon quand sètz connectat qual que siasque lo periferic. username: Vòstre nom d’utilizaire serà unic sus %{domain} whole_word: Quand lo mot-clau o frasa es solament alfranumeric, serà pas qu’aplicat se correspond al mot complèt + featured_tag: + name: 'Benlèu que volètz utilizar una d’aquestas causas :' imports: - data: Fichièr CSV exportat d’una autra instància Mastodon + data: Fichièr CSV exportat d’un autre servidor Mastodon sessions: otp: 'Picatz lo còdi d’autentificacion en dos temps (Two factor code) de vòstra aplicacion mobil o utilizatz un de vòstres còdis de recuperacion :' user: |