Gossip patches

--UugvWAfsgieZRqgk
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hey Martyn,

I buggered you on jabber last night, I bugger you on mail now.

I have tried compiling this, but I:

- don't have anyone to make the birthday bit popup.
- don't know of a server with just one conference room.

So I guess I can't really test. :)

Jordi
--=20
Jordi Mallach P=E9rez  --  Debian developer     http://www.debian.org/
[email protected]     [email protected]     http://www.sindominio.net/
GnuPG public key information available at http://oskuro.net/

--UugvWAfsgieZRqgk
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="gossip.diff"

Index: src/gossip-new-chatroom-dialog.c
===================================================================
--- src/gossip-new-chatroom-dialog.c	(revision 2591)
+++ src/gossip-new-chatroom-dialog.c	(working copy)
@@ -818,7 +818,7 @@
 				      GTK_STOCK_FIND,
 				      GTK_ICON_SIZE_BUTTON); 
 
-	str = g_strdup_printf (_("Found %d conference rooms"), g_list_length (rooms));
+	str = g_strdup_printf (ngettext("Found %d conference room", "Found %d conference rooms", g_list_length (rooms)), g_list_length (rooms));
 	gtk_label_set_text (GTK_LABEL (dialog->label_status), str);
 	g_free (str);
 
Index: src/gossip-vcard-dialog.c
===================================================================
--- src/gossip-vcard-dialog.c	(revision 2591)
+++ src/gossip-vcard-dialog.c	(working copy)
@@ -476,14 +476,14 @@
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
 	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
 
-	button = gtk_button_new_with_label (_("Cancel"));
+	button = gtk_button_new_with_label (GTK_STOCK_CANCEL);
 	gtk_container_add (GTK_CONTAINER (bbox), button);
 	g_signal_connect (button,
 			  "clicked",
 			  G_CALLBACK (vcard_dialog_birthday_cancel_clicked_cb),
 			  popup_button);
 
-	button = gtk_button_new_with_label (_("OK"));
+	button = gtk_button_new_with_label (GTK_STOCK_OK);
 	gtk_container_add (GTK_CONTAINER (bbox), button);
 	g_signal_connect (button, "clicked",
 			  G_CALLBACK (vcard_dialog_birthday_ok_clicked_cb),
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2591)
+++ ChangeLog	(working copy)
@@ -1,3 +1,13 @@
+2007-08-30  Jordi Mallach  <[email protected]>
+
+	* src/src/gossip-new-chatroom-dialog.c:
+	(new_chatroom_dialog_browse_cb): Use ngettext() as needed.
+
+	* src/gossip-vcard-dialog.c:
+	(vcard_dialog_birthday_button_popup_cb): Use GTK stock strings.
+	
+	* ui/main.glade: Fix typo, to unify nearly identical strings.
+
 2007-08-19  Martyn Russell  <[email protected]>
 
 	* Release 0.27.
Index: ui/main.glade
===================================================================
--- ui/main.glade	(revision 2591)
+++ ui/main.glade	(working copy)
@@ -5143,7 +5143,7 @@
 		      <child>
 			<widget class="GtkLabel" id="label_no_account_blurb">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">To add a new account, you can click on the 'Add' button and a new entry will be created for you to started configuring.
+			  <property name="label" translatable="yes">To add a new account, you can click on the 'Add' button and a new entry will be created for you to start configuring.
 
 If you do not want to add an account, simply click on the account you want to configure in the list on the left.</property>
 			  <property name="use_underline">False</property>

--UugvWAfsgieZRqgk
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Gossip-dev mailing list
[email protected]
http://lists.imendio.com/mailman/listinfo/gossip-dev

--UugvWAfsgieZRqgk--