1 diff -ruN /home/cyba/gcvs/gimp/libgimp/gimputils.h gimp/libgimp/gimputils.h
2 --- /home/cyba/gcvs/gimp/libgimp/gimputils.h Thu Nov 23 12:38:50 2000
3 +++ gimp/libgimp/gimputils.h Wed Dec 6 19:32:58 2000
5 const gchar *exceptions);
6 gchar * gimp_strcompress (const gchar *source);
7 #endif /* GLIB <= 1.3 */
9 +gchar *gimp_i18n_qualifier_prefix_gettext (const gchar *string);
10 +gchar *gimp_i18n_qualifier_prefix_dgettext (const gchar *domain, const gchar *string);
11 +gchar *gimp_i18n_qualifier_prefix_noop (const gchar *string);
15 #endif /* __cplusplus */
17 #endif /* __GIMPUTILS_H__ */
21 diff -ruN /home/cyba/gcvs/gimp/libgimp/libgimp-intl.h gimp/libgimp/libgimp-intl.h
22 --- /home/cyba/gcvs/gimp/libgimp/libgimp-intl.h Thu Nov 23 12:38:50 2000
23 +++ gimp/libgimp/libgimp-intl.h Wed Dec 6 19:32:58 2000
25 #ifndef __LIBGIMP_INTL_H__
26 #define __LIBGIMP_INTL_H__
28 +#include "gimputils.h"
32 # define _(String) dgettext ("gimp-libgimp", String)
33 +# define Q_(String) gimp_i18n_qualifier_prefix_dgettext ("gimp-libgimp", String)
35 # define gettext(String) dgettext ("gimp-libgimp", String)
38 /* Stubs that do something close enough. */
39 # define gettext(String) (String)
40 # define _(String) (String)
41 +# define Q_(String) gimp_i18n_qualifier_prefix_noop (String)
42 # define N_(String) (String)
45 diff -ruN /home/cyba/gcvs/gimp/libgimp/gimpintl.h gimp/libgimp/gimpintl.h
46 --- /home/cyba/gcvs/gimp/libgimp/gimpintl.h Thu Nov 23 12:38:48 2000
47 +++ gimp/libgimp/gimpintl.h Wed Dec 6 19:32:58 2000
52 +#include "gimputils.h"
54 /* Copied from gnome-i18n.h by Tom Tromey <tromey@creche.cygnus.com>
55 * Heavily modified by Daniel Egger <Daniel.Egger@t-online.de>
56 * So be sure to hit me instead of him if something is wrong here
60 # define _(String) gettext (String)
61 +# define Q_(String) gimp_i18n_qualifier_prefix_gettext (String)
63 # define N_(String) gettext_noop (String)
66 # define dcgettext(Domain,Message,Type) (Message)
67 # define bindtextdomain(Domain,Directory) (Domain)
68 # define _(String) (String)
69 +# define Q_(String) gimp_i18n_qualifier_prefix_noop (String)
70 # define N_(String) (String)
73 diff -ruN /home/cyba/gcvs/gimp/libgimp/gimputils.c gimp/libgimp/gimputils.c
74 --- /home/cyba/gcvs/gimp/libgimp/gimputils.c Thu Nov 23 12:38:50 2000
75 +++ gimp/libgimp/gimputils.c Wed Dec 6 19:32:58 2000
80 +#include "gimpintl.h"
81 #include "gimputils.h"
83 +#define Q_PREFIX_START '!'
84 +#define Q_PREFIX_END '!'
88 * @source: A string to escape special characters in.
92 #endif /* GLIB <= 1.3 */
95 + * gimp_i18n_qualifier_prefix_gettext
99 +gimp_i18n_qualifier_prefix_gettext (const gchar *string)
101 + g_assert (string != NULL);
103 + if (*string != Q_PREFIX_START) {
104 + return gettext (string);
106 + gchar *translation;
108 + translation = gettext (string);
109 + if (translation != string) {
110 + if (*translation != Q_PREFIX_START) {
111 + return translation;
113 + gchar *real_translation;
115 + real_translation = strchr (translation + 1, Q_PREFIX_END);
116 + if (real_translation != NULL) {
117 + return real_translation + 1;
119 + g_warning ("Ivalid Q_() translation: \"%s\"", translation);
120 + return translation;
124 + gchar *real_string;
126 + real_string = strchr (string + 1, Q_PREFIX_END);
127 + if (real_string != NULL) {
128 + return gettext (real_string + 1);
130 + g_warning ("Ivalid Q_() string: \"%s\"", string);
131 + return (gchar *) string;
138 + * gimp_i18n_qualifier_prefix_dgettext
142 +gimp_i18n_qualifier_prefix_dgettext (const gchar *domain, const gchar *string)
144 + g_assert (string != NULL);
146 + if (*string != Q_PREFIX_START) {
147 + return dgettext (domain, string);
149 + gchar *translation;
151 + translation = dgettext (domain, string);
152 + if (translation != string) {
153 + if (*translation != Q_PREFIX_START) {
154 + return translation;
156 + gchar *real_translation;
158 + real_translation = strchr (translation + 1, Q_PREFIX_END);
159 + if (real_translation != NULL) {
160 + return real_translation + 1;
162 + g_warning ("Ivalid Q_() translation: \"%s\"", translation);
163 + return translation;
167 + gchar *real_string;
169 + real_string = strchr (string + 1, Q_PREFIX_END);
170 + if (real_string != NULL) {
171 + return dgettext (domain, real_string + 1);
173 + g_warning ("Ivalid Q_() string: \"%s\"", string);
174 + return (gchar *) string;
181 + * gimp_i18n_qualifier_prefix_noop
185 +gimp_i18n_qualifier_prefix_noop (const gchar *string)
187 + g_assert (string != NULL);
189 + if (*string != Q_PREFIX_START) {
190 + return (gchar *) string;
192 + gchar *real_string;
194 + real_string = strchr (string + 1, Q_PREFIX_END);
195 + if (real_string != NULL) {
196 + return real_string + 1;
198 + g_warning ("Ivalid Q_() string: \"%s\"", string);
199 + return (gchar *) string;
203 diff -ruN /home/cyba/gcvs/gimp/po/Makefile.in.in.i18npatch gimp/po/Makefile.in.in.i18npatch
204 --- /home/cyba/gcvs/gimp/po/Makefile.in.in.i18npatch Thu Jan 1 01:00:00 1970
205 +++ gimp/po/Makefile.in.in.i18npatch Wed Dec 6 19:35:34 2000
207 +--- Makefile.in.in.clean Wed Dec 6 19:33:55 2000
208 ++++ Makefile.in.in Wed Dec 6 19:32:58 2000
210 + $(srcdir)/$(PACKAGE).pot: $(POTFILES)
211 + $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
212 +- --add-comments --keyword=_ --keyword=N_ \
213 ++ --add-comments --keyword=_ --keyword=N_ --keyword=Q_ \
214 + --files-from=$(srcdir)/POTFILES.in \
215 + && test ! -f $(PACKAGE).po \
216 diff -ruN /home/cyba/gcvs/gimp/po-libgimp/Makefile.in.in gimp/po-libgimp/Makefile.in.in
217 --- /home/cyba/gcvs/gimp/po-libgimp/Makefile.in.in Thu Nov 23 12:39:17 2000
218 +++ gimp/po-libgimp/Makefile.in.in Wed Dec 6 19:32:58 2000
221 $(srcdir)/$(PACKAGE).pot: $(POTFILES)
222 $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
223 - --add-comments --keyword=_ --keyword=N_ \
224 + --add-comments --keyword=_ --keyword=N_ --keyword=Q_ \
225 --files-from=$(srcdir)/POTFILES.in \
226 && test ! -f $(PACKAGE).po \
227 || ( rm -f $(srcdir)/$(PACKAGE).pot \
228 diff -ruN /home/cyba/gcvs/gimp/po-plug-ins/Makefile.in.in gimp/po-plug-ins/Makefile.in.in
229 --- /home/cyba/gcvs/gimp/po-plug-ins/Makefile.in.in Thu Nov 23 12:39:17 2000
230 +++ gimp/po-plug-ins/Makefile.in.in Wed Dec 6 19:32:58 2000
233 $(srcdir)/$(PACKAGE).pot: $(POTFILES)
234 $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
235 - --add-comments --keyword=_ --keyword=N_ \
236 + --add-comments --keyword=_ --keyword=N_ --keyword=Q_ \
237 --files-from=$(srcdir)/POTFILES.in \
238 && test ! -f $(PACKAGE).po \
239 || ( rm -f $(srcdir)/$(PACKAGE).pot \