diff --git a/src/conf.c b/src/conf.c
index 06866c13e44039b777a5740f8bfcfbea43b1f3b1..cb8ba0eb247e17ea115376a24fa1ecb08042aa93 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
#include <glib.h>
#include <ncurses.h>
-
#include "config.h"
+#include "ncmpc.h"
#include "options.h"
#include "support.h"
#include "command.h"
#include "colors.h"
#include "conf.h"
-#ifdef DEBUG
-#define D(x) x
-#else
-#define D(x)
-#endif
-
#define ENABLE_OLD_COLOR_SYNTAX
#define MAX_LINE_LENGTH 1024
else if( isdigit(c) )
state = KEY_PARSER_DEC;
else {
- fprintf(stderr, "Error: Unsupported key definition - %s\n", str);
+ fprintf(stderr,
+ _("Error: Unsupported key definition - %s\n"),
+ str);
return -1;
}
break;
case KEY_PARSER_CHAR:
if( next!='\'' )
{
- fprintf(stderr, "Error: Unsupported key definition - %s\n", str);
+ fprintf(stderr,
+ _("Error: Unsupported key definition - %s\n"),
+ str);
return -1;
}
value = c;
case KEY_PARSER_HEX:
if( !isdigit(next) )
{
- fprintf(stderr, "Error: Digit expexted after 0x - %s\n", str);
+ fprintf(stderr,_("Error: Digit expexted after 0x - %s\n"), str);
return -1;
}
value = (int) strtol(str+(i+1), end, 16);
buf[j++] = str[i++];
if( (cmd=get_key_command_from_name(buf)) == CMD_NONE )
{
- fprintf(stderr, "Error: Unknown key command %s\n", buf);
+ fprintf(stderr, _("Error: Unknown key command %s\n"), buf);
return -1;
}
len = strlen(buf);
if( len==0 )
{
- fprintf(stderr,"Error: Incomplete key definition - %s\n", str);
+ fprintf(stderr,_("Error: Incomplete key definition - %s\n"), str);
return -1;
}
}
if( key<0 )
{
- fprintf(stderr,"Error: Bad key definition - %s\n", str);
+ fprintf(stderr,_("Error: Bad key definition - %s\n"), str);
return -1;
}
color=colors_str2color(buf);
if( color<0 )
{
- fprintf(stderr, "Error: Bad color %s [%d]\n", buf, color);
+ fprintf(stderr,_("Error: Bad color %s [%d]\n"), buf, color);
return -1;
}
name = g_strdup(buf);
len = strlen(buf);
if( len==0 )
{
- fprintf(stderr,"Error: Incomplete color definition - %s\n", str);
+ fprintf(stderr,_("Error: Incomplete color definition - %s\n"), str);
g_free(name);
return -1;
}
}
if( value<0 || i!=3)
{
- fprintf(stderr,"Error: Bad color definition - %s\n", str);
+ fprintf(stderr,_("Error: Bad color definition - %s\n"), str);
g_free(name);
return -1;
}
if( !match_found )
fprintf(stderr,
- "Unknown configuration parameter: %s\n",
+ _("Unknown configuration parameter: %s\n"),
name);
#ifdef DEBUG
printf( " %s = %s %s\n",