Merge "FM: Start recording service even when A2DP headset connected"
diff --git a/fmapp2/res/layout/alert_dialog_text_entry.xml b/fmapp2/res/layout/alert_dialog_text_entry.xml
index a54fc00..57636ab 100644
--- a/fmapp2/res/layout/alert_dialog_text_entry.xml
+++ b/fmapp2/res/layout/alert_dialog_text_entry.xml
@@ -38,7 +38,7 @@
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:scrollHorizontally="true"
- android:hint="Enter a name"
+ android:hint="@string/alert_dialog_hint"
android:singleLine="true"
android:inputType="text"
android:autoText="false"
diff --git a/fmapp2/res/values-zh-rCN/strings.xml b/fmapp2/res/values-zh-rCN/strings.xml
index ad9ed0b..1a340f7 100644
--- a/fmapp2/res/values-zh-rCN/strings.xml
+++ b/fmapp2/res/values-zh-rCN/strings.xml
@@ -81,6 +81,7 @@
<string name="audio_type_mono">单声道</string>
<string name="alert_dialog_ok">确定</string>
<string name="alert_dialog_cancel">取消</string>
+ <string name="alert_dialog_hint">输入一个名称</string>
<string name="search_dialog_title">搜索电台</string>
<string name="fm_command_timeout_title">超时</string>
diff --git a/fmapp2/res/values/strings.xml b/fmapp2/res/values/strings.xml
index ed02a50..146866a 100644
--- a/fmapp2/res/values/strings.xml
+++ b/fmapp2/res/values/strings.xml
@@ -145,6 +145,8 @@
<string name="menu_delete_list">Delete List</string>
<string name="alert_dialog_ok">Ok</string>
<string name="alert_dialog_cancel">Cancel</string>
+ <!-- The messsage shown when long pressed on a station. -->
+ <string name="alert_dialog_hint">Enter a name</string>
<string name="search_dialog_title">Scan Stations</string>