Merge branch 'master' into android_login
This commit is contained in:
@ -75,13 +75,6 @@
|
||||
android:showAsAction="ifRoom"
|
||||
android:title="@string/action_settings">
|
||||
</item>
|
||||
<item
|
||||
android:id="@+id/cache_clear"
|
||||
android:icon="@drawable/content_remove"
|
||||
android:orderInCategory="150"
|
||||
android:showAsAction="never"
|
||||
android:title="@string/cache_clear">
|
||||
</item>
|
||||
<item
|
||||
android:id="@+id/menu_debug"
|
||||
android:icon="@drawable/alerts_and_states_warning"
|
||||
|
@ -5,7 +5,6 @@
|
||||
<string name="action_settings">Settings</string>
|
||||
<string name="reload">Reload IITC</string>
|
||||
<string name="version">Print Version</string>
|
||||
<string name="cache_clear">Clear Cache</string>
|
||||
<string name="toggle_fullscreen">Toggle fullscreen</string>
|
||||
<string name="locate">Get Location</string>
|
||||
<string name="local">local</string>
|
||||
|
Reference in New Issue
Block a user