summaryrefslogtreecommitdiff
path: root/app/src/main/res/menu
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2016-09-19 12:38:29 +0200
committerkwadronaut <kwadronaut@leap.se>2016-09-19 12:38:29 +0200
commitf9c44da143a2d29baac6260c2e5caf9a96dacbc3 (patch)
treec2435766b6a8d7ddd70f2a0dcfc501a7d93c45f4 /app/src/main/res/menu
parent00ebc6d66ff9e8a0fa01b808ce7dbd0335933baf (diff)
parent56ba118a5713fe0e24120815cd28db141709a497 (diff)
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'app/src/main/res/menu')
-rw-r--r--app/src/main/res/menu/logmenu.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/res/menu/logmenu.xml b/app/src/main/res/menu/logmenu.xml
index 2df53141..4c8daf35 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,26 +11,26 @@
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