aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/colors.c4
-rw-r--r--src/command.c4
-rw-r--r--src/main.c7
-rw-r--r--src/screen.c12
-rw-r--r--src/screen_artist.c1
-rw-r--r--src/screen_file.c12
-rw-r--r--src/screen_keydef.c8
-rw-r--r--src/screen_lyrics.c2
-rw-r--r--src/screen_play.c2
9 files changed, 25 insertions, 27 deletions
diff --git a/src/colors.c b/src/colors.c
index 0bcf2782c..cc3ec5061 100644
--- a/src/colors.c
+++ b/src/colors.c
@@ -235,7 +235,7 @@ colors_start(void)
list = list->next;
}
} else if (color_definition_list && !can_change_color())
- fprintf(stderr, _("Terminal lacks support for changing colors!\n"));
+ fprintf(stderr, _("Terminal lacks support for changing colors\n"));
if (options.enable_colors) {
enum color i;
@@ -245,7 +245,7 @@ colors_start(void)
colors_update_pair(i);
}
} else if (options.enable_colors) {
- fprintf(stderr, _("Terminal lacks color capabilities!\n"));
+ fprintf(stderr, _("Terminal lacks color capabilities\n"));
options.enable_colors = 0;
}
diff --git a/src/command.c b/src/command.c
index 107167376..e04817fa1 100644
--- a/src/command.c
+++ b/src/command.c
@@ -468,14 +468,14 @@ check_key_bindings(command_definition_t *cp, char *buf, size_t bufsize)
get_key_names(CMD_SCREEN_KEYDEF,0));
#else
g_snprintf(buf, bufsize,
- _("Error: Key %s assigned to %s and %s !!!\n"),
+ _("Error: Key %s assigned to %s and %s\n"),
key2str(cp[i].keys[j]),
get_key_command_name(cp[i].command),
get_key_command_name(cmd));
#endif
} else
fprintf(stderr,
- _("Error: Key %s assigned to %s and %s !!!\n"),
+ _("Error: Key %s assigned to %s and %s\n"),
key2str(cp[i].keys[j]),
get_key_command_name(cp[i].command),
get_key_command_name(cmd));
diff --git a/src/main.c b/src/main.c
index ed76181f6..11f16acb8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -225,10 +225,11 @@ timer_reconnect(G_GNUC_UNUSED gpointer data)
#ifndef NCMPC_MINI
/* quit if mpd is pre 0.11.0 - song id not supported by mpd */
if (MPD_VERSION_LT(mpd, 0, 11, 0)) {
- screen_status_printf(_("Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"),
+ screen_status_printf(_("Error: MPD version %d.%d.%d is to old (%s needed)"),
mpd->connection->version[0],
mpd->connection->version[1],
- mpd->connection->version[2]);
+ mpd->connection->version[2],
+ "0.11.0");
mpdclient_disconnect(mpd);
doupdate();
@@ -238,7 +239,7 @@ timer_reconnect(G_GNUC_UNUSED gpointer data)
}
#endif
- screen_status_printf(_("Connected to %s!"), options.host);
+ screen_status_printf(_("Connected to %s"), options.host);
doupdate();
connected = TRUE;
diff --git a/src/screen.c b/src/screen.c
index 25c05c64f..569df7a51 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -393,7 +393,7 @@ screen_resize(struct mpdclient *c)
{
if (COLS<SCREEN_MIN_COLS || LINES<SCREEN_MIN_ROWS) {
screen_exit();
- fprintf(stderr, _("Error: Screen to small!\n"));
+ fprintf(stderr, _("Error: Screen to small\n"));
exit(EXIT_FAILURE);
}
@@ -466,7 +466,7 @@ void
screen_init(mpdclient_t *c)
{
if (COLS < SCREEN_MIN_COLS || LINES < SCREEN_MIN_ROWS) {
- fprintf(stderr, _("Error: Screen to small!\n"));
+ fprintf(stderr, _("Error: Screen to small\n"));
exit(EXIT_FAILURE);
}
@@ -601,7 +601,7 @@ screen_update(mpdclient_t *c)
screen_status_printf(_("Crossfade %d seconds"), c->status->crossfade);
if (dbupdate && dbupdate != c->status->updatingDb) {
- screen_status_printf(_("Database updated!"));
+ screen_status_printf(_("Database updated"));
mpdclient_browse_callback(c, BROWSE_DB_UPDATED, NULL);
}
@@ -734,11 +734,11 @@ screen_client_cmd(mpdclient_t *c, command_t cmd)
break;
case CMD_SHUFFLE:
if (mpdclient_cmd_shuffle(c) == 0)
- screen_status_message(_("Shuffled playlist!"));
+ screen_status_message(_("Shuffled playlist"));
break;
case CMD_CLEAR:
if (mpdclient_cmd_clear(c) == 0)
- screen_status_message(_("Cleared playlist!"));
+ screen_status_message(_("Cleared playlist"));
break;
case CMD_REPEAT:
mpdclient_cmd_repeat(c, !c->status->repeat);
@@ -755,7 +755,7 @@ screen_client_cmd(mpdclient_t *c, command_t cmd)
case CMD_DB_UPDATE:
if (!c->status->updatingDb) {
if( mpdclient_cmd_db_update(c,NULL)==0 )
- screen_status_printf(_("Database update started!"));
+ screen_status_printf(_("Database update started"));
} else
screen_status_printf(_("Database update running..."));
break;
diff --git a/src/screen_artist.c b/src/screen_artist.c
index b3429fca9..2c228834e 100644
--- a/src/screen_artist.c
+++ b/src/screen_artist.c
@@ -631,7 +631,6 @@ artist_cmd(mpdclient_t *c, command_t cmd)
/* continue and update... */
case CMD_SCREEN_UPDATE:
reload_lists(c);
- screen_status_printf(_("Screen updated!"));
return false;
case CMD_LIST_FIND:
diff --git a/src/screen_file.c b/src/screen_file.c
index b073b8710..1f39395c9 100644
--- a/src/screen_file.c
+++ b/src/screen_file.c
@@ -121,7 +121,7 @@ handle_delete(mpdclient_t *c)
entity = entry->entity;
if( entity->type!=MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
- screen_status_printf(_("You can only delete playlists!"));
+ screen_status_printf(_("You can only delete playlists"));
screen_bell();
return -1;
}
@@ -133,14 +133,14 @@ handle_delete(mpdclient_t *c)
key = tolower(screen_getch(screen.status_window.w, buf));
g_free(buf);
if( key != YES[0] ) {
- screen_status_printf(_("Aborted!"));
+ screen_status_printf(_("Aborted"));
return 0;
}
if( mpdclient_cmd_delete_playlist(c, plf->path) )
return -1;
- screen_status_printf(_("Playlist deleted!"));
+ screen_status_printf(_("Playlist deleted"));
return 0;
}
@@ -239,8 +239,6 @@ browse_cmd(mpdclient_t *c, command_t cmd)
list_window_check_selected(browser.lw,
filelist_length(browser.filelist));
file_repaint();
-
- screen_status_printf(_("Screen updated!"));
return false;
case CMD_DB_UPDATE:
@@ -252,11 +250,11 @@ browse_cmd(mpdclient_t *c, command_t cmd)
if (strcmp(browser.filelist->path, "")) {
char *path_locale =
utf8_to_locale(browser.filelist->path);
- screen_status_printf(_("Database update of %s started!"),
+ screen_status_printf(_("Database update of %s started"),
path_locale);
g_free(path_locale);
} else
- screen_status_printf(_("Database update started!"));
+ screen_status_printf(_("Database update started"));
/* set updatingDb to make shure the browse callback gets called
* even if the updated has finished before status is updated */
diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index d55d4c0d2..02ef177d8 100644
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.c
@@ -66,7 +66,7 @@ apply_keys(void)
size_t size = command_list_length * sizeof(command_definition_t);
memcpy(orginal_cmds, cmds, size);
- screen_status_printf(_("You have new key bindings!"));
+ screen_status_printf(_("You have new key bindings"));
} else
screen_status_printf(_("Keybindings unchanged."));
}
@@ -159,7 +159,7 @@ assign_new_key(WINDOW *w, int cmd_index, int key_index)
g_free(buf);
if (key==ERR) {
- screen_status_printf(_("Aborted!"));
+ screen_status_printf(_("Aborted"));
return;
}
@@ -212,7 +212,8 @@ list_callback(unsigned idx, int *highlight, G_GNUC_UNUSED void *data)
cmds[subcmd].keys[idx]);
return buf;
} else if (idx == subcmd_addpos) {
- g_snprintf(buf, BUFSIZE, _("%d. Add new key "), idx + 1);
+ g_snprintf(buf, BUFSIZE, "%d. %s",
+ idx + 1, _("Add new key"));
return buf;
}
}
@@ -258,7 +259,6 @@ keydef_open(G_GNUC_UNUSED mpdclient_t *c)
cmds = g_malloc0(cmds_size);
memcpy(cmds, current_cmds, cmds_size);
command_list_length += STATIC_ITEMS;
- screen_status_printf(_("Welcome to the key editor!"));
}
subcmd = -1;
diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index 2d61bc092..93a47cc8d 100644
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@ -323,7 +323,7 @@ lyrics_cmd(mpdclient_t *c, command_t cmd)
case CMD_ADD:
if (current.loader == NULL && current.artist != NULL &&
current.title != NULL && store_lyr_hd() == 0)
- screen_status_message (_("Lyrics saved!"));
+ screen_status_message (_("Lyrics saved"));
return true;
case CMD_LYRICS_UPDATE:
if (c->song != NULL) {
diff --git a/src/screen_play.c b/src/screen_play.c
index 6fd586af9..b4fb15f57 100644
--- a/src/screen_play.c
+++ b/src/screen_play.c
@@ -258,7 +258,7 @@ playlist_save(mpdclient_t *c, char *name, char *defaultname)
return error;
}
- screen_status_printf(_("Aborted!"));
+ screen_status_printf(_("Aborted"));
}
g_free(filename);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 00:17:32 +0000