Merged r9782, r9784, r9794 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9795 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/unit/lib/redmine/i18n_test.rb

@@ -121,7 +121,8 @@ class Redmine::I18nTest < ActiveSupport::TestCase
     valid_languages.each do |lang|
       set_language_if_valid lang
       assert_nothing_raised "#{lang} failure" do
-        number_to_human_size(1024*1024*4)
+        size = number_to_human_size(257024)
+        assert_match /251/, size
       end
     end
   end