jro_apps/redmine Files · test/fixtures/diffs/issue-12641-ru.diff

Merged r12046 from trunk to 2.3-stable (#14562)...

Merged r12046 from trunk to 2.3-stable (#14562) fix diff of CJK (Chinese/Japanese/Korean) is broken on Ruby 1.8. Contributed by Jun NAITOH. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12054 e93f8b46-1217-0410-a6f0-8f06a7374b81

Toshi MARUYAMA - - Load All Authors

File last commit:

r11321:a4b6928a261e


                r11824:bbf3ffe0aafe

Download file

             issue-12641-ru.diff
        
                    19 lines
            
             | 693 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / test / fixtures / diffs / issue-12641-ru.diff
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # HG changeset patch

      # User tmaruyama

      # Date 1355872765 0

      # Node ID 8a13ebed1779c2e85fa644ecdd0de81996c969c4

      # Parent  5c3c5f917ae92f278fe42c6978366996595b0796

      Russian "about_x_hours" translation changed by Mikhail Velkin (#12640)

      diff --git a/config/locales/ru.yml b/config/locales/ru.yml

      --- a/config/locales/ru.yml

      +++ b/config/locales/ru.yml

      @@ -115,7 +115,7 @@ ru:

               one:   "около %{count} часа"

               few:   "около %{count} часов"

               many:  "около %{count} часов"

      -        other: "около %{count} часа"

      +        other: "около %{count} часов"

             x_hours:

               one:   "1 час"

               other: "%{count} часов"

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# HG changeset patch
				# User tmaruyama
				# Date 1355872765 0
				# Node ID 8a13ebed1779c2e85fa644ecdd0de81996c969c4
				# Parent 5c3c5f917ae92f278fe42c6978366996595b0796
				Russian "about_x_hours" translation changed by Mikhail Velkin (#12640)

				diff --git a/config/locales/ru.yml b/config/locales/ru.yml
				--- a/config/locales/ru.yml
				+++ b/config/locales/ru.yml
				@@ -115,7 +115,7 @@ ru:
				one: "около %{count} часа"
				few: "около %{count} часов"
				many: "около %{count} часов"
				- other: "около %{count} часа"
				+ other: "около %{count} часов"
				x_hours:
				one: "1 час"
				other: "%{count} часов"