From e463eecef852bafb4cc8c08efa6c137599ce158d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 25 Dec 2008 23:41:01 +0100 Subject: [PATCH] simplified translation strings Removed colon and "Error: " / "Keys - " prefix. --- src/command.c | 4 ++-- src/screen_file.c | 6 ++++-- src/screen_help.c | 14 +++++++------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/command.c b/src/command.c index 663ab7a..18394e1 100644 --- a/src/command.c +++ b/src/command.c @@ -483,14 +483,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"), + _("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"), + _("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/screen_file.c b/src/screen_file.c index 1f39395..d104341 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(_("Deleting this item is not possible")); screen_bell(); return -1; } @@ -194,7 +194,9 @@ browse_title(char *str, size_t size) path = browser.filelist->path; path_locale = utf8_to_locale(path); - g_snprintf(str, size, _("Browse: %s"), path_locale); + g_snprintf(str, size, "%s: %s", + /* translators: caption of the browser screen */ + _("Browse"), path_locale); g_free(path_locale); return str; } diff --git a/src/screen_help.c b/src/screen_help.c index ad70d8a..332873c 100644 --- a/src/screen_help.c +++ b/src/screen_help.c @@ -34,7 +34,7 @@ typedef struct { } help_text_row_t; static help_text_row_t help_text[] = { - { 1, CMD_NONE, N_("Keys - Movement") }, + { 1, CMD_NONE, N_("Movement") }, { 2, CMD_NONE, NULL }, { 0, CMD_LIST_PREVIOUS, NULL }, { 0, CMD_LIST_NEXT, NULL }, @@ -60,7 +60,7 @@ static help_text_row_t help_text[] = { { 0, CMD_NONE, NULL }, { 0, CMD_NONE, NULL }, - { 1, CMD_NONE, N_("Keys - Global") }, + { 1, CMD_NONE, N_("Global") }, { 2, CMD_NONE, NULL }, { 0, CMD_STOP, NULL }, { 0, CMD_PAUSE, NULL }, @@ -90,7 +90,7 @@ static help_text_row_t help_text[] = { { 0, CMD_NONE, NULL }, { 0, CMD_NONE, NULL }, - { 1, CMD_NONE, N_("Keys - Playlist screen") }, + { 1, CMD_NONE, N_("Playlist screen") }, { 2, CMD_NONE, NULL }, { 0, CMD_PLAY, N_("Play") }, { 0, CMD_DELETE, NULL }, @@ -104,7 +104,7 @@ static help_text_row_t help_text[] = { { 0, CMD_NONE, NULL }, { 0, CMD_NONE, NULL }, - { 1, CMD_NONE, N_("Keys - Browse screen") }, + { 1, CMD_NONE, N_("Browse screen") }, { 2, CMD_NONE, NULL }, { 0, CMD_PLAY, N_("Enter directory/Select and play song") }, { 0, CMD_SELECT, NULL }, @@ -118,7 +118,7 @@ static help_text_row_t help_text[] = { #ifdef ENABLE_SEARCH_SCREEN { 0, CMD_NONE, NULL }, { 0, CMD_NONE, NULL }, - { 1, CMD_NONE, N_("Keys - Search screen") }, + { 1, CMD_NONE, N_("Search screen") }, { 2, CMD_NONE, NULL }, { 0, CMD_SCREEN_SEARCH, N_("Search") }, { 0, CMD_PLAY, N_("Select and play") }, @@ -130,7 +130,7 @@ static help_text_row_t help_text[] = { #ifdef ENABLE_LYRICS_SCREEN { 0, CMD_NONE, NULL }, { 0, CMD_NONE, NULL }, - { 1, CMD_NONE, N_("Keys - Lyrics screen") }, + { 1, CMD_NONE, N_("Lyrics screen") }, { 2, CMD_NONE, NULL }, { 0, CMD_SCREEN_LYRICS, N_("View Lyrics") }, { 0, CMD_SELECT, N_("(Re)load lyrics") }, @@ -141,7 +141,7 @@ static help_text_row_t help_text[] = { #ifdef ENABLE_OUTPUTS_SCREEN { 0, CMD_NONE, NULL }, { 0, CMD_NONE, NULL }, - { 1, CMD_NONE, N_("Keys - Outputs screen") }, + { 1, CMD_NONE, N_("Outputs screen") }, { 2, CMD_NONE, NULL }, { 0, CMD_PLAY, N_("Enable/disable output") }, #endif -- 2.30.2