Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosdroid / res / menu / option_menu.xml

diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index 18de725c94e8dc4acc90715e8b12735599021d28..3bd5a54e2bb4b6d6dd0abcb81f5fb39d94e7954e 100644 (file)
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -14,13 +14,19 @@
      limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/secure_connect_scan"
+    <item android:id="@+id/connect_scan"
           android:icon="@android:drawable/ic_menu_search"
-          android:title="@string/secure_connect" />
-    <item android:id="@+id/insecure_connect_scan"
-          android:icon="@android:drawable/ic_menu_search"
-          android:title="@string/insecure_connect" />
-    <item android:id="@+id/discoverable"
-          android:icon="@android:drawable/ic_menu_mylocation"
-          android:title="@string/discoverable" />
+          android:title="@string/connect_device" />
+    <item android:id="@+id/quit"
+          android:icon="@android:drawable/ic_menu_close_clear_cancel"
+          android:title="@string/quit" />
+    <item android:id="@+id/select_freq"
+          android:icon="@android:drawable/ic_menu_preferences"
+          android:title="@string/select_freq" />
+    <item android:id="@+id/select_rate"
+          android:icon="@android:drawable/ic_menu_preferences"
+          android:title="@string/select_rate" />
+    <item android:id="@+id/change_units"
+         android:icon="@android:drawable/ic_menu_view"
+         android:title="@string/change_units" />
 </menu>