diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2013-09-12 13:23:29 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2013-09-12 13:23:29 +0200 |
| commit | 455b6c717254e921c579a2aa6af8ab2ec0979786 (patch) | |
| tree | f4aede446fa20c5ed0acd22be2dc58495e4e6bc2 /res | |
| parent | 4c1d210274f66bd4969d467233ad8e69b55b8642 (diff) | |
| parent | a0b3c5f165134a6e99e4c6e4a065b3eee44ea9e9 (diff) | |
| download | AntennaPod-455b6c717254e921c579a2aa6af8ab2ec0979786.zip | |
Merge branch 'TomHennen-move-to-top' into develop
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/feeditem.xml | 1 | ||||
| -rw-r--r-- | res/values/ids.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/res/menu/feeditem.xml b/res/menu/feeditem.xml index 09b7fa6b0..505de1d4a 100644 --- a/res/menu/feeditem.xml +++ b/res/menu/feeditem.xml @@ -67,6 +67,5 @@ android:showAsAction="collapseActionView" android:title="@string/support_label"> </item> - </menu>
\ No newline at end of file diff --git a/res/values/ids.xml b/res/values/ids.xml index 5356cd119..c1d80d375 100644 --- a/res/values/ids.xml +++ b/res/values/ids.xml @@ -15,6 +15,8 @@ <item name="organize_queue_item" type="id"/> <item name="drag_handle" type="id"/> <item name="skip_episode_item" type="id"/> + <item name="move_to_top_item" type="id"/> + <item name="move_to_bottom_item" type="id"/> <item name="image_disk_cache_key" type="id"/> <item name="imageloader_key" type="id"/> <item name="notification_gpodnet_sync_error" type="id"/> diff --git a/res/values/strings.xml b/res/values/strings.xml index a0da91420..493122b1b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -133,6 +133,8 @@ <string name="organize_queue_label">Organize queue</string> <string name="undo">Undo</string> <string name="removed_from_queue">Item removed</string> + <string name="move_to_top_label">Move to top</string> + <string name="move_to_bottom_label">Move to bottom</string> <!-- Flattr --> <string name="flattr_auth_label">Flattr sign-in</string> |