Merge branch 'next-gen' into generalize

This commit is contained in:
Bill Dengler 2015-04-19 19:11:40 -04:00
commit 0913eac63d

View File

@ -1,20 +1,19 @@
# -*- coding: utf-8 -*-
actions = {
"up": _(u"Go up up on the current list"),
"down": _(u"Go down up on the current list"),
"left": _(u"Go to the previous tab"),
"right": _(u"Go to the next tab"),
"up": _(u"Go up in the current buffer"),
"down": _(u"Go down in the current buffer"),
"left": _(u"Go to the previous buffer"),
"right": _(u"Go to the next buffer"),
"next_account": _(u"Change to the next account"),
"previous_account": _(u"Change to the previous account"),
"show_hide": _(u"Show the graphical interface"),
"show_hide": _(u"Show or hide the GUI"),
"post_tweet": _(u"New tweet"),
"post_reply": _(u"Reply to a tweet"),
"post_reply": _(u"Reply"),
"post_retweet": _(u"Retweet"),
"send_dm": _(u"Send direct message"),
"add_to_favourites": _(u"Mark as favourite"),
"remove_from_favourites": _(u"Remove from favourites"),
"follow": _(u"Open the actions dialogue"),
"follow": _(u"Open the user actions dialogue"),
"user_details": _(u"See user details"),
"view_item": _(u"Show tweet"),
"exit": _(u"Quit"),
@ -30,20 +29,20 @@ actions = {
"go_page_down": _(u"Move 20 elements down on the current list"),
"update_profile": _(u"Edit profile"),
"delete": _(u"Remove a tweet or direct message"),
"clear_buffer": _(u"Empty the buffer removing all the elements"),
"repeat_item": _(u"Listen to the current message"),
"clear_buffer": _(u"Empty the current buffer"),
"repeat_item": _(u"Repeat last item"),
"copy_to_clipboard": _(u"Copy to clipboard"),
"add_to_list": _(u"Add to list"),
"remove_from_list": _(u"Remove from list"),
"toggle_buffer_mute": _(u"Mute/unmute the active buffer"),
"toggle_session_mute": _(u"Globally mute/unmute the current account in TWBlue"),
"toggle_session_mute": _(u"Globally mute/unmute the current account"),
"toggle_autoread": _(u"toggle the automatic reading of incoming tweets in the active buffer"),
"search": _(u"Search on twitter"),
"edit_keystrokes": _(u"Show the keystroke editor"),
"view_user_lists": _(u"Show lists for a specified user"),
"get_more_items": _(u"load previous items to any buffer"),
"reverse_geocode": _(u"Get location of any tweet"),
"view_reverse_geocode": _(u"Display the tweet's location in a dialog"),
"get_trending_topics": _(u"Create a buffer for displaying trends for a desired place"),
"open_conversation": _(u"Opens up a conversation buffer"),
"reverse_geocode": _(u"Get geolocation"),
"view_reverse_geocode": _(u"Display the tweet's geolocation in a dialog"),
"get_trending_topics": _(u"Create a trending topics buffer"),
"open_conversation": _(u"View conversation"),
}