Mercurial > hg > soundsoftware-site

annotate .svn/pristine/ed/ed1fb7a49d065a062c38b048a383e12fc1982787.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
rev   line source
Chris@1295 1 # HG changeset patch
Chris@1295 2 # User tmaruyama
Chris@1295 3 # Date 1355872765 0
Chris@1295 4 # Node ID 8a13ebed1779c2e85fa644ecdd0de81996c969c4
Chris@1295 5 # Parent 5c3c5f917ae92f278fe42c6978366996595b0796
Chris@1295 6 Russian "about_x_hours" translation changed by Mikhail Velkin (#12640)
Chris@1295 7
Chris@1295 8 diff --git a/config/locales/ru.yml b/config/locales/ru.yml
Chris@1295 9 --- a/config/locales/ru.yml
Chris@1295 10 +++ b/config/locales/ru.yml
Chris@1295 11 @@ -115,7 +115,7 @@ ru:
Chris@1295 12 one: "около %{count} часа"
Chris@1295 13 few: "около %{count} часов"
Chris@1295 14 many: "около %{count} часов"
Chris@1295 15 - other: "около %{count} часа"
Chris@1295 16 + other: "около %{count} часов"
Chris@1295 17 x_hours:
Chris@1295 18 one: "1 час"
Chris@1295 19 other: "%{count} часов"