Merge branch 'master' of git.oschina.net:lody/neoterm

# Conflicts: # app/src/main/res/values/strings.xml
2017-06-12 17:55:28 +08:00
parent 814a05088d
commit bcf7e1ef22
1 changed files with 1 additions and 1 deletions
--- a/app/src/main/java/io/neoterm/ui/settings/SettingActivity.kt
+++ b/app/src/main/java/io/neoterm/ui/settings/SettingActivity.kt
@ -12,7 +12,7 @@ class SettingActivity : AppCompatPreferenceActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        supportActionBar.title = getString(R.string.settings)
+        supportActionBar.title = getString(R.string.menu_settings)
        supportActionBar.setDisplayHomeAsUpEnabled(true)
        addPreferencesFromResource(R.xml.settings_main)
    }