diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/menu/main_menu.xml | 39 | ||||
-rw-r--r-- | res/values/strings.xml | 14 |
2 files changed, 23 insertions, 30 deletions
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 2d2e2998..584b896b 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -49,51 +49,42 @@ android:showAsAction="" android:title="@string/show_all_articles"/> - <item - android:id="@+id/headlines_select_all" - android:title="@string/headlines_select_all"/> - - <item - android:id="@+id/headlines_select_unread" - android:title="@string/headlines_select_unread"/> - - <item - android:id="@+id/headlines_select_none" - android:title="@string/headlines_select_none"/> + android:id="@+id/headlines_select" + android:title="@string/headlines_select"/> </group> <group android:id="@+id/menu_group_article" > <item - android:id="@+id/close_article" - android:icon="@android:drawable/ic_menu_close_clear_cancel" - android:showAsAction="ifRoom|withText" - android:title="@string/close_article"/> + android:id="@+id/share_article" + android:icon="@android:drawable/ic_menu_share" + android:showAsAction="ifRoom" + android:title="@string/share_article"/> <item android:id="@+id/toggle_marked" android:icon="@android:drawable/star_off" android:showAsAction="" - android:title="@string/toggle_marked"/> - - <item - android:id="@+id/share_article" - android:icon="@android:drawable/ic_menu_share" - android:showAsAction="ifRoom" - android:title="@string/share_article"/> + android:title="@string/article_toggle_marked"/> <item android:id="@+id/toggle_published" android:icon="@drawable/ic_menu_rss" android:showAsAction="" - android:title="@string/toggle_published"/> + android:title="@string/article_toggle_published"/> <item android:id="@+id/set_unread" android:icon="@android:drawable/ic_menu_recent_history" android:showAsAction="" - android:title="@string/set_unread"/> + android:title="@string/article_set_unread"/> + + <item + android:id="@+id/close_article" + android:icon="@android:drawable/ic_menu_close_clear_cancel" + android:showAsAction="ifRoom|withText" + android:title="@string/close_article"/> </group> <item diff --git a/res/values/strings.xml b/res/values/strings.xml index 853f9036..70cd4c3b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -44,15 +44,17 @@ <string name="category_browse_articles">Browse articles</string> <string name="blank"></string> <string name="transport_debugging">Log sent and received data</string> - <string name="toggle_marked">Toggle starred</string> - <string name="toggle_published">Toggle published</string> - <string name="headlines_select_all">Select all</string> - <string name="headlines_select_none">Select none</string> - <string name="headlines_select_unread">Unread</string> + <string name="article_toggle_marked">Toggle starred</string> + <string name="article_toggle_published">Toggle published</string> + <string name="headlines_select">Select articles</string> + <string name="headlines_select_dialog">Select articles</string> + <string name="headlines_select_all">All articles</string> + <string name="headlines_select_unread">Unread articles</string> + <string name="headlines_select_none">None</string> <string name="selection_toggle_marked">Starred</string> <string name="selection_toggle_published">Published</string> <string name="selection_toggle_unread">Unread</string> - <string name="set_unread">Mark unread</string> + <string name="article_set_unread">Mark unread</string> <string name="http_login_summary">Optional. Fill this if your tt-rss installation is protected by HTTP Basic authentication</string> <string name="login_summary">Your tt-rss login. Not needed for single user mode</string> <string name="enable_ads">Enable ads</string> |