screen_queue: rename "playlist" to "queue"

"Playlists" are m3u files, and the "queue" is the current list of
songs that are about to be played by MPD.

diff --git a/NEWS b/NEWS
index f386c5b79719c4611e76569c9d6707648e2ba587..c28c2518da86678f787f999dfdb3c4ef5ab97066 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 ncmpc 0.22 - not yet released
+* rename "playlist" to "queue"
 
 
 ncmpc 0.21 - (2013-04-11)

diff --git a/src/command.c b/src/command.c
index 9495b79aa5ea62301478d9ee0e433c8315824194..b9a909ffef8f982753dc7aa26d3a79d061a84f5a 100644 (file)
--- a/src/command.c
+++ b/src/command.c
@@ -104,7 +104,7 @@ static command_definition_t cmds[] = {
        { { '1', F1, 'h' }, 0, CMD_SCREEN_HELP, "screen-help",
          N_("Help screen") },
        { { '2', F2, 0 }, 0, CMD_SCREEN_PLAY, "screen-playlist",
-         N_("Playlist screen") },
+         N_("Queue screen") },
        { { '3', F3, 0 }, 0, CMD_SCREEN_FILE, "screen-browse",
          N_("Browse screen") },
 
@@ -131,15 +131,15 @@ static command_definition_t cmds[] = {
        { { '-', LEFT, 0 }, 0, CMD_VOLUME_DOWN, "volume-down",
          N_("Decrease volume") },
        { { ' ', 0, 0 }, 0, CMD_SELECT, "select",
-         N_("Select/deselect song in playlist") },
+         N_("Select/deselect song in queue") },
        { { 't', 0, 0 }, 0, CMD_SELECT_ALL, "select_all",
          N_("Select all listed items") },
        { { DEL, 'd', 0 }, 0, CMD_DELETE, "delete",
-         N_("Delete song from playlist") },
+         N_("Delete song from queue") },
        { { 'Z', 0, 0 }, 0, CMD_SHUFFLE, "shuffle",
-         N_("Shuffle playlist") },
+         N_("Shuffle queue") },
        { { 'c', 0, 0 }, 0, CMD_CLEAR, "clear",
-         N_("Clear playlist") },
+         N_("Clear queue") },
        { { 'r', 0, 0 }, 0, CMD_REPEAT, "repeat",
          N_("Toggle repeat mode") },
        { { 'z', 0, 0 }, 0, CMD_RANDOM, "random",
@@ -153,9 +153,9 @@ static command_definition_t cmds[] = {
        { { C('U'), 0, 0 }, 0, CMD_DB_UPDATE, "db-update",
          N_("Start a music database update") },
        { { 'S', 0, 0 }, 0, CMD_SAVE_PLAYLIST, "save",
-         N_("Save playlist") },
+         N_("Save queue") },
        { { 'a', 0, 0 }, 0, CMD_ADD, "add",
-         N_("Add url/file to playlist") },
+         N_("Add url/file to queue") },
 
        { { '!', 0, 0 }, 0, CMD_GO_ROOT_DIRECTORY, "go-root-directory",
          N_("Go to root directory") },

diff --git a/src/player_command.c b/src/player_command.c
index f38147a7c7c7985c3c5c5aee6cbe37209219fbfd..9969d12257a81575879bbbc30ce9389b68d3af82 100644 (file)
--- a/src/player_command.c
+++ b/src/player_command.c
@@ -174,7 +174,7 @@ handle_player_command(struct mpdclient *c, command_t cmd)
                        break;
 
                if (mpd_run_shuffle(connection))
-                       screen_status_message(_("Shuffled playlist"));
+                       screen_status_message(_("Shuffled queue"));
                else
                        mpdclient_handle_error(c);
                break;
@@ -184,7 +184,7 @@ handle_player_command(struct mpdclient *c, command_t cmd)
                        break;
 
                if (mpdclient_cmd_clear(c))
-                       screen_status_message(_("Cleared playlist"));
+                       screen_status_message(_("Cleared queue"));
                break;
        case CMD_REPEAT:
                connection = mpdclient_get_connection(c);

diff --git a/src/screen_browser.c b/src/screen_browser.c
index 31c5b6525f68fca91068920679c42e56bb0aeebf..936bd1f26ac5d360c69d0c55ceab80b598c5f318 100644 (file)
--- a/src/screen_browser.c
+++ b/src/screen_browser.c
@@ -169,7 +169,7 @@ enqueue_and_play(struct mpdclient *c, struct filelist_entry *entry)
                entry->flags |= HIGHLIGHT;
 #endif
                strfsong(buf, BUFSIZE, options.list_format, song);
-               screen_status_printf(_("Adding \'%s\' to playlist"), buf);
+               screen_status_printf(_("Adding \'%s\' to queue"), buf);
        }
 
        if (!mpd_run_play_id(connection, id)) {
@@ -264,7 +264,7 @@ browser_select_entry(struct mpdclient *c, struct filelist_entry *entry,
                if (mpdclient_cmd_add_path(c, mpd_directory_get_path(dir))) {
                        char *tmp = utf8_to_locale(mpd_directory_get_path(dir));
 
-                       screen_status_printf(_("Adding \'%s\' to playlist"), tmp);
+                       screen_status_printf(_("Adding \'%s\' to queue"), tmp);
                        g_free(tmp);
                }
 
@@ -289,7 +289,7 @@ browser_select_entry(struct mpdclient *c, struct filelist_entry *entry,
                        char buf[BUFSIZE];
 
                        strfsong(buf, BUFSIZE, options.list_format, song);
-                       screen_status_printf(_("Adding \'%s\' to playlist"), buf);
+                       screen_status_printf(_("Adding \'%s\' to queue"), buf);
                }
 #ifndef NCMPC_MINI
        } else {

diff --git a/src/screen_help.c b/src/screen_help.c
index 913ab5fa80884521a2da31c0faf29a1777b95cd7..5441b7bd712529ed7ea5fadebfa483d96753fd5e 100644 (file)
--- a/src/screen_help.c
+++ b/src/screen_help.c
@@ -116,7 +116,7 @@ static const struct help_text_row help_text[] = {
 
        { 0, CMD_NONE, NULL },
        { 0, CMD_NONE, NULL },
-       { 1, CMD_NONE, N_("Playlist screen") },
+       { 1, CMD_NONE, N_("Queue screen") },
        { 2, CMD_NONE, NULL },
        { 0, CMD_PLAY, N_("Play") },
        { 0, CMD_DELETE, NULL },
@@ -135,7 +135,7 @@ static const struct help_text_row help_text[] = {
        { 2, CMD_NONE, NULL },
        { 0, CMD_PLAY, N_("Enter directory/Select and play song") },
        { 0, CMD_SELECT, NULL },
-       { 0, CMD_ADD, N_("Append song to playlist") },
+       { 0, CMD_ADD, N_("Append song to queue") },
        { 0, CMD_SAVE_PLAYLIST, NULL },
        { 0, CMD_DELETE, N_("Delete playlist") },
        { 0, CMD_GO_PARENT_DIRECTORY, NULL },
@@ -150,7 +150,7 @@ static const struct help_text_row help_text[] = {
        { 0, CMD_SCREEN_SEARCH, N_("Search") },
        { 0, CMD_PLAY, N_("Select and play") },
        { 0, CMD_SELECT, NULL },
-       { 0, CMD_ADD, N_("Append song to playlist") },
+       { 0, CMD_ADD, N_("Append song to queue") },
        { 0, CMD_SELECT_ALL,     NULL },
        { 0, CMD_SEARCH_MODE, NULL },
 #endif

diff --git a/src/screen_queue.c b/src/screen_queue.c
index 50e70c4a51ddcb3a321db52455cdb3d2f9afc440..71f19a5c9c0e0ee948c5832df2addbc116de69ca 100644 (file)
--- a/src/screen_queue.c
+++ b/src/screen_queue.c
@@ -253,7 +253,7 @@ playlist_save(struct mpdclient *c, char *name, char *defaultname)
 
 
                /* query the user for a filename */
-               filename = screen_readln(_("Save playlist as"),
+               filename = screen_readln(_("Save queue as"),
                                         defaultname,
                                         NULL,
                                         gcmp);
@@ -505,9 +505,9 @@ static const char *
 screen_queue_title(char *str, size_t size)
 {
        if (options.host == NULL)
-               return _("Playlist");
+               return _("Queue");
 
-       g_snprintf(str, size, _("Playlist on %s"), options.host);
+       g_snprintf(str, size, _("Queue on %s"), options.host);
        return str;
 }
 
@@ -752,7 +752,7 @@ screen_queue_cmd(struct mpdclient *c, command_t cmd)
                        return true;
 
                if (mpd_run_shuffle_range(connection, range.start, range.end))
-                       screen_status_message(_("Shuffled playlist"));
+                       screen_status_message(_("Shuffled queue"));
                else
                        mpdclient_handle_error(c);
                return true;

diff --git a/src/title_bar.c b/src/title_bar.c
index e83156519a4890ef2a10c13248638ecdcba00b04..4d232566565a3e0b75f71f9d109c6cca187573c9 100644 (file)
--- a/src/title_bar.c
+++ b/src/title_bar.c
@@ -76,7 +76,7 @@ title_bar_paint(const struct title_bar *p, const char *title,
 #ifdef ENABLE_HELP_SCREEN
                print_hotkey(w, CMD_SCREEN_HELP, _("Help"));
 #endif
-               print_hotkey(w, CMD_SCREEN_PLAY, _("Playlist"));
+               print_hotkey(w, CMD_SCREEN_PLAY, _("Queue"));
                print_hotkey(w, CMD_SCREEN_FILE, _("Browse"));
 #ifdef ENABLE_ARTIST_SCREEN
                print_hotkey(w, CMD_SCREEN_ARTIST, _("Artist"));