diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
| commit | a942ad3062285b6b4984fe92f9bd610829f04456 (patch) | |
| tree | 2476b65436959dda09871ee96edca53b53201b96 /config/locales/io.yml | |
| parent | 7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (diff) | |
| parent | 32f950a7a8d3acfed43d76cb21d0fc06a471bafe (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.
Diffstat (limited to 'config/locales/io.yml')
| -rw-r--r-- | config/locales/io.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/io.yml b/config/locales/io.yml index d07997663..0c1e6520b 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -185,11 +185,11 @@ io: changes_saved_msg: Chanji senprobleme konservita! save_changes: Konservar la chanji validation_errors: - one: Ulo ne eventis senprobleme! Voluntez konsultar la suba eror-raporto. - other: Ulo ne eventis senprobleme! Voluntez konsultar la suba %{count} eror-raporti. + one: Ulo ne eventis senprobleme! Voluntez konsultar la suba eror-raporto + other: Ulo ne eventis senprobleme! Voluntez konsultar la suba %{count} eror-raporti imports: preface: Tu povas importacar kelka datumi, tal quala listi de omna homi quin tu sequas o blokusas, a tua konto di ca instaluro, per dosiero exportacita de altra instaluro. - success: Tua datumi esis senprobleme importacita ed esos traktita quale projetita. + success: Tua datumi esis senprobleme importacita ed esos traktita quale projetita types: blocking: Listo de blokusiti following: Listo de sequati |