From 2acfd0847cce78603794479e1dcd9a7486118f40 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 19 Dec 2012 00:05:11 +0000 Subject: [PATCH] Merged r11051 from trunk to 1.4-stable (#12630) Russian "x_hours" translation updated by Mikhail Velkin. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@11055 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/ru.yml | 4 ++-- doc/CHANGELOG | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index e174ae1c3..6736e0543 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -117,8 +117,8 @@ ru: many: "около %{count} часов" other: "около %{count} часа" x_hours: - one: "1 hour" - other: "%{count} hours" + one: "1 час" + other: "%{count} часов" x_days: one: "%{count} день" few: "%{count} дня" diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 25c850b0e..e1d60641e 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -10,6 +10,7 @@ http://www.redmine.org/ * Patch #12605: Norwegian translation for 1.4-stable update * Patch #12614: Dutch translation * Patch #12615: Russian translation +* Patch #12630: Russian "x_hours" translation == 2012-11-17 v1.4.5