[URGENT] Bad translatable string for folder merge dialog

[Luca Ferretti <lferrett gnome org>]

The way to build the secondary message for merge folder dialog[1] is
really really bad from a localization point of view.


/* Translators: the first string in this printf
 * is the "An older/A newer/Another" string defined some lines before.
 */
secondary_text = g_strdup_printf (
	_("%s folder with the same name already exists in \"%s\".\n"
	  "Merging will ask for confirmation before "
	  "replacing any files in the folder that "
	  "conflict with the files being copied."),
	time_str,
	dest_dir_name);

Could we change it ASAP, providind 4 different translatable strings:

1.  "An older older with the same name already exists in \"%s\".\n"
2.  "An newer folder with the same name already exists in \"%s\".\n"
3.  "Another folder with the same name already exists in \"%s\".\n"
4.  "Merging will ask for confirmation before replacing any files in the
folder that conflict with the files being copied."

Same, of course, for the similar message related to files:

	secondary_text = g_strdup_printf (
			_("%s file with the same name already exists in \"%s\".\n"
			  "Replacing it will overwrite its content."),
			time_str,
			dest_dir_name);

Cheers, Luca

[1]
http://git.gnome.org/browse/nautilus/tree/libnautilus-private/nautilus-file-conflict-dialog.c?h=gnome-2-32#n163