diff options
| author | Kir | 2012-01-28 11:53:22 +0200 |
|---|---|---|
| committer | Kir | 2012-01-28 11:53:22 +0200 |
| commit | 18fcbf4838a3f2835edd526a1bf77f1b846d4e25 (patch) | |
| tree | ce5f9511451d6974fcf2f59e767c64714d73ab25 /config | |
| parent | 95877d8f982be9a4476cec5943749dcf5db6f524 (diff) | |
| parent | 626ff121111194ec6fa424f36de8658bf72873ba (diff) | |
| download | inboxes-18fcbf4838a3f2835edd526a1bf77f1b846d4e25.tar.bz2 | |
Merging with rspecv0.2.1
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/locales/ru.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 348e39b..a9a810d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -10,6 +10,6 @@ en: discussions: started: "Discussion started" leaved: "You leave the discussion" - exists: "Discussion between you and %{user} already exists" + already_exists: "Discussion between you and %{user} already exists" can_not_participate: "You are not listed in this discussion" choose_at_least_one_recipient: "You should choose at least one recipient of discussion"
\ No newline at end of file diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 1258f9f..1e311cd 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -9,7 +9,7 @@ ru: discussions: started: "Чат начат" leaved: "Вы покинули дискуссию" - exists: "Дискуссия между вами и %{user} уже существует" + already_exists: "Дискуссия между вами и %{user} уже существует" can_not_participate: "Вы не состоите в этой дискуссии" choose_at_least_one_recipient: "Укажите хотя бы одного получателя" speakers: |