diff options
| author | Parménides GV <parmegv@sdf.org> | 2016-02-07 10:43:26 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2016-02-07 10:43:26 +0100 |
| commit | 433754368ff4d7339f09024960b5ed92d3452b7e (patch) | |
| tree | 79aa4772f46785d0c1a61285777c530a46499ee4 /app/src/main/res/menu/logmenu.xml | |
| parent | 64e71b3972c3d633f199058a94b5a2be0c7bb14e (diff) | |
| parent | 8e67e4d2167f2508d7f069af4d69f0f2931844a7 (diff) | |
Merge branch 'feature/update-ics-openvpn' into develop
Diffstat (limited to 'app/src/main/res/menu/logmenu.xml')
| -rw-r--r-- | app/src/main/res/menu/logmenu.xml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/src/main/res/menu/logmenu.xml b/app/src/main/res/menu/logmenu.xml index 2df53141..890d1c2e 100644 --- a/app/src/main/res/menu/logmenu.xml +++ b/app/src/main/res/menu/logmenu.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - ~ Copyright (c) 2012-2014 Arne Schwabe + ~ Copyright (c) 2012-2016 Arne Schwabe ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> @@ -11,34 +11,33 @@ android:id="@+id/toggle_time" android:alphabeticShortcut="t" android:icon="@drawable/ic_menu_view" - android:showAsAction="withText|ifRoom" + android:showAsAction="ifRoom" android:title="@string/logview_options" /> <item android:id="@+id/clearlog" android:icon="@drawable/ic_menu_delete" - android:showAsAction="ifRoom|withText" + android:showAsAction="ifRoom" android:title="@string/clear_log" android:titleCondensed="@string/clear"/> <item android:id="@+id/send" android:icon="@drawable/ic_menu_share" - android:showAsAction="ifRoom|withText" + android:showAsAction="ifRoom" android:title="@string/send_logfile" android:titleCondensed="@string/send"/> <item android:id="@+id/cancel" android:icon="@drawable/ic_menu_close_clear_cancel" - android:showAsAction="ifRoom|withText" + android:showAsAction="ifRoom" android:title="@string/cancel_connection_long" android:titleCondensed="@string/cancel_connection"/> <item android:id="@+id/edit_vpn" android:alphabeticShortcut="e" android:icon="@drawable/ic_menu_edit" - android:showAsAction="withText|ifRoom" + android:showAsAction="ifRoom" android:title="@string/edit_vpn" android:visible="false"/> - </menu> |