Merged frugalware changes. Added a few other minor things too, but there's alot

to list.  The diff should show you 8)

1 files changed, 2 insertions, 2 deletions

diff --git a/src/pacman/log.h b/src/pacman/log.h
index bafaae81..ff7fde50 100644
--- a/src/pacman/log.h
+++ b/src/pacman/log.h
@@ -23,11 +23,11 @@
 
 #define MSG(line, fmt, args...) pm_fprintf(stdout, line, fmt, ##args)
 #define ERR(line, fmt, args...) do { \
-	pm_fprintf(stderr, line, "error: "); \
+	pm_fprintf(stderr, line, _("error: ")); \
 	pm_fprintf(stderr, CL, fmt, ##args); \
 } while(0)
 #define WARN(line, fmt, args...) do { \
-	pm_fprintf(stderr, line, "warning: "); \
+	pm_fprintf(stderr, line, _("warning: ")); \
 	pm_fprintf(stderr, CL, fmt, ##args); \
 } while(0)