Merged r9911 from trunk to 1.4-stable (#11328)

Fix Japanese mistranslation for 'label_language_based'.

Contributed by Go MAEDA.

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

config/locales/ja.yml

@@ -761,7 +761,7 @@ ja:
   label_week: 週
   label_date_from: "日付指定: "
   label_date_to: から
-  label_language_based: 既定の言語の設定に従う
+  label_language_based: ユーザの言語の設定に従う
   label_sort_by: "並び替え %{value}"
   label_send_test_email: テストメールを送信
   label_feeds_access_key: RSSアクセスキー

doc/CHANGELOG

@@ -4,6 +4,10 @@ Redmine - project management software
 Copyright (C) 2006-2012  Jean-Philippe Lang
 http://www.redmine.org/
 
+== TBD v1.4.5
+
+* Patch #11328: Fix Japanese mistranslation for 'label_language_based'
+
 == 2012-06-18 v1.4.4
 
 * Defect #10688: PDF export from Wiki - Problems with tables