Fix some easy to find double translations

A lot of these were places that should have used the same message but
didn't, or were very easy to convert to using the same message and
letting some of the burden off of the translators.

Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 12 insertions, 13 deletions

diff --git a/src/pacman/query.c b/src/pacman/query.c
index 18c69922..bd23d466 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -184,7 +184,7 @@ static int query_fileowner(alpm_list_t *targets)
 				}
 
 				if(strlen(pkgfile) > max_length) {
-					pm_fprintf(stderr, PM_LOG_ERROR, _("Path too long: %s%s\n"), root, pkgfile);
+					pm_fprintf(stderr, PM_LOG_ERROR, _("path too long: %s%s\n"), root, pkgfile);
 				}
 				/* concatenate our file and the root path */
 				strcpy(append, pkgfile);
@@ -399,7 +399,7 @@ static int check(pmpkg_t *pkg)
 	rootlen = strlen(root);
 	if(rootlen + 1 > PATH_MAX) {
 		/* we are in trouble here */
-		pm_fprintf(stderr, PM_LOG_ERROR, _("root path too long\n"));
+		pm_fprintf(stderr, PM_LOG_ERROR, _("path too long: %s%s\n"), root, "");
 		return(1);
 	}
 	strcpy(f, root);
@@ -410,7 +410,7 @@ static int check(pmpkg_t *pkg)
 		const char *path = alpm_list_getdata(i);
 
 		if(rootlen + 1 + strlen(path) > PATH_MAX) {
-			pm_fprintf(stderr, PM_LOG_WARNING, _("file path too long\n"));
+			pm_fprintf(stderr, PM_LOG_WARNING, _("path too long: %s%s\n"), root, path);
 			continue;
 		}
 		strcpy(f + rootlen, path);
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 2d4ccf37..83368085 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -987,19 +987,20 @@ int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list
 
 	/* print a prefix to the message */
 	switch(level) {
-		case PM_LOG_DEBUG:
-			pm_asprintf(string, "debug: %s", msg);
-			break;
 		case PM_LOG_ERROR:
 			pm_asprintf(string, _("error: %s"), msg);
 			break;
 		case PM_LOG_WARNING:
 			pm_asprintf(string, _("warning: %s"), msg);
 			break;
+		case PM_LOG_DEBUG:
+			pm_asprintf(string, "debug: %s", msg);
+			break;
 		case PM_LOG_FUNCTION:
-			pm_asprintf(string, _("function: %s"), msg);
+			pm_asprintf(string, "function: %s", msg);
 			break;
 		default:
+			pm_asprintf(string, "%s", msg);
 			break;
 	}
 	free(msg);
@@ -1034,19 +1035,17 @@ int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list ar
 
 	/* print a prefix to the message */
 	switch(level) {
-		case PM_LOG_DEBUG:
-			fprintf(stream, "debug: ");
-			break;
 		case PM_LOG_ERROR:
 			fprintf(stream, _("error: "));
 			break;
 		case PM_LOG_WARNING:
 			fprintf(stream, _("warning: "));
 			break;
+		case PM_LOG_DEBUG:
+			fprintf(stream, "debug: ");
+			break;
 		case PM_LOG_FUNCTION:
-		  /* TODO we should increase the indent level when this occurs so we can see
-			 * program flow easier.  It'll be fun */
-			fprintf(stream, _("function: "));
+			fprintf(stream, "function: ");
 			break;
 		default:
 			break;