Switch from GPLv2 to GPLv2+

[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 9cb57dfc952dfa1d29c818d7ed15cb1a0176c685..53a0de0fc7378fa2abdb35cb69af608ecc807c0f 100644 (file)
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -4,7 +4,8 @@
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,24 +26,21 @@
     <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" />
-    <item android:id="@+id/preload_maps"
-         android:icon="@android:drawable/ic_menu_mapmode"
-         android:title="@string/preload_maps" />
-    <item android:id="@+id/map_type"
-         android:icon="@android:drawable/ic_menu_mapmode"
-         android:title="@string/map_type" />
+
     <item android:id="@+id/select_tracker"
          android:icon="@android:drawable/ic_menu_view"
          android:title="@string/select_tracker"/>
     <item android:id="@+id/delete_track"
          android:icon="@android:drawable/ic_notification_clear_all"
          android:title="@string/delete_track"/>
+
+    <item android:id="@+id/setup"
+          android:icon="@android:drawable/ic_menu_preferences"
+          android:title="@string/setup" />
+    <item android:id="@+id/idle_mode"
+          android:icon="@android:drawable/ic_menu_preferences"
+          android:title="@string/idle_mode" />
+
     <item android:id="@+id/quit"
           android:icon="@android:drawable/ic_menu_close_clear_cancel"
           android:title="@string/quit" />