From bcf7e1ef2225a2145375da294f6632603b40be5d Mon Sep 17 00:00:00 2001 From: zt515 Date: Mon, 12 Jun 2017 17:55:28 +0800 Subject: [PATCH] Merge branch 'master' of git.oschina.net:lody/neoterm # Conflicts: # app/src/main/res/values/strings.xml --- app/src/main/java/io/neoterm/ui/settings/SettingActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/neoterm/ui/settings/SettingActivity.kt b/app/src/main/java/io/neoterm/ui/settings/SettingActivity.kt index f3d36f2..813b32e 100644 --- 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) }