diff --git a/app/models/setting.rb b/app/models/setting.rb
index e7cfdfb2b..7b7a1cdf5 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -53,6 +53,7 @@ class Setting < ActiveRecord::Base
                   windows-1257
                   windows-1258
                   windows-31j
+                  windows-874
                   ISO-2022-JP
                   ISO-8859-1
                   ISO-8859-2
@@ -73,6 +74,7 @@ class Setting < ActiveRecord::Base
                   EUC-JP
                   Shift_JIS
                   CP932
+                  CP949
                   GB18030
                   GBK
                   EUC-KR
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 57b997d05..b282544e4 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -144,7 +144,7 @@ th:
   general_lang_name: 'Thai (ไทย)'
   general_csv_separator: ','
   general_csv_decimal_separator: '.'
-  general_csv_encoding: Windows-874
+  general_csv_encoding: windows-874
   general_pdf_fontname: freeserif
   general_pdf_monospaced_fontname: freeserif
   general_first_day_of_week: '1'
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 2e82bcc4b..8592dd1fd 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -150,7 +150,7 @@ zh:
   general_lang_name: 'Chinese/Simplified (简体中文)'
   general_csv_separator: ','
   general_csv_decimal_separator: '.'
-  general_csv_encoding: gb18030
+  general_csv_encoding: GB18030
   general_pdf_fontname: stsongstdlight
   general_pdf_monospaced_fontname: stsongstdlight
   general_first_day_of_week: '7'
diff --git a/test/functional/imports_controller_test.rb b/test/functional/imports_controller_test.rb
index f87fd029f..ceb48c718 100644
--- a/test/functional/imports_controller_test.rb
+++ b/test/functional/imports_controller_test.rb
@@ -34,6 +34,8 @@ class ImportsControllerTest < Redmine::ControllerTest
            :custom_fields_projects,
            :custom_fields_trackers
 
+  include Redmine::I18n
+
   def setup
     User.current = nil
     @request.session[:user_id] = 2
@@ -72,7 +74,14 @@ class ImportsControllerTest < Redmine::ControllerTest
     assert_response :success
     assert_select 'select[name=?]', 'import_settings[separator]'
     assert_select 'select[name=?]', 'import_settings[wrapper]'
-    assert_select 'select[name=?]', 'import_settings[encoding]'
+    assert_select 'select[name=?]', 'import_settings[encoding]' do
+      encodings = valid_languages.map do |lang|
+        ll(lang.to_s, :general_csv_encoding)
+      end.uniq
+      encodings.each do |encoding|
+        assert_select 'option[value=?]', encoding
+      end
+    end
     assert_select 'select[name=?]', 'import_settings[date_format]'
   end