diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-09-19 21:46:01 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-19 21:46:01 +0200 |
| commit | 91bef4759f40422b64d7990f9b90db0b493773b1 (patch) | |
| tree | 3211b1014a6d0a88737db16c44d210ef96a070e4 /config/locales/simple_form.eu.yml | |
| parent | 382cdd7f959480d59fee5646be320d6076cb18d8 (diff) | |
| parent | 554f659f2aa1eb9c0ca64ec1c9c177538434826c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js
Diffstat (limited to 'config/locales/simple_form.eu.yml')
| -rw-r--r-- | config/locales/simple_form.eu.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml index 09a338200..1e3b2d4f0 100644 --- a/config/locales/simple_form.eu.yml +++ b/config/locales/simple_form.eu.yml @@ -13,6 +13,7 @@ eu: other: <span class="name-counter">%{count}</span> karaktere geratzen dira fields: 4 elementu bistaratu ditzakezu taula batean zure profilean header: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px eskalara txikituko da + inbox_url: Kopiatu erabili nahi duzun errelearen hasiera orriaren URLa irreversible: Iragazitako toot-ak betirako galduko dira, geroago iragazkia kentzen baduzu ere locale: Erabiltzaile-interfazea, e-mail mezuen eta jakinarazpenen hizkuntza locked: Jarraitzaileak eskuz onartu behar dituzu @@ -52,6 +53,7 @@ eu: expires_in: Iraungitzea fields: Profilaren metadatuak header: Goiburua + inbox_url: Errelearen sarrera ontziaren URLa irreversible: Baztertu ezkutatu ordez locale: Interfazearen hizkuntza locked: Giltzapetu kontua @@ -90,6 +92,7 @@ eu: follow_request: Bidali e-mail bat norbaitek zu jarraitzea eskatzen duenean mention: Bidali e-mail bat norbaitek zu aipatzean reblog: Bidali e-mail bat norbaitek zure mezuari bultzada ematen badio + report: Bidali e-maila txosten berri bat aurkezten denean 'no': Ez required: mark: "*" |