share/gnome/ -> share/.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9226 df743ca5-7f9a-e211-a948-0013205c9059

15 files changed, 1869 insertions, 0 deletions

diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
new file mode 100644
index 000000000..c46a735ab
--- /dev/null
+++ b/print/gnome-cups-manager/Makefile
@@ -0,0 +1,51 @@
+# New ports collection makefile for:	gnome-cups-manager
+# Date created:				14 Jul 2003
+# Whom:					Glenn Johnson <glennpj@charter.net>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	gnome-cups-manager
+PORTVERSION=	0.31
+PORTREVISION=	7
+PORTEPOCH=	1
+CATEGORIES=	print gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Admistration tool for cups
+
+LIB_DEPENDS=	gnomecups-1.0.1:${PORTSDIR}/print/libgnomecups
+RUN_DEPENDS=	gnomesu:${PORTSDIR}/security/libgnomesu
+
+USE_AUTOTOOLS=	libtool:15
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \
+		desktopfileutils
+USE_GETTEXT=	yes
+INSTALLS_ICONS=	yes
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+post-patch:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
+		< ${FILESDIR}/gnome-cups-manager.desktop \
+		> ${WRKSRC}/gnome-cups-manager.desktop
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
+		${WRKSRC}/libgnomecups/gnome-cups-ui-driver.c
+
+post-install:
+	${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/gnome-cups-manager.desktop \
+		${PREFIX}/share/applications
+
+.include <bsd.port.mk>
diff --git a/print/gnome-cups-manager/distinfo b/print/gnome-cups-manager/distinfo
new file mode 100644
index 000000000..61c13e76c
--- /dev/null
+++ b/print/gnome-cups-manager/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gnome-cups-manager-0.31.tar.bz2) = 4144b2cf05e381e89fed066793e3b249
+SHA256 (gnome2/gnome-cups-manager-0.31.tar.bz2) = 8ccfd3816757fa8127cf96a530e374c81a449fbcd9391d2d3e1bac29f54ab3e6
+SIZE (gnome2/gnome-cups-manager-0.31.tar.bz2) = 507851
diff --git a/print/gnome-cups-manager/files/patch-24_printer_properties_name_entry b/print/gnome-cups-manager/files/patch-24_printer_properties_name_entry
new file mode 100644
index 000000000..ecf4d8704
--- /dev/null
+++ b/print/gnome-cups-manager/files/patch-24_printer_properties_name_entry
@@ -0,0 +1,41 @@
+diff -Nru gnome-cups-manager-0.25/gnome-cups-manager/printer-properties.c gnome-cups-manager-0.25.new/gnome-cups-manager/printer-properties.c
+--- gnome-cups-manager-0.25/gnome-cups-manager/printer-properties.c	2004-09-08 14:46:49.000000000 -0400
++++ gnome-cups-manager/printer-properties.c	2004-09-16 17:27:12.400231616 -0400
+@@ -77,16 +77,31 @@
+ label_vs_entry (GladeXML *xml,
+ 		char const *entry, char const *label, char const *val)
+ {
+-	GtkWidget *w = glade_xml_get_widget (xml, entry);
+-	if (gnome_cups_can_admin ())
++	GtkWidget *w;
++	
++	/*
++	** If we can admin, use the entry widget so we can change settings.
++	** Make sure we don't use the entry box on the name widgets, as 
++	** cups won't let us change it anyway.
++	*/
++	if (gnome_cups_can_admin () && !g_str_equal(label, "name_label"))
++	{
++		/* Show the entry */
++		w = glade_xml_get_widget (xml, entry);
+ 		gtk_entry_set_text (GTK_ENTRY (w), val);
+-	else
+-		gtk_widget_hide (w);
+-	w = glade_xml_get_widget (xml, label);
+-	if (gnome_cups_can_admin ())
++		/* Hide the label */
++		w = glade_xml_get_widget (xml, label);
+ 		gtk_widget_hide (w);
++	}
+ 	else
++	{
++		/* Hide the entry */
++		w = glade_xml_get_widget (xml, entry);
++		gtk_widget_hide (w);
++		/* Show the label */
++		w = glade_xml_get_widget (xml, label);
+ 		gtk_label_set_text (GTK_LABEL (w), val);
++	}
+ }
+ 
+ static void
diff --git a/print/gnome-cups-manager/files/patch-25_properties_on_add b/print/gnome-cups-manager/files/patch-25_properties_on_add
new file mode 100644
index 000000000..3398d2529
--- /dev/null
+++ b/print/gnome-cups-manager/files/patch-25_properties_on_add
@@ -0,0 +1,14 @@
+--- gnome-cups-add/add-printer.c.old	2004-09-17 01:12:13.571608840 -0400
++++ gnome-cups-add/add-printer.c	2004-09-17 01:12:38.661794552 -0400
+@@ -197,11 +197,6 @@
+ 	g_list_free (existing);
+ 
+ 	if (add_cups_printer (xml, uri, ppd, name)) {
+-		GtkWidget *toplevel = glade_xml_get_widget (xml, "add_printer_window");
+-		char const *args[] = { "-p", NULL };
+-		args[1] = name;
+-		gnome_cups_spawn ("gnome-cups-manager", G_N_ELEMENTS (args), args, FALSE, toplevel);
+-		gtk_widget_destroy (toplevel);
+ 		g_object_unref (xml);
+ 		gtk_main_quit ();
+ 	}
diff --git a/print/gnome-cups-manager/files/patch-26_remove-no-cups-dialog b/print/gnome-cups-manager/files/patch-26_remove-no-cups-dialog
new file mode 100644
index 000000000..c0b5bd968
--- /dev/null
+++ b/print/gnome-cups-manager/files/patch-26_remove-no-cups-dialog
@@ -0,0 +1,24 @@
+Index: gnome-cups-manager/gnome-cups-icon.c
+===================================================================
+RCS file: /cvs/gnome/gnome-cups-manager/gnome-cups-manager/gnome-cups-icon.c,v
+retrieving revision 1.3
+diff -u -r1.3 gnome-cups-icon.c
+--- gnome-cups-manager/gnome-cups-icon.c	9 Jun 2004 13:46:18 -0000	1.3
++++ gnome-cups-manager/gnome-cups-icon.c	4 Aug 2004 10:35:09 -0000
+@@ -63,15 +63,7 @@
+ 		return FALSE;
+ 	} else {		
+ 		if (++tries == 3) {
+-			GtkWidget *dialog;
+-			/* FIXME: dialog text */
+-			dialog = gtk_message_dialog_new (NULL, 
+-							 GTK_DIALOG_DESTROY_WITH_PARENT, 
+-							 GTK_MESSAGE_ERROR,
+-							 GTK_BUTTONS_OK,
+-							 _("Could not start the printer tray icon, because the CUPS server could not be contacted."));
+-			gtk_dialog_run (GTK_DIALOG (dialog));
+-			gtk_widget_destroy (dialog); 
++			g_warning (_("Could not start the printer tray icon, because the CUPS server could not be contacted."));
+ 			
+ 			remove_from_session ();
+ 			
diff --git a/print/gnome-cups-manager/files/patch-27_dont-request-additional-attributes b/print/gnome-cups-manager/files/patch-27_dont-request-additional-attributes
new file mode 100644
index 000000000..deee217a7
--- /dev/null
+++ b/print/gnome-cups-manager/files/patch-27_dont-request-additional-attributes
@@ -0,0 +1,15 @@
+diff -urN gnome-cups-manager-0.31.orig/libgnomecups/gnome-cups-ui-driver.c gnome-cups-manager-0.31/libgnomecups/gnome-cups-ui-driver.c
+--- gnome-cups-manager-0.31.orig/libgnomecups/gnome-cups-ui-driver.c	2005-02-03 21:10:04.000000000 +0100
++++ libgnomecups/gnome-cups-ui-driver.c	2006-07-24 11:10:10.000000000 +0200
+@@ -151,8 +151,11 @@
+ 		"ppd-make-and-model",
+ 	};
+ 	ipp_t *request = gnome_cups_request_new (CUPS_GET_PPDS);
++	/* removed since the default is to report all properties anyway, see
++	 * Debian bug #374620
+ 	gnome_cups_request_add_requested_attributes (request, IPP_TAG_PRINTER,
+ 		G_N_ELEMENTS (attrs), (char **)attrs);
++	 */
+ 	return gnome_cups_request_execute (request, NULL, "/", NULL);
+ }
+ 
diff --git a/print/gnome-cups-manager/files/patch-change_uri_fix b/print/gnome-cups-manager/files/patch-change_uri_fix
new file mode 100644
index 000000000..e52577d1e
--- /dev/null
+++ b/print/gnome-cups-manager/files/patch-change_uri_fix
@@ -0,0 +1,25 @@
+Index: gnome-cups-manager/printer-properties.c
+===================================================================
+RCS file: /cvs/gnome/gnome-cups-manager/gnome-cups-manager/printer-properties.c,v
+retrieving revision 1.30
+diff -u -r1.30 printer-properties.c
+--- gnome-cups-manager/printer-properties.c	4 Mar 2005 14:36:29 -0000	1.30
++++ gnome-cups-manager/printer-properties.c	29 Sep 2005 15:51:09 -0000
+@@ -583,7 +583,7 @@
+ 	if (uri != NULL) {
+ 		ipp_t *request = gnome_cups_request_new_for_printer (
+ 			CUPS_ADD_PRINTER, printer);
+-		ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
++		ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI,
+ 			"device-uri", NULL, gnome_cups_strdup (uri));
+ 		gnome_cups_request_execute_async (request, NULL, "/admin/", NULL, NULL, NULL);
+ 		g_free (uri);
+@@ -624,7 +624,7 @@
+ 	gtk_widget_show (cs);
+ 	g_signal_connect_object (cs,
+ 		"changed",
+-		G_CALLBACK (cb_connection_changed), xml, 0);
++		G_CALLBACK (cb_connection_changed), printer, 0);
+ }
+ 
+ static void
diff --git a/print/gnome-cups-manager/files/patch-gutenprint_driver_name b/print/gnome-cups-manager/files/patch-gutenprint_driver_name
new file mode 100644
index 000000000..db2d8c7bd
--- /dev/null
+++ b/print/gnome-cups-manager/files/patch-gutenprint_driver_name
@@ -0,0 +1,62 @@
+diff -Nur gnome-cups-manager-0.31/libgnomecups/gnome-cups-ui-driver.c gnome-cups-manager-0.31.new/libgnomecups/gnome-cups-ui-driver.c
+--- gnome-cups-manager-0.31/libgnomecups/gnome-cups-ui-driver.c	2006-05-18 11:58:51.000000000 +0200
++++ libgnomecups/gnome-cups-ui-driver.c	2006-05-18 11:58:56.000000000 +0200
+@@ -267,6 +267,7 @@
+ 		static char const *dymo[] = { "Dymo-CoStar", "DYMO", NULL };
+ 		static char const *canon[] = { "Canon Inc. (Kosugi Offic", "CANON", NULL };
+ 		static char const *generic[] = { "Raw Queue", "Postscript", NULL };
++		static char const *oce[] = { "Océ", "Oc�", NULL };
+ 
+ 		alias_to_vendor_map = g_hash_table_new (str_case_hash, str_case_equal);
+ 		vendor_to_alias_map = g_hash_table_new (str_case_hash, str_case_equal);
+@@ -279,6 +280,7 @@
+ 		add_vendor_aliases ("HP",	hp);
+ 		add_vendor_aliases ("Dymo",	dymo);
+ 		add_vendor_aliases ("Canon",	canon);
++		add_vendor_aliases ("Oce",	oce);
+ 		add_vendor_aliases ("Generic",	generic);
+ 	}
+ 
+@@ -325,16 +327,26 @@
+ 	 * 	<MODEL_IN_CAPS> - CUPS+Gimp-Print vm.n.o'
+          * The filename may have a subdirectory--treat the subdir as a language, and set
+          * the driver string accordingly. Use the regular driver string for the "C" language. */
+-	} else if (NULL != (tmp = strstr (without_vendor, " - CUPS+Gimp-Print v"))) {
++	} else if (NULL != (tmp = strstr (without_vendor, " - CUPS+Gimp-Print v"))
++		   || NULL != (tmp = strstr (without_vendor, " - CUPS+Gutenprint v"))) {
++		char *ppd_filename = g_strdup(ppd->filename);
++		char *basename = strrchr (ppd_filename, '/');
++		if (basename)
++			*basename++ = '\0';
++		language = strrchr (ppd_filename, '/');
++		if (language)
++			*language++ = '\0';
++		
++		//printf("FILENAME: %s | %s | %s\n", ppd_filename, language, basename);
+ 		model = g_strndup (without_vendor, tmp - without_vendor);
+-                if((NULL != (language_position = strstr (ppd->filename, "/"))) &&
+-                   strncmp ("C/", ppd->filename, 2) &&
+-                   strncmp ("stp/", ppd->filename, 4)) {
+-                    language = g_strndup (ppd->filename, language_position - ppd->filename);
+-                    driver = g_strdup_printf (_("High Quality Image (GIMP-Print) (%s)"), language);
+-                    g_free(language);
++		if (language &&
++		    strcmp("C", language) &&
++		    (NULL != (language_position = strstr (ppd->filename, "/"))) &&
++		    strncmp ("C/", ppd->filename, 2) &&
++		    strncmp ("stp/", ppd->filename, 4)) {
++                    driver = g_strdup_printf (_("High Quality Image (Gutenprint) (%s)"), language);
+                 } else {
+-                    driver = g_strdup (_("High Quality Image (GIMP-Print)"));
++                    driver = g_strdup (_("High Quality Image (Gutenprint)"));
+                 }
+ 
+ 	/* RH style entries
+@@ -364,6 +376,7 @@
+ 
+ 	if (without_vendor != ppd->nickname)
+ 		g_free (without_vendor);
++	//printf("FILENAME: %s | %s | %s\n", ppd->filename, ppd->model, ppd->driver);
+ }
+ 
+ static int
diff --git a/print/gnome-cups-manager/files/patch-password_field_garbage b/print/gnome-cups-manager/files/patch-password_field_garbage
new file mode 100644
index 000000000..4526a325d
--- /dev/null
+++ b/print/gnome-cups-manager/files/patch-password_field_garbage
@@ -0,0 +1,11 @@
+diff -Nur gnome-cups-manager-0.31/libgnomecups/gnome-cups-ui-connection.c gnome-cups-manager-0.31.new/libgnomecups/gnome-cups-ui-connection.c
+--- gnome-cups-manager-0.31/libgnomecups/gnome-cups-ui-connection.c	2006-05-18 12:53:57.000000000 +0200
++++ libgnomecups/gnome-cups-ui-connection.c	2006-05-18 12:55:38.000000000 +0200
+@@ -1400,7 +1400,6 @@
+ 		w =  glade_xml_get_widget (cs->xml, "smb_username_entry");
+ 		gtk_entry_set_text (GTK_ENTRY (w), username);
+ 		w =  glade_xml_get_widget (cs->xml, "smb_password_entry");
+-		gtk_entry_set_text (GTK_ENTRY (w), resource);
+ 	} else if (0 == g_ascii_strcasecmp (method, "lpd")) {
+ 		type = GCUPS_CONNECTION_LPD;
+ 
diff --git a/print/gnome-cups-manager/files/patch-select_eintr_crash b/print/gnome-cups-manager/files/patch-select_eintr_crash
new file mode 100644
index 000000000..e4e717d59
--- /dev/null
+++ b/print/gnome-cups-manager/files/patch-select_eintr_crash
@@ -0,0 +1,12 @@
+diff -Nur gnome-cups-manager-0.31/libgnomecups/snmpkit/snmpsock.C gnome-cups-manager-0.31.new/libgnomecups/snmpkit/snmpsock.C
+--- gnome-cups-manager-0.31/libgnomecups/snmpkit/snmpsock.C	2005-03-28 05:53:17.000000000 +0200
++++ libgnomecups/snmpkit/snmpsock.C	2006-05-22 20:25:42.000000000 +0200
+@@ -115,7 +115,7 @@
+     FD_SET(sock,&rfds);
+     tv.tv_sec=5;
+     tv.tv_usec=0;
+-    if((retval=select(sock+1,&rfds,NULL,NULL,&tv))==-1)
++    if((retval=select(sock+1,&rfds,NULL,NULL,&tv))==-1 && errno != EINTR)
+       throw ReceiverSelectException(errno);
+     pthread_testcancel();
+ 
diff --git a/print/gnome-cups-manager/files/patch-ui_edit_name_description b/print/gnome-cups-manager/files/patch-ui_edit_name_description
new file mode 100644
index 000000000..548d41cd9
--- /dev/null
+++ b/print/gnome-cups-manager/files/patch-ui_edit_name_description
@@ -0,0 +1,624 @@
+diff -Nur gnome-cups-manager-0.31/gnome-cups-add/add-printer.c gnome-cups-manager-0.31.new/gnome-cups-add/add-printer.c
+--- gnome-cups-manager-0.31/gnome-cups-add/add-printer.c	2006-05-12 11:08:09.000000000 +0200
++++ gnome-cups-add/add-printer.c	2006-05-12 11:08:12.000000000 +0200
+@@ -7,6 +7,7 @@
+ #include <cups/ipp.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <glib.h>
+ 
+ #include <gtk/gtkhbox.h>
+ #include <gtk/gtkliststore.h>
+@@ -96,6 +97,7 @@
+ 	}
+ 
+ 	set_selected_uri (xml, uri);
++
+ 	g_free (uri);
+ 	return res;
+ }
+@@ -113,23 +115,50 @@
+ static void
+ driver_page_sensitivity (GladeXML *xml, gboolean *back, gboolean *next)
+ {
+-	GtkWidget *druid = glade_xml_get_widget (xml, "add_printer_druid");
+ 	*back = TRUE;
+ 	*next = NULL != gcups_driver_selector_get (driver_selector (xml));
+ 
+-	/* see driver_page_prepare for an explanation of the druid hack */
+-	gnome_druid_set_show_finish (GNOME_DRUID (druid), *next);
++	GCupsPPD const  *ppd  = gcups_driver_selector_get (driver_selector (xml));
++
++	if (ppd && ppd->model) {
++		g_signal_handlers_block_by_func(glade_xml_get_widget (xml, "printer-name-entry"), G_CALLBACK (druid_update_sensitivities), xml);
++		GtkEntry *printer_name_entry = (GtkEntry*) glade_xml_get_widget(xml, "printer-name-entry");
++		/* Clear invalid names (spaces + slashes) so that the default is always a valid one */
++		char *name, *ptr;
++		name = g_strdup(ppd->model);	
++	
++		for (ptr = name ; *ptr ; ptr++)
++			if (*ptr == ' ' || *ptr == '/')
++				*ptr = '-';
++
++		gtk_entry_set_text(printer_name_entry, name);
++
++		g_free(name);
++		g_signal_handlers_unblock_by_func(glade_xml_get_widget (xml, "printer-name-entry"), G_CALLBACK (druid_update_sensitivities), xml);
++		}
+ }
+ 
++
+ static GtkWidget *
+ driver_page_back (GladeXML *xml)
+ {
+ 	return glade_xml_get_widget (xml, "connection_page");
+ }
+ 
++
++// This function is just a 'fake' to avoid conflicts during compilation with debian patch properties_on_add.patch
+ static gboolean
+ add_cups_printer (GladeXML *xml, char const *device_uri, GCupsPPD  const *ppd, char const *printer_name)
+ {
++	return FALSE;
++}
++// Note: The (debian/ubuntu) packager needs to fix this conflict by removing properties_on_add.patch
++// and rename the function extended_add_cups_printer  to   add_cups_printer
++// for questions feel free to contact me:    amos.brocco@unifr.ch
++
++static gboolean
++extended_add_cups_printer (GladeXML *xml, char const *device_uri, GCupsPPD  const *ppd, char const *printer_name, char const *printer_info, char const *printer_location)
++{
+ 	GError *err = NULL;
+ 	char local_uri [HTTP_MAX_URI+1];
+ 	ipp_t *request = gnome_cups_request_new (CUPS_ADD_PRINTER);
+@@ -139,6 +168,10 @@
+ 		      "printer-uri", NULL, local_uri);
+ 	ippAddString (request,	IPP_TAG_PRINTER, IPP_TAG_NAME,
+ 		      "printer-name", NULL, gnome_cups_strdup (printer_name));
++	ippAddString (request,	IPP_TAG_PRINTER, IPP_TAG_TEXT,
++		      "printer-info", NULL, printer_info);
++	ippAddString (request,	IPP_TAG_PRINTER, IPP_TAG_TEXT,
++		      "printer-location", NULL, printer_location);
+ 	ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_NAME,
+ 		      "ppd-name", NULL, gnome_cups_strdup (ppd->filename));
+ 	ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI,
+@@ -172,41 +205,174 @@
+ static GtkWidget *
+ driver_page_next (GladeXML *xml)
+ {
+-	GList *existing;
+ 	char  *name, *uri, *ptr;
+-	unsigned i = 0;
+ 	GCupsPPD const  *ppd  = gcups_driver_selector_get (driver_selector (xml));
+-
++	GtkWidget *res = NULL;
++	
+ 	if (ppd == NULL)
+ 		return NULL;
+ 
+ 	uri  = get_selected_uri (xml);
+ 
+-	name = g_strdup (ppd->model);
+-	/* strip out the spaces */
+-	for (ptr = name ; *ptr ; ptr++)
+-		if (*ptr == ' ')
+-			*ptr = '-';
++	if (uri != NULL) {
++		res = glade_xml_get_widget (xml, "printer_info_page");
++	}
++
++	g_free (uri);
++	return res;
++}
++
++/****************************************************************************/
++
++static void
++printer_info_page_setup (GladeXML *xml)
++{
++	GtkWidget *w = glade_xml_get_widget (xml, "printer-name-entry");
++	g_signal_connect_swapped (w,
++		"changed",
++		G_CALLBACK (druid_update_sensitivities), xml);
++}
++
++static gboolean 
++check_printer_name(GladeXML *xml) 
++{
++	/* Checks whether the name is correctly filled */
++	GtkEntry *printer_name_entry = (GtkEntry *)glade_xml_get_widget (xml, "printer-name-entry");
++	GtkLabel *warnings_label = (GtkLabel *)glade_xml_get_widget (xml, "warnings-label");
++
++	char  *printer_name, *ptr;
++	gboolean has_invalid_chars = FALSE;
++	unsigned i = 0;
++
++	printer_name = g_strchomp(g_strdup(gtk_entry_get_text(printer_name_entry)));
++
++	if(!strlen(printer_name)) {
++		gtk_label_set_markup(warnings_label,_("<i>Printer name cannot be empty.</i>"));           
++		g_free (printer_name);              
++		return FALSE;
++		}
++
++	/* Checks that the name contains no spaces or slashes (cf. Ubuntu Bug #32085) */
++	for (ptr = printer_name ; *ptr ; ptr++)
++		if (*ptr == ' ' || *ptr == '/') {
++			has_invalid_chars = TRUE;
++			break;
++			}
++
++	
++	/* If the name is not valid show a warning message */
++	if(has_invalid_chars) {
++		gtk_label_set_markup(warnings_label,_("<i>Printer name contains invalid characters or spaces.</i>"));           
++		g_free (printer_name);              
++		return FALSE;
++		}
++	
++	
++	g_free (printer_name);  
++	gtk_label_set_markup(warnings_label,"");
++	return TRUE;
++}
++
++static void
++printer_info_page_sensitivity (GladeXML *xml, gboolean *back, gboolean *next)
++{
++	GtkWidget *druid = glade_xml_get_widget (xml, "add_printer_druid");
++	*back = TRUE;
++	*next = FALSE != check_printer_name (xml);
++
++	/* see driver_page_prepare for an explanation of the druid hack */
++	gnome_druid_set_show_finish (GNOME_DRUID (druid), *next);
++}
++
++static GtkWidget *
++printer_info_page_back (GladeXML *xml)
++{
++	return glade_xml_get_widget (xml, "driver_page");
++}
++
++
++static void
++printer_info_page_prepare (GladeXML *xml)
++{
++	/* The printer name defaults to the printer model */	
++	GtkEntry *printer_name_entry = (GtkEntry*) glade_xml_get_widget(xml, "printer-name-entry");
++	GCupsPPD const  *ppd  = gcups_driver_selector_get (driver_selector (xml));
++	GtkLabel *warnings_label = (GtkLabel *)glade_xml_get_widget (xml, "warnings-label");
++	char  *name;
++
++	gtk_misc_set_alignment(GTK_MISC(warnings_label), 0.0f, 0.0f);
++	
++	name = g_strdup(gtk_entry_get_text(printer_name_entry));
++	
++	if(!strlen(name))
++		gtk_entry_set_text(printer_name_entry, ppd->model);
++
++	g_free(name);
++}
++
++static GtkWidget *
++printer_info_page_next (GladeXML *xml)
++{
++	GCupsPPD const  *ppd  = gcups_driver_selector_get (driver_selector (xml));
++	char  *original_name, *name, *uri, *description, *location;
++	GtkEntry *printer_name_entry = (GtkEntry*) glade_xml_get_widget(xml, "printer-name-entry");
++	GtkEntry *printer_description_entry = (GtkEntry*) glade_xml_get_widget(xml, "printer-description-entry");
++	GtkEntry *printer_location_entry = (GtkEntry*) glade_xml_get_widget(xml, "printer-location-entry");
++	GtkWidget *parent_window = glade_xml_get_widget (xml, "add_printer_window");
++	GList *existing;
++	unsigned i = 0;
++	gboolean name_changed = FALSE;
++
++	uri  = get_selected_uri (xml);
++	name = g_strchomp(g_strdup(gtk_entry_get_text(printer_name_entry)));
++	description = g_strchomp(g_strdup(gtk_entry_get_text(printer_description_entry)));
++	location = g_strchomp(g_strdup(gtk_entry_get_text(printer_location_entry)));
++	original_name = g_strchomp(g_strdup(gtk_entry_get_text(printer_name_entry)));
+ 
+ 	existing = gnome_cups_get_printers ();
++
+ 	while (NULL != g_list_find_custom (existing, name, (GCompareFunc)strcasecmp )) {
+ 		g_free (name);
+-		name = g_strdup_printf ("%s-%d", ppd->model, ++i);
+-	}
++		name = g_strdup_printf ("%s-%d", original_name, ++i);
++		name_changed = TRUE;
++		} 
++
+ 	g_list_foreach (existing, (GFunc)g_free, NULL);
+ 	g_list_free (existing);
+ 
+ 	if (add_cups_printer (xml, uri, ppd, name)) {
+ 		g_object_unref (xml);
+ 		gtk_main_quit ();
+-	}
++	} // The above code (in the if) will never be executed: leaved to make a patch happy (see explication above)
++ 
++	if(name_changed) {
++	 	GtkWidget *dialog;
++ 
++                dialog = gtk_message_dialog_new
++                        (GTK_WINDOW (parent_window),
++                         GTK_DIALOG_DESTROY_WITH_PARENT,
++                         GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
++                         _("Printer '%s' is already installed on this system. This printer has been renamed to '%s'."),
++			 original_name,
++                         name);
++		gtk_dialog_run (GTK_DIALOG (dialog));
++ 		gtk_widget_destroy (dialog);
++		}
++
++	if (extended_add_cups_printer (xml, uri, ppd, name, description, location)) {
++		g_object_unref (xml);
++		gtk_main_quit ();
++	} 
+ 
+ 	g_free (uri);
+ 	g_free (name);
+-
++	g_free (description);
++	g_free (location);
++	g_free (original_name);
+ 	return NULL;
+ }
+ 
++
+ /****************************************************************************/
+ 
+ static DruidPageDescription pages[] = {
+@@ -226,6 +392,14 @@
+ 		driver_page_back,
+ 		driver_page_next
+ 	},
++	{
++		"printer_info_page",
++		printer_info_page_setup,
++		printer_info_page_prepare,
++		printer_info_page_sensitivity,
++		printer_info_page_back,
++		printer_info_page_next
++	},
+ 	{ NULL }
+ };
+ 
+diff -Nur gnome-cups-manager-0.31/gnome-cups-add/druid-helper.c gnome-cups-manager-0.31.new/gnome-cups-add/druid-helper.c
+--- gnome-cups-manager-0.31/gnome-cups-add/druid-helper.c	2004-08-19 01:48:44.000000000 +0200
++++ gnome-cups-add/druid-helper.c	2006-05-12 11:08:12.000000000 +0200
+@@ -120,6 +120,7 @@
+ 					  G_CALLBACK (druid_page_back_cb),
+ 					  p);
+ 		}
++
+ 		if (p->next) {
+ 			g_signal_connect (page, "next", 
+ 					  G_CALLBACK (druid_page_next_cb),
+@@ -128,6 +129,22 @@
+ 					  G_CALLBACK (druid_page_next_cb),
+ 					  p);
+ 		}
++
++#if 0
++		if (p->next) {
++			g_signal_connect (page, "next", 
++					  G_CALLBACK (druid_page_next_cb),
++					  p);
++		}
++
++		if (!p->next) {
++			g_signal_connect (page, "finish", 
++					  G_CALLBACK (druid_page_next_cb),
++					  p);
++			} 
++#endif
++
++
+ 	}
+ }
+ 
+diff -Nur gnome-cups-manager-0.31/gnome-cups-add/gnome-cups-add.glade gnome-cups-manager-0.31.new/gnome-cups-add/gnome-cups-add.glade
+--- gnome-cups-manager-0.31/gnome-cups-add/gnome-cups-add.glade	2004-08-30 22:32:42.000000000 +0200
++++ gnome-cups-add/gnome-cups-add.glade	2006-05-12 11:08:12.000000000 +0200
+@@ -18,6 +18,8 @@
+   <property name="skip_pager_hint">False</property>
+   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++  <property name="focus_on_map">True</property>
++  <property name="urgency_hint">False</property>
+ 
+   <child>
+     <widget class="GnomeDruid" id="add_printer_druid">
+@@ -28,7 +30,7 @@
+       <child>
+ 	<widget class="GnomeDruidPageStandard" id="connection_page">
+ 	  <property name="visible">True</property>
+-	  <property name="title" translatable="yes">Step 1 of 2: Printer Connection</property>
++	  <property name="title" translatable="yes">Step 1 of 3: Printer Connection</property>
+ 	  <property name="logo">gnome-cups-add-druid.png</property>
+ 
+ 	  <child internal-child="vbox">
+@@ -51,6 +53,10 @@
+ 		  <property name="yalign">0.5</property>
+ 		  <property name="xpad">0</property>
+ 		  <property name="ypad">0</property>
++		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		  <property name="width_chars">-1</property>
++		  <property name="single_line_mode">False</property>
++		  <property name="angle">0</property>
+ 		</widget>
+ 		<packing>
+ 		  <property name="padding">4</property>
+@@ -81,11 +87,11 @@
+       <child>
+ 	<widget class="GnomeDruidPageStandard" id="driver_page">
+ 	  <property name="visible">True</property>
+-	  <property name="title" translatable="yes">Step 2 of 2: Printer Driver</property>
++	  <property name="title" translatable="yes">Step 2 of 3: Printer Driver</property>
+ 	  <property name="logo">gnome-cups-add-druid.png</property>
+ 
+ 	  <child internal-child="vbox">
+-	    <widget class="GtkVBox" id="druid-vbox101">
++	    <widget class="GtkVBox" id="druid-vbox103">
+ 	      <property name="border_width">16</property>
+ 	      <property name="visible">True</property>
+ 	      <property name="homogeneous">False</property>
+@@ -109,6 +115,257 @@
+ 	  </child>
+ 	</widget>
+       </child>
++
++      <child>
++	<widget class="GnomeDruidPageStandard" id="printer_info_page">
++	  <property name="visible">True</property>
++	  <property name="title" translatable="yes">Step 3 of 3: Printer Information</property>
++	  <property name="logo">gnome-cups-add-druid.png</property>
++
++	  <child internal-child="vbox">
++	    <widget class="GtkVBox" id="druid-vbox2">
++	      <property name="border_width">16</property>
++	      <property name="visible">True</property>
++	      <property name="homogeneous">False</property>
++	      <property name="spacing">6</property>
++
++	      <child>
++		<widget class="GtkTable" id="table1">
++		  <property name="visible">True</property>
++		  <property name="n_rows">5</property>
++		  <property name="n_columns">2</property>
++		  <property name="homogeneous">False</property>
++		  <property name="row_spacing">4</property>
++		  <property name="column_spacing">4</property>
++
++		  <child>
++		    <widget class="GtkHSeparator" id="hseparator1">
++		      <property name="visible">True</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">0</property>
++		      <property name="right_attach">2</property>
++		      <property name="top_attach">2</property>
++		      <property name="bottom_attach">3</property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkLabel" id="label30">
++		      <property name="visible">True</property>
++		      <property name="label" translatable="yes"></property>
++		      <property name="use_underline">False</property>
++		      <property name="use_markup">False</property>
++		      <property name="justify">GTK_JUSTIFY_LEFT</property>
++		      <property name="wrap">False</property>
++		      <property name="selectable">False</property>
++		      <property name="xalign">0</property>
++		      <property name="yalign">0.5</property>
++		      <property name="xpad">0</property>
++		      <property name="ypad">0</property>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">0</property>
++		      <property name="right_attach">1</property>
++		      <property name="top_attach">1</property>
++		      <property name="bottom_attach">2</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkEntry" id="printer-name-entry">
++		      <property name="visible">True</property>
++		      <property name="can_focus">True</property>
++		      <property name="editable">True</property>
++		      <property name="visibility">True</property>
++		      <property name="max_length">0</property>
++		      <property name="text" translatable="yes"></property>
++		      <property name="has_frame">True</property>
++		      <property name="invisible_char">*</property>
++		      <property name="activates_default">False</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">1</property>
++		      <property name="right_attach">2</property>
++		      <property name="top_attach">0</property>
++		      <property name="bottom_attach">1</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkEntry" id="printer-description-entry">
++		      <property name="visible">True</property>
++		      <property name="can_focus">True</property>
++		      <property name="editable">True</property>
++		      <property name="visibility">True</property>
++		      <property name="max_length">0</property>
++		      <property name="text" translatable="yes"></property>
++		      <property name="has_frame">True</property>
++		      <property name="invisible_char">*</property>
++		      <property name="activates_default">False</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">1</property>
++		      <property name="right_attach">2</property>
++		      <property name="top_attach">3</property>
++		      <property name="bottom_attach">4</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkEntry" id="printer-location-entry">
++		      <property name="visible">True</property>
++		      <property name="can_focus">True</property>
++		      <property name="editable">True</property>
++		      <property name="visibility">True</property>
++		      <property name="max_length">0</property>
++		      <property name="text" translatable="yes"></property>
++		      <property name="has_frame">True</property>
++		      <property name="invisible_char">*</property>
++		      <property name="activates_default">False</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">1</property>
++		      <property name="right_attach">2</property>
++		      <property name="top_attach">4</property>
++		      <property name="bottom_attach">5</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkLabel" id="label34">
++		      <property name="visible">True</property>
++		      <property name="label" translatable="yes">_Location:</property>
++		      <property name="use_underline">True</property>
++		      <property name="use_markup">False</property>
++		      <property name="justify">GTK_JUSTIFY_LEFT</property>
++		      <property name="wrap">False</property>
++		      <property name="selectable">False</property>
++		      <property name="xalign">0</property>
++		      <property name="yalign">0.5</property>
++		      <property name="xpad">0</property>
++		      <property name="ypad">0</property>
++		      <property name="mnemonic_widget">printer-location-entry</property>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">0</property>
++		      <property name="right_attach">1</property>
++		      <property name="top_attach">4</property>
++		      <property name="bottom_attach">5</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkLabel" id="label33">
++		      <property name="visible">True</property>
++		      <property name="label" translatable="yes">_Description: </property>
++		      <property name="use_underline">True</property>
++		      <property name="use_markup">False</property>
++		      <property name="justify">GTK_JUSTIFY_LEFT</property>
++		      <property name="wrap">False</property>
++		      <property name="selectable">False</property>
++		      <property name="xalign">0</property>
++		      <property name="yalign">0.5</property>
++		      <property name="xpad">0</property>
++		      <property name="ypad">0</property>
++		      <property name="mnemonic_widget">printer-description-entry</property>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">0</property>
++		      <property name="right_attach">1</property>
++		      <property name="top_attach">3</property>
++		      <property name="bottom_attach">4</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkLabel" id="warnings-label">
++		      <property name="visible">True</property>
++		      <property name="label" translatable="yes"></property>
++		      <property name="use_underline">False</property>
++		      <property name="use_markup">True</property>
++		      <property name="justify">GTK_JUSTIFY_LEFT</property>
++		      <property name="wrap">False</property>
++		      <property name="selectable">False</property>
++		      <property name="xalign">0</property>
++		      <property name="yalign">0.5</property>
++		      <property name="xpad">0</property>
++		      <property name="ypad">0</property>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">1</property>
++		      <property name="right_attach">2</property>
++		      <property name="top_attach">1</property>
++		      <property name="bottom_attach">2</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkLabel" id="label31">
++		      <property name="visible">True</property>
++		      <property name="label" translatable="yes">_Name:</property>
++		      <property name="use_underline">True</property>
++		      <property name="use_markup">False</property>
++		      <property name="justify">GTK_JUSTIFY_LEFT</property>
++		      <property name="wrap">False</property>
++		      <property name="selectable">False</property>
++		      <property name="xalign">0</property>
++		      <property name="yalign">0.5</property>
++		      <property name="xpad">0</property>
++		      <property name="ypad">0</property>
++		      <property name="mnemonic_widget">printer-name-entry</property>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">0</property>
++		      <property name="right_attach">1</property>
++		      <property name="top_attach">0</property>
++		      <property name="bottom_attach">1</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++		</widget>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">False</property>
++		  <property name="fill">False</property>
++		</packing>
++	      </child>
++	    </widget>
++	  </child>
++	</widget>
++      </child>
+     </widget>
+   </child>
+ </widget>
diff --git a/print/gnome-cups-manager/files/patch-ui_startbox b/print/gnome-cups-manager/files/patch-ui_startbox
new file mode 100644
index 000000000..f9e423cd5
--- /dev/null
+++ b/print/gnome-cups-manager/files/patch-ui_startbox
@@ -0,0 +1,112 @@
+--- gnome-cups-add/add-printer.c.orig	2006-04-26 22:35:03.882002880 +0200
++++ gnome-cups-add/add-printer.c	2006-04-26 22:39:46.267073824 +0200
+@@ -244,12 +244,83 @@
+ 	gtk_main_quit ();
+ }
+ 
+-int
+-main (int argc, char *argv[])
++GtkWindow *progress_window = NULL;
++static GtkWindow*
++create_progress_window ()
++{
++       GtkWindow *window;
++       GtkWidget *vbox, *label;
++       //GtkProgressBar *progress;
++       guint sid;
++
++       window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL));
++       //gtk_window_set_title (GTK_WINDOW (window), _("Add a Printer"));
++       gtk_window_set_decorated(window, gtk_false);
++       gtk_container_set_border_width (GTK_CONTAINER (window), 6);
++       gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER_ALWAYS);
++       g_signal_connect(window, "delete_event", G_CALLBACK(gtk_true), NULL);
++
++       vbox = gtk_vbox_new (FALSE, 6);
++       gtk_container_add (GTK_CONTAINER (window), vbox);
++
++       label = gtk_label_new (g_strdup_printf (_("<b>Reading printer database ...</b>")));
++       gtk_label_set_use_markup (GTK_LABEL(label), TRUE);
++       gtk_misc_set_alignment (GTK_MISC(label), 0, 0.5);
++       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
++
++       //progress = GTK_PROGRESS_BAR( gtk_progress_bar_new());
++       //gtk_widget_show ( GTK_WIDGET (progress));
++       //gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), " ");
++       //gtk_progress_bar_set_pulse_step (progress, 0.2);
++       //gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (progress), FALSE, FALSE, 6);
++
++       //sid = g_timeout_add (200, (GtkFunction) progress_timer, progress);
++       //g_object_set_data(G_OBJECT(window), "pgb_id", GINT_TO_POINTER(sid));
++
++       gtk_widget_show_all ( GTK_WIDGET (window));
++
++       gdk_window_set_cursor(GTK_WIDGET(window)->window, gdk_cursor_new(GDK_WATCH));
++       gtk_widget_grab_focus ( GTK_WIDGET (window));
++
++       return window;
++}
++
++static gpointer
++add_printer_main(gpointer data)
+ {
+ 	GladeXML  *xml;
+ 	GtkWidget *window;
+ 
++	g_idle_remove_by_data(data);
++
++	xml = glade_xml_new (GNOME_CUPS_MANAGER_DATADIR "/gnome-cups-add.glade",
++			     "add_printer_window",
++			     GETTEXT_PACKAGE);
++
++	window = glade_xml_get_widget (xml, "add_printer_window");
++	set_window_icon (window, "gnome-dev-printer-new");
++	g_signal_connect (window,
++		"delete_event",
++		G_CALLBACK (delete_event_cb), NULL);
++	g_signal_connect (glade_xml_get_widget (xml, "add_printer_druid"),
++		"cancel",
++		G_CALLBACK (cancel_cb), NULL);
++
++	druid_pages_setup (xml, pages);
++	if (progress_window) {
++		gdk_window_set_cursor(GTK_WIDGET(progress_window)->window, gdk_cursor_new(GDK_LAST_CURSOR));
++		//g_source_remove(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(progress_window), "pgb_id")));
++		gtk_widget_destroy (GTK_WIDGET(progress_window));
++	}
++
++	gtk_widget_show (window);
++
++	return NULL; 
++}
++
++int
++main (int argc, char *argv[])
++{
+ 	gnome_program_init ("gnome-cups-add",
+ 			    VERSION,
+ 			    LIBGNOMEUI_MODULE, argc, argv,
+@@ -271,21 +340,8 @@
+ 			exit (1);
+ 	}
+ 
+-	xml = glade_xml_new (GNOME_CUPS_MANAGER_DATADIR "/gnome-cups-add.glade",
+-			     "add_printer_window",
+-			     GETTEXT_PACKAGE);
+-
+-	window = glade_xml_get_widget (xml, "add_printer_window");
+-	set_window_icon (window, "gnome-dev-printer-new");
+-	g_signal_connect (window,
+-		"delete_event",
+-		G_CALLBACK (delete_event_cb), NULL);
+-	g_signal_connect (glade_xml_get_widget (xml, "add_printer_druid"),
+-		"cancel",
+-		G_CALLBACK (cancel_cb), NULL);
+-
+-	druid_pages_setup (xml, pages);
+-	gtk_widget_show (window);
++	progress_window = create_progress_window();
++	g_timeout_add(300, add_printer_main, progress_window);
+ 
+ 	gtk_main ();
+ 
diff --git a/print/gnome-cups-manager/files/patch-ui_tooltip b/print/gnome-cups-manager/files/patch-ui_tooltip
new file mode 100644
index 000000000..21e0a4842
--- /dev/null
+++ b/print/gnome-cups-manager/files/patch-ui_tooltip
@@ -0,0 +1,794 @@
+--- ./libgnomecups/gnome-cups-ui-connection.c	2004-09-13 22:04:58.000000000 +0200
++++ libgnomecups/gnome-cups-ui-connection.c	2006-04-27 10:19:02.995681560 +0200
+@@ -929,10 +929,15 @@
+ 	w = glade_xml_get_widget (cs->xml, "ipp_uri_entry");
+ 	gtk_tooltips_set_tip (gtk_tooltips_new (), w,
+ 			      _("For example :\n"
+-				"\thttp://hostname:631/ipp/\n"
+-				"\thttp://hostname:631/ipp/port1\n"
+-				"\tipp://hostname/ipp/\n"
+-				"\tipp://hostname/ipp/port1"), NULL);
++				"\tipp://hostname/printers/<name>\n"
++				"\thttp://hostname:631/printers/<name>\n"),
++				NULL);
++	w = glade_xml_get_widget (cs->xml, "smb_username_entry");
++	gtk_tooltips_set_tip (gtk_tooltips_new (), w,
++			      _("For example :\n"
++				"\tusername\n"
++				"\tDOMAIN\\username"),
++				NULL);
+ }
+ 
+ static void
+--- ./po/fr.po~	2006-04-27 00:24:11.728578896 +0200
++++ po/fr.po	2006-04-27 00:44:33.458847664 +0200
+@@ -531,16 +531,12 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Par exemple :\n"
+-"\thttp://nom_d'hôte:631/ipp/\n"
+-"\thttp://nom_d'hôte:631/ipp/port1\n"
+-"\tipp://nom_d'hôte/ipp/\n"
+-"\tipp://nom_d'hôte/ipp/port1"
++"\tipp://nom_d'hôte/printers/<name>\n"
++"\thttp://nom_d'hôte:631/printers/<name>\n"
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+ msgid "9100"
+--- ./po/en_GB.po~	2005-05-10 14:32:20.000000000 +0200
++++ po/en_GB.po	2006-04-27 00:47:06.073646688 +0200
+@@ -404,16 +404,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/ca.po~	2005-09-06 15:53:57.000000000 +0200
++++ po/ca.po	2006-04-27 00:49:19.411376272 +0200
+@@ -418,16 +418,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Per exemple :\n"
+-"\thttp://ordinador:631/ipp/\n"
+-"\thttp://ordinador:631/ipp/port1\n"
+-"\tipp://ordinador/ipp/\n"
+-"\tipp://ordinador/ipp/port1"
++"\tipp://ordinador/printers/<name>\n"
++"\thttp://ordinador:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/eu.po~	2005-04-08 19:49:42.000000000 +0200
++++ po/eu.po	2006-04-27 00:46:01.187510880 +0200
+@@ -409,16 +409,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Adibidez:\n"
+-"\thttp://ostalari-izena:631/ipp/\n"
+-"\thttp://ostalari-izena:631/ipp/1.ataka\n"
+-"\tipp://ostalari-izena/ipp/\n"
+-"\tipp://ostalari-izena/ipp/1.ataka"
++"\tipp://ostalari-izena/printers/<name>\n"
++"\thttp://ostalari-izena:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/en_CA.po~	2005-06-01 16:50:49.000000000 +0200
++++ po/en_CA.po	2006-04-27 00:47:20.873396784 +0200
+@@ -410,16 +410,12 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/el.po~	2005-08-22 18:39:21.000000000 +0200
++++ po/el.po	2006-04-27 00:47:36.947953080 +0200
+@@ -410,16 +410,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Για παράδειγμα :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/bg.po~	2005-04-19 15:50:37.000000000 +0200
++++ po/bg.po	2006-04-27 00:49:36.650755488 +0200
+@@ -405,16 +405,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Например:\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/de.po~	2006-04-27 00:24:11.727579048 +0200
++++ po/de.po	2006-04-27 00:34:38.225336912 +0200
+@@ -417,16 +417,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Zum Beispiel:\n"
+-"\thttp://rechnername:631/ipp/\n"
+-"\thttp://rechnername:631/ipp/port1\n"
+-"\tipp://rechnername/ipp/\n"
+-"\tipp://rechnername/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/zh_CN.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/zh_CN.po	2006-04-27 00:36:44.786096752 +0200
+@@ -517,16 +517,12 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "例如：\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+ msgid "9100"
+--- ./po/zh_TW.po~	2005-08-12 22:32:40.000000000 +0200
++++ po/zh_TW.po	2006-04-27 00:37:00.957638304 +0200
+@@ -518,16 +518,12 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "例如：\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+ msgid "9100"
+--- ./po/xh.po~	2005-05-10 14:32:20.000000000 +0200
++++ po/xh.po	2006-04-27 00:37:16.827225760 +0200
+@@ -405,16 +405,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Umzekelo :\n"
+-"\thttp://igama-lomququzeleli:631/ipp/\n"
+-"\thttp://igama-lomququzeleli:631/ipp/port1\n"
+-"\tipp://igama-lomququzeleli/ipp/\n"
+-"\tipp://igama-lomququzeleli/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/uk.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/uk.po	2006-04-27 00:37:35.907325144 +0200
+@@ -522,16 +522,12 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Наприклад :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+ msgid "9100"
+--- ./po/tr.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/tr.po	2006-04-27 00:37:48.734375136 +0200
+@@ -519,10 +519,8 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+--- ./po/sv.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/sv.po	2006-04-27 00:37:57.556034040 +0200
+@@ -531,10 +531,8 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+--- ./po/sr.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/sr.po	2006-04-27 00:38:06.593660112 +0200
+@@ -523,10 +523,8 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+--- ./po/sr@Latn.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/sr@Latn.po	2006-04-27 00:38:18.686821672 +0200
+@@ -523,10 +523,8 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+--- ./po/sq.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/sq.po	2006-04-27 00:38:27.740445312 +0200
+@@ -555,10 +555,8 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+--- ./po/rw.po~	2005-04-01 23:18:31.000000000 +0200
++++ po/rw.po	2006-04-27 00:38:38.786766016 +0200
+@@ -536,10 +536,8 @@
+ #, fuzzy
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Urugero HTTP Izina ry'inturo: HTTP Izina ry'inturo: Izina ry'inturo: Izina "
+ "ry'inturo:"
+--- ./po/ru.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/ru.po	2006-04-27 00:38:52.209725416 +0200
+@@ -520,16 +520,12 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Например :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+ msgid "9100"
+--- ./po/pt.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/pt.po	2006-04-27 00:39:04.215900200 +0200
+@@ -521,10 +521,8 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+--- ./po/pt_BR.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/pt_BR.po	2006-04-27 00:39:19.179625368 +0200
+@@ -524,16 +524,12 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Por exemplo:\n"
+-"\thttp://maquina:631/ipp/\n"
+-"\thttp://maquina:631/ipp/porta1\n"
+-"\tipp://maquina/ipp/\n"
+-"\tipp://maquina/ipp/porta1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+ msgid "9100"
+--- ./po/pa.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/pa.po	2006-04-27 00:39:29.456063112 +0200
+@@ -520,10 +520,8 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+--- ./po/no.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/no.po	2006-04-27 00:39:46.863416792 +0200
+@@ -518,16 +518,12 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "For eksempel:\n"
+-"\thttp://vertsnavn:631/ipp\n"
+-"\thttp://vertsnavn:631/ipp/port1\n"
+-"\tipp://vertsnavn/ipp\n"
+-"\tipp://vertsnavn/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+ msgid "9100"
+--- ./po/nl.po~	2005-08-12 22:32:40.000000000 +0200
++++ po/nl.po	2006-04-27 00:40:03.154940104 +0200
+@@ -416,16 +416,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Bijvoorbeeld :\n"
+-"\thttp://hostnaam:631/ipp/\n"
+-"\thttp://hostnaam:631/ipp/poort1\n"
+-"\tipp://hostnaam/ipp/\n"
+-"\tipp://hostnaam/ipp/poort1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/ne.po~	2005-07-31 04:52:43.000000000 +0200
++++ po/ne.po	2006-04-27 00:40:16.753872752 +0200
+@@ -401,16 +401,12 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "उदाहरणको लागि :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/nb.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/nb.po	2006-04-27 00:40:29.336959832 +0200
+@@ -518,16 +518,12 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "For eksempel:\n"
+-"\thttp://vertsnavn:631/ipp\n"
+-"\thttp://vertsnavn:631/ipp/port1\n"
+-"\tipp://vertsnavn/ipp\n"
+-"\tipp://vertsnavn/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+ msgid "9100"
+--- ./po/ko.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/ko.po	2006-04-27 00:41:33.879147928 +0200
+@@ -519,17 +519,13 @@
+ #, fuzzy
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "예를 들어 :\n"
+ "\tfile:/path/to/filename.prn\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1\n"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ "\tlpd://hostname/queue\n"
+ "\tsocket://hostname\n"
+ "\tsocket://hostname:9100"
+--- ./po/ja.po~	2005-03-15 22:30:36.000000000 +0100
++++ po/ja.po	2006-04-27 00:41:45.995305992 +0200
+@@ -413,16 +413,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "例: \n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ # Novell Translation
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+--- ./po/it.po~	2006-04-27 00:24:11.729578744 +0200
++++ po/it.po	2006-04-27 00:42:02.562787352 +0200
+@@ -555,16 +555,12 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Ad esempio:\n"
+-"\thttp://nome-host:631/ipp/\n"
+-"\thttp://nome-host:631/ipp/porta1\n"
+-"\tipp://nome-host/ipp/\n"
+-"\tipp://nome-host/ipp/porta1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+ msgid "9100"
+--- ./po/hu.po~	2005-08-12 22:32:40.000000000 +0200
++++ po/hu.po	2006-04-27 00:42:47.155008304 +0200
+@@ -413,16 +413,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Például:\n"
+-"\thttp://gépnév:631/ipp/\n"
+-"\thttp://gépnév:631/ipp/port1\n"
+-"\tipp://gépnév/ipp/\n"
+-"\tipp://gépnév/ipp/port1"
++"\tipp://gépnév/printers/<name>\n"
++"\thttp://gépnév:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/hr.po~	2005-03-07 17:55:33.000000000 +0100
++++ po/hr.po	2006-04-27 00:43:18.480246144 +0200
+@@ -518,10 +518,8 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+--- ./po/he.po~	2006-04-27 00:24:11.729578744 +0200
++++ po/he.po	2006-04-27 00:43:26.470031512 +0200
+@@ -529,10 +529,8 @@
+ #: libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ 
+ #: libgnomecups/gnome-cups-ui-connection.glade.h:2
+--- ./po/gl.po~	2005-06-10 16:34:52.000000000 +0200
++++ po/gl.po	2006-04-27 00:43:37.194401160 +0200
+@@ -417,16 +417,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Por exemplo :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/fi.po~	2005-08-22 18:39:21.000000000 +0200
++++ po/fi.po	2006-04-27 00:45:28.294511376 +0200
+@@ -412,16 +412,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Esimerkiksi:\n"
+-"\thttp://isäntänimi:631/ipp/\n"
+-"\thttp://isäntänimi:631/ipp/port1\n"
+-"\thttp://isäntänimi/ipp/\n"
+-"\thttp://isäntänimi/ipp/port1"
++"\tipp://isäntänimi/printers/<name>\n"
++"\thttp://isäntänimi:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/es.po~	2005-08-12 22:32:40.000000000 +0200
++++ po/es.po	2006-04-27 00:46:40.876477240 +0200
+@@ -417,16 +417,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Por ejemplo:\n"
+-"\thttp://nombrehost:631/ipp/\n"
+-"\thttp://nombrehost:631/ipp/puerto1\n"
+-"\tipp://nombrehost/ipp/\n"
+-"\tipp://nombrehost/ipp/puerto1"
++"\tipp://nombrehost/printers/<name>\n"
++"\thttp://nombrehost:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/da.po~	2005-03-29 17:46:33.000000000 +0200
++++ po/da.po	2006-04-27 00:48:13.897335920 +0200
+@@ -412,16 +412,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "For eksempel:\n"
+-"\thttp://værtsnavn:631/ipp\n"
+-"\thttp://værtsnavn:631/ipp/port1\n"
+-"\tipp://værtsnavn/ipp\n"
+-"\tipp://værtsnavn/ipp/port1"
++"\tipp://værtsnavn/printers/<name>\n"
++"\thttp://værtsnavn:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
+--- ./po/cs.po~	2005-06-14 15:50:11.000000000 +0200
++++ po/cs.po	2006-04-27 00:48:43.429846296 +0200
+@@ -414,16 +414,12 @@
+ #: ../libgnomecups/gnome-cups-ui-connection.c:931
+ msgid ""
+ "For example :\n"
+-"\thttp://hostname:631/ipp/\n"
+-"\thttp://hostname:631/ipp/port1\n"
+-"\tipp://hostname/ipp/\n"
+-"\tipp://hostname/ipp/port1"
++"\tipp://hostname/printers/<name>\n"
++"\thttp://hostname:631/printers/<name>\n"
+ msgstr ""
+ "Například:\n"
+-"\thttp://jmenopocitace:631/ipp/\n"
+-"\thttp://jmenopocitace:631/ipp/port1\n"
+-"\tipp://jmenopocitace/ipp/\n"
+-"\tipp://jmenopocitace/ipp/port1"
++"\tipp://jmenopocitace/printers/<name>\n"
++"\thttp://jmenopocitace:631/printers/<name>\n"
+ 
+ #: ../libgnomecups/gnome-cups-ui-connection.glade.h:1
+ msgid "9100"
diff --git a/print/gnome-cups-manager/pkg-descr b/print/gnome-cups-manager/pkg-descr
new file mode 100644
index 000000000..a04acf39d
--- /dev/null
+++ b/print/gnome-cups-manager/pkg-descr
@@ -0,0 +1,4 @@
+The GNOME CUPS Manager is a tool for adding new CUPS printers and for
+managing existing CUPS printers and queues.
+
+WWW: http://www.gnome.org/
diff --git a/print/gnome-cups-manager/pkg-plist b/print/gnome-cups-manager/pkg-plist
new file mode 100644
index 000000000..ce78c9ae7
--- /dev/null
+++ b/print/gnome-cups-manager/pkg-plist
@@ -0,0 +1,77 @@
+bin/gnome-cups-add
+bin/gnome-cups-icon
+bin/gnome-cups-manager
+include/libgnomecups-1/libgnomecups/gnome-cups-permission.h
+include/libgnomecups-1/libgnomecups/gnome-cups-ui-connection.h
+include/libgnomecups-1/libgnomecups/gnome-cups-ui-driver.h
+include/libgnomecups-1/libgnomecups/gnome-cups-ui-init.h
+include/libgnomecups-1/libgnomecups/gnome-cups-ui-print.h
+include/libgnomecups-1/libgnomecups/gnome-cups-ui-util.h
+lib/libgnomecupsui-1.0.a
+lib/libgnomecupsui-1.0.la
+lib/libgnomecupsui-1.0.so
+lib/libgnomecupsui-1.0.so.1
+libdata/bonobo/servers/Gnome_CupsManager.server
+libdata/pkgconfig/libgnomecupsui-1.0.pc
+sbin/gnome-cups-switch
+share/applications/gnome-cups-manager.desktop
+%%DATADIR%%/gnome-cups-add-druid.png
+%%DATADIR%%/gnome-cups-add.glade
+%%DATADIR%%/gnome-cups-manager.glade
+%%DATADIR%%/gnome-cups-ui-connection.glade
+%%DATADIR%%/gnome-cups-ui-driver.glade
+%%DATADIR%%/xd2-testpage-a4.eps
+%%DATADIR%%/xd2-testpage-letter.eps
+share/icons/hicolor/48x48/devices/gnome-dev-printer-network.png
+share/icons/hicolor/48x48/devices/gnome-dev-printer-new.png
+share/icons/hicolor/48x48/devices/gnome-dev-printer.png
+share/icons/hicolor/48x48/stock/data/emblem-default.png
+share/icons/hicolor/48x48/stock/data/emblem-paused.png
+share/locale/bg/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/ca/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/cs/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/da/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/de/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/el/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/en_CA/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/en_GB/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/es/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/eu/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/fi/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/fr/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/gl/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/he/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/hr/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/hu/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/it/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/ja/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/ko/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/nb/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/ne/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/nl/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/no/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/pa/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/pt/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/ru/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/rw/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/sq/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/sr/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/sv/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/tr/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/uk/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/xh/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-cups-manager.mo
+share/pixmaps/gnome-cups-manager/printer-tray-normal.png
+share/pixmaps/gnome-cups-manager/printer-tray-stopped.png
+@dirrm share/pixmaps/gnome-cups-manager
+@dirrm %%DATADIR%%
+@unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true
+@dirrmtry include/libgnomecups-1/libgnomecups
+@dirrmtry include/libgnomecups-1
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw