Re: Break string freeze again for GDM 2.20

[Brian Cameron <Brian Cameron Sun COM>]

Wouter:

> No, the gui/gdmcommon.c part of the patch is wrong. The N_() macro
> only *marks* for translation, without actually doing any translations
> (that's why you can use it in static array initializers, #defines, and
> such). It's just there so that intltool knows that the string should
> be extracted into the POT file. The actual translations happen when
> you call _() on the string variable, e.g. the 'welcomemsg = g_strdup
> (_(GDM_DEFAULT_WELCOME_MSG));'
> line of code.
>
> Summary: leave the gui/gdmcommon.c part of your patch out and I think
> it'll be fine.

Thanks for explaining.  I updated the patch as you suggest, and removed
the gui/gdmcommon.c part of the previous patch.  The new patch which I
did apply is attached for reference.

> > Can I get approval to add translations for these two strings?
>
> Oops, forgot to answer this part of your message. If it's about fixing up
> i18n for strings that were already in the package (i.e. no new strings
> introduced), this is not a string freeze break, and you should go ahead and
> commit it. Please notify gnome-i18n-list gnome org if you do, though.

Right, then, this is not a string freeze break.  Thanks.  I went ahead
and committed this change.  Glad to understand I don't need approval
from the release-team for this change.

gnome-18n-list is cc:ed in this message, so I'll assume that the right
people are notified that they now need to translate these two strings
in GDM.

  "Welcome"
  "Welcome to %n"

Thanks again,

Brian


Index: daemon/gdm.h
===================================================================
--- daemon/gdm.h	(revision 5914)
+++ daemon/gdm.h	(working copy)
@@ -67,6 +67,8 @@
  */
 #define GDM_DEFAULT_WELCOME_MSG "Welcome"
 #define GDM_DEFAULT_REMOTE_WELCOME_MSG "Welcome to %n"
+#define GDM_DEFAULT_WELCOME_TRANSLATED_MSG N_("Welcome")
+#define GDM_DEFAULT_REMOTE_WELCOME_TRANSLATED_MSG N_("Welcome to %n")
 
 #define GDM_SESSION_FAILSAFE_GNOME "GDM_Failsafe.GNOME"
 #define GDM_SESSION_FAILSAFE_XTERM "GDM_Failsafe.XTERM"
Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in	(revision 5914)
+++ po/POTFILES.in	(working copy)
@@ -14,6 +14,7 @@
 daemon/gdm-net.c
 daemon/gdm-xdmcp-manager.c
 daemon/gdm.c
+daemon/gdm.h
 daemon/misc.c
 daemon/server.c
 daemon/slave.c