* Updated Italian translation

* Updated pot translation templates
* Located culprit of progress bar moving when unicode characters are used,
  added a TODO note about it
* Removed '(target)' string from the sync.c error message, just like we did
  from add.c yesterday
* Updated my TODO

4 files changed, 72 insertions, 62 deletions

diff --git a/src/pacman/po/it.po b/src/pacman/po/it.po
index 6866e003..40960479 100644
--- a/src/pacman/po/it.po
+++ b/src/pacman/po/it.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-13 15:47+0100\n"
-"PO-Revision-Date: 2007-02-13 16:10+0100\n"
+"POT-Creation-Date: 2007-02-14 18:25+0100\n"
+"PO-Revision-Date: 2007-02-14 18:30+0100\n"
 "Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
 "Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -59,10 +59,10 @@ msgstr ":: %s: richiede %s"
 msgid ":: %s: conflicts with %s"
 msgstr ":: %s: va in conflitto con %s"
 
-#: src/pacman/add.c:127 src/pacman/sync.c:665
+#: src/pacman/add.c:127
 #, c-format
-msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
-msgstr "%s%s è presente in \"%s\" e in \"%s\"\n"
+msgid "%s%s exists in both '%s' and '%s'\n"
+msgstr "%s%s è presente in '%s' e in '%s'\n"
 
 #: src/pacman/add.c:134 src/pacman/sync.c:672
 #, c-format
@@ -937,6 +937,11 @@ msgstr ""
 msgid "Proceed with installation? [Y/n] "
 msgstr "Procedere con l'installazione? [Y/n] "
 
+#: src/pacman/sync.c:665
+#, c-format
+msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
+msgstr "%s%s è presente in \"%s\" e in \"%s\"\n"
+
 #: src/pacman/trans.c:52
 msgid "checking dependencies... "
 msgstr "controllo delle dipendenze in corso... "
diff --git a/src/pacman/po/pacman.pot b/src/pacman/po/pacman.pot
index 105e68dc..5358ef1b 100644
--- a/src/pacman/po/pacman.pot
+++ b/src/pacman/po/pacman.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-12 10:17-0500\n"
+"POT-Creation-Date: 2007-02-14 14:33-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,7 +57,7 @@ msgstr ""
 
 #: src/pacman/add.c:127 src/pacman/sync.c:665
 #, c-format
-msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n"
+msgid "%s%s exists in both '%s' and '%s'\n"
 msgstr ""
 
 #: src/pacman/add.c:134 src/pacman/sync.c:672
@@ -160,161 +160,160 @@ msgstr ""
 msgid "Installed as a dependency for another package"
 msgstr ""
 
-#: src/pacman/package.c:63 src/pacman/package.c:85
+#: src/pacman/package.c:63 src/pacman/package.c:87
 msgid "Unknown"
 msgstr ""
 
-#: src/pacman/package.c:68 src/pacman/package.c:119
+#: src/pacman/package.c:67 src/pacman/package.c:118
+msgid "Description    : "
+msgstr ""
+
+#: src/pacman/package.c:70 src/pacman/package.c:124
 #, c-format
 msgid "Name           : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:69 src/pacman/package.c:120
+#: src/pacman/package.c:71 src/pacman/package.c:125
 #, c-format
 msgid "Version        : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:70
+#: src/pacman/package.c:72
 #, c-format
 msgid "URL            : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:71
+#: src/pacman/package.c:73
 msgid "License        :"
 msgstr ""
 
-#: src/pacman/package.c:72 src/pacman/package.c:121
+#: src/pacman/package.c:74 src/pacman/package.c:126
 msgid "Groups         :"
 msgstr ""
 
-#: src/pacman/package.c:73 src/pacman/package.c:122
+#: src/pacman/package.c:75 src/pacman/package.c:127
 msgid "Provides       :"
 msgstr ""
 
-#: src/pacman/package.c:74 src/pacman/package.c:123
+#: src/pacman/package.c:76 src/pacman/package.c:128
 msgid "Depends On     :"
 msgstr ""
 
-#: src/pacman/package.c:75 src/pacman/package.c:124
+#: src/pacman/package.c:77 src/pacman/package.c:129
 msgid "Removes        :"
 msgstr ""
 
-#: src/pacman/package.c:78
+#: src/pacman/package.c:80
 msgid "Required By    :"
 msgstr ""
 
-#: src/pacman/package.c:80 src/pacman/package.c:125
+#: src/pacman/package.c:82 src/pacman/package.c:130
 msgid "Conflicts With :"
 msgstr ""
 
-#: src/pacman/package.c:81
+#: src/pacman/package.c:83
 #, c-format
 msgid "Installed Size : %ld K\n"
 msgstr ""
 
-#: src/pacman/package.c:82
+#: src/pacman/package.c:84
 #, c-format
 msgid "Packager       : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:83
+#: src/pacman/package.c:85
 #, c-format
 msgid "Architecture   : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:84
+#: src/pacman/package.c:86
 #, c-format
 msgid "Build Date     : %s %s\n"
 msgstr ""
 
-#: src/pacman/package.c:85
+#: src/pacman/package.c:87
 #, c-format
 msgid "Build Type     : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:87
+#: src/pacman/package.c:89
 #, c-format
 msgid "Install Date   : %s %s\n"
 msgstr ""
 
-#: src/pacman/package.c:88
+#: src/pacman/package.c:90
 #, c-format
 msgid "Install Reason : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:90
+#: src/pacman/package.c:92
 #, c-format
 msgid "Install Script : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:91
+#: src/pacman/package.c:93
 msgid "Yes"
 msgstr ""
 
-#: src/pacman/package.c:91
+#: src/pacman/package.c:93
 msgid "No"
 msgstr ""
 
-#: src/pacman/package.c:93 src/pacman/package.c:130
-#, c-format
-msgid "Description    : "
-msgstr ""
-
-#: src/pacman/package.c:118
+#: src/pacman/package.c:123
 #, c-format
 msgid "Repository     : %s\n"
 msgstr ""
 
-#: src/pacman/package.c:126
+#: src/pacman/package.c:131
 msgid "Replaces       :"
 msgstr ""
 
-#: src/pacman/package.c:127
+#: src/pacman/package.c:132
 #, c-format
 msgid "Download Size  : %6.2f K\n"
 msgstr ""
 
-#: src/pacman/package.c:128
+#: src/pacman/package.c:133
 #, c-format
 msgid "Installed Size : %6.2f K\n"
 msgstr ""
 
-#: src/pacman/package.c:135
+#: src/pacman/package.c:141
 #, c-format
 msgid "MD5 Sum        : %s"
 msgstr ""
 
-#: src/pacman/package.c:138
+#: src/pacman/package.c:144
 #, c-format
 msgid "SHA1 Sum       : %s"
 msgstr ""
 
-#: src/pacman/package.c:149
+#: src/pacman/package.c:155
 #, c-format
 msgid "Backup Files :\n"
 msgstr ""
 
-#: src/pacman/package.c:169
+#: src/pacman/package.c:175
 #, c-format
 msgid "error calculating checksums for %s\n"
 msgstr ""
 
-#: src/pacman/package.c:182
+#: src/pacman/package.c:188
 #, c-format
 msgid "MODIFIED\t%s\n"
 msgstr ""
 
-#: src/pacman/package.c:184
+#: src/pacman/package.c:190
 #, c-format
 msgid "Not Modified\t%s\n"
 msgstr ""
 
-#: src/pacman/package.c:189
+#: src/pacman/package.c:195
 #, c-format
 msgid "MISSING\t\t%s\n"
 msgstr ""
 
-#: src/pacman/package.c:222
+#: src/pacman/package.c:228
 #, c-format
 msgid "No changelog available for '%s'.\n"
 msgstr ""
@@ -594,7 +593,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:158
 #, c-format
-msgid "      --cachedir <dir> set an alternate database location\n"
+msgid "      --cachedir <dir> set an alternate package cache location\n"
 msgstr ""
 
 #: src/pacman/pacman.c:171
@@ -631,34 +630,38 @@ msgstr ""
 msgid "only one operation may be used at a time\n"
 msgstr ""
 
-#: src/pacman/pacman.c:461
+#: src/pacman/pacman.c:444
+msgid "warning: default locale is invalid; using default \"C\" locale"
+msgstr ""
+
+#: src/pacman/pacman.c:463
 #, c-format
 msgid "failed to initilize alpm library (%s)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:494
+#: src/pacman/pacman.c:496
 msgid "you cannot perform this operation unless you are root.\n"
 msgstr ""
 
-#: src/pacman/pacman.c:510
+#: src/pacman/pacman.c:512
 #, c-format
 msgid "failed to parse config (%s)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
+#: src/pacman/pacman.c:522 src/pacman/remove.c:125 src/pacman/util.c:323
 msgid "Targets:"
 msgstr ""
 
-#: src/pacman/pacman.c:526
+#: src/pacman/pacman.c:528
 #, c-format
 msgid "could not register 'local' database (%s)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:533
+#: src/pacman/pacman.c:535
 msgid "no targets specified (use -h for help)\n"
 msgstr ""
 
-#: src/pacman/pacman.c:546
+#: src/pacman/pacman.c:548
 msgid "no operation specified (use -h for help)\n"
 msgstr ""
 
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 54ef205f..654c4613 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -662,7 +662,7 @@ int pacman_sync(alpm_list_t *targets)
 				pmconflict_t *conflict = alpm_list_getdata(i);
 				switch(alpm_conflict_get_type(conflict)) {
 				case PM_CONFLICT_TYPE_TARGET:
-					MSG(NL, _("%s%s exists in \"%s\" (target) and \"%s\" (target)\n"),
+					MSG(NL, _("%s%s exists in both '%s' and '%s'\n"),
 							alpm_option_get_root(),
 							alpm_conflict_get_file(conflict),
 							alpm_conflict_get_target(conflict),
diff --git a/src/pacman/trans.c b/src/pacman/trans.c
index a354955f..22443216 100644
--- a/src/pacman/trans.c
+++ b/src/pacman/trans.c
@@ -281,7 +281,7 @@ void cb_trans_progress(pmtransprog_t event, char *pkgname, const int percent,
 	/* size of line to allocate for text printing (e.g. not progressbar) */
 	const int infolen = 50;
 	int i, digits, textlen, pkglen;
-	char *ptr = NULL;
+	char *opr = NULL;
 
 	if(config->noprogressbar) {
 		return;
@@ -311,16 +311,16 @@ void cb_trans_progress(pmtransprog_t event, char *pkgname, const int percent,
 	prevpercent=percent;
 	switch (event) {
 		case PM_TRANS_PROGRESS_ADD_START:
-			ptr = _("installing");
+			opr = _("installing");
 			break;
 		case PM_TRANS_PROGRESS_UPGRADE_START:
-			ptr = _("upgrading");
+			opr = _("upgrading");
 			break;
 		case PM_TRANS_PROGRESS_REMOVE_START:
-			ptr = _("removing");
+			opr = _("removing");
 			break;
 		case PM_TRANS_PROGRESS_CONFLICTS_START:
-			ptr = _("checking for file conflicts");
+			opr = _("checking for file conflicts");
 			break;
 	}
 
@@ -334,19 +334,21 @@ void cb_trans_progress(pmtransprog_t event, char *pkgname, const int percent,
 	/* determine room left for non-digits text [not ( 1/12) part] */
 	textlen = infolen - 3 - (2 * digits);
 	/* room left for package name */
-	pkglen = textlen - mbstowcs(NULL, ptr, 0) - 1;
+	pkglen = textlen - mbstowcs(NULL, opr, 0) - 1;
 
 	switch (event) {
 		case PM_TRANS_PROGRESS_ADD_START:
 		case PM_TRANS_PROGRESS_UPGRADE_START:
 		case PM_TRANS_PROGRESS_REMOVE_START:
 			/* TODO clean up so digits and pkglen aren't passed twice */
+			/* TODO we may need some sort of wchar_t wprintf output here in order
+			 * to get the lengths right, prinf works on bytes and not chars */
 			printf("(%*d/%*d) %s %-*.*s", digits, remain, digits, howmany,
-			       ptr, pkglen, pkglen, pkgname);
+			       opr, pkglen, pkglen, pkgname);
 			break;
 		case PM_TRANS_PROGRESS_CONFLICTS_START:
 			printf("(%*d/%*d) %-*s", digits, remain, digits, howmany,
-			       textlen, ptr);
+			       textlen, opr);
 			break;
 	}