From: Owen Taylor Date: Fri, 14 Jul 2000 20:08:10 +0000 (+0000) Subject: Move gtk-config to gtk-config-2.0 move gtk_.m4 to gtk-2.0.m4 X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=bb268900245f3760ccd65c33d53602ab53fe2752 Move gtk-config to gtk-config-2.0 move gtk_.m4 to gtk-2.0.m4 Fri Jul 14 12:22:49 2000 Owen Taylor * configure.in Makefile.am gtk-config.m4 gtk.m4: Move gtk-config to gtk-config-2.0 move gtk_.m4 to gtk-2.0.m4 * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am gdk/Makefile.am demos/Makefile.am: Change library names to libgtk-1.3.la, etc, so that we can distinguish gtk-1.2 and gtk-2.0 on the linkline. * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am gdk/Makefile.am gdk/x11/Makfile.am Move include files into /usr/include/gtk-2.0, /usr/lib/gtk-2.0/include/ * autogen.sh acconfig.h configure.in gtk/gtkmain.c gtk/gtkintl.h: Change package for gettext from gtk+ to gtk20. Put hack in autogen.sh to modify po/Makefile.in.in after gettextize to make this possible. * gtk+.spec: Some updates, not tested. * gdk-pixbuf/Makefile.am: Move loaders into $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders. * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir to THEMENAME/gtk-2.0/. Move engine directory to $(libdir)/gtk-2.0/$(GTK_VERSION)/engines. --- diff --git a/ChangeLog b/ChangeLog index a103db74a..dbe40ce79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +Fri Jul 14 12:22:49 2000 Owen Taylor + + * configure.in Makefile.am gtk-config.m4 gtk.m4: Move + gtk-config to gtk-config-2.0 move gtk_.m4 to + gtk-2.0.m4 + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am demos/Makefile.am: Change + library names to libgtk-1.3.la, etc, so that we + can distinguish gtk-1.2 and gtk-2.0 on the linkline. + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am gdk/x11/Makfile.am + Move include files into /usr/include/gtk-2.0, + /usr/lib/gtk-2.0/include/ + + * autogen.sh acconfig.h configure.in gtk/gtkmain.c + gtk/gtkintl.h: Change package for gettext from + gtk+ to gtk20. Put hack in autogen.sh to modify + po/Makefile.in.in after gettextize to make this + possible. + + * gtk+.spec: Some updates, not tested. + + * gdk-pixbuf/Makefile.am: Move loaders into + $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders. + + * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations + $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir + to THEMENAME/gtk-2.0/. Move engine directory to + $(libdir)/gtk-2.0/$(GTK_VERSION)/engines + 2000-07-12 Tor Lillqvist Win32 changes, still doesn't build though. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a103db74a..dbe40ce79 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,35 @@ +Fri Jul 14 12:22:49 2000 Owen Taylor + + * configure.in Makefile.am gtk-config.m4 gtk.m4: Move + gtk-config to gtk-config-2.0 move gtk_.m4 to + gtk-2.0.m4 + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am demos/Makefile.am: Change + library names to libgtk-1.3.la, etc, so that we + can distinguish gtk-1.2 and gtk-2.0 on the linkline. + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am gdk/x11/Makfile.am + Move include files into /usr/include/gtk-2.0, + /usr/lib/gtk-2.0/include/ + + * autogen.sh acconfig.h configure.in gtk/gtkmain.c + gtk/gtkintl.h: Change package for gettext from + gtk+ to gtk20. Put hack in autogen.sh to modify + po/Makefile.in.in after gettextize to make this + possible. + + * gtk+.spec: Some updates, not tested. + + * gdk-pixbuf/Makefile.am: Move loaders into + $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders. + + * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations + $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir + to THEMENAME/gtk-2.0/. Move engine directory to + $(libdir)/gtk-2.0/$(GTK_VERSION)/engines + 2000-07-12 Tor Lillqvist Win32 changes, still doesn't build though. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a103db74a..dbe40ce79 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,35 @@ +Fri Jul 14 12:22:49 2000 Owen Taylor + + * configure.in Makefile.am gtk-config.m4 gtk.m4: Move + gtk-config to gtk-config-2.0 move gtk_.m4 to + gtk-2.0.m4 + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am demos/Makefile.am: Change + library names to libgtk-1.3.la, etc, so that we + can distinguish gtk-1.2 and gtk-2.0 on the linkline. + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am gdk/x11/Makfile.am + Move include files into /usr/include/gtk-2.0, + /usr/lib/gtk-2.0/include/ + + * autogen.sh acconfig.h configure.in gtk/gtkmain.c + gtk/gtkintl.h: Change package for gettext from + gtk+ to gtk20. Put hack in autogen.sh to modify + po/Makefile.in.in after gettextize to make this + possible. + + * gtk+.spec: Some updates, not tested. + + * gdk-pixbuf/Makefile.am: Move loaders into + $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders. + + * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations + $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir + to THEMENAME/gtk-2.0/. Move engine directory to + $(libdir)/gtk-2.0/$(GTK_VERSION)/engines + 2000-07-12 Tor Lillqvist Win32 changes, still doesn't build though. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a103db74a..dbe40ce79 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,35 @@ +Fri Jul 14 12:22:49 2000 Owen Taylor + + * configure.in Makefile.am gtk-config.m4 gtk.m4: Move + gtk-config to gtk-config-2.0 move gtk_.m4 to + gtk-2.0.m4 + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am demos/Makefile.am: Change + library names to libgtk-1.3.la, etc, so that we + can distinguish gtk-1.2 and gtk-2.0 on the linkline. + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am gdk/x11/Makfile.am + Move include files into /usr/include/gtk-2.0, + /usr/lib/gtk-2.0/include/ + + * autogen.sh acconfig.h configure.in gtk/gtkmain.c + gtk/gtkintl.h: Change package for gettext from + gtk+ to gtk20. Put hack in autogen.sh to modify + po/Makefile.in.in after gettextize to make this + possible. + + * gtk+.spec: Some updates, not tested. + + * gdk-pixbuf/Makefile.am: Move loaders into + $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders. + + * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations + $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir + to THEMENAME/gtk-2.0/. Move engine directory to + $(libdir)/gtk-2.0/$(GTK_VERSION)/engines + 2000-07-12 Tor Lillqvist Win32 changes, still doesn't build though. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a103db74a..dbe40ce79 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,35 @@ +Fri Jul 14 12:22:49 2000 Owen Taylor + + * configure.in Makefile.am gtk-config.m4 gtk.m4: Move + gtk-config to gtk-config-2.0 move gtk_.m4 to + gtk-2.0.m4 + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am demos/Makefile.am: Change + library names to libgtk-1.3.la, etc, so that we + can distinguish gtk-1.2 and gtk-2.0 on the linkline. + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am gdk/x11/Makfile.am + Move include files into /usr/include/gtk-2.0, + /usr/lib/gtk-2.0/include/ + + * autogen.sh acconfig.h configure.in gtk/gtkmain.c + gtk/gtkintl.h: Change package for gettext from + gtk+ to gtk20. Put hack in autogen.sh to modify + po/Makefile.in.in after gettextize to make this + possible. + + * gtk+.spec: Some updates, not tested. + + * gdk-pixbuf/Makefile.am: Move loaders into + $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders. + + * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations + $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir + to THEMENAME/gtk-2.0/. Move engine directory to + $(libdir)/gtk-2.0/$(GTK_VERSION)/engines + 2000-07-12 Tor Lillqvist Win32 changes, still doesn't build though. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a103db74a..dbe40ce79 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,35 @@ +Fri Jul 14 12:22:49 2000 Owen Taylor + + * configure.in Makefile.am gtk-config.m4 gtk.m4: Move + gtk-config to gtk-config-2.0 move gtk_.m4 to + gtk-2.0.m4 + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am demos/Makefile.am: Change + library names to libgtk-1.3.la, etc, so that we + can distinguish gtk-1.2 and gtk-2.0 on the linkline. + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am gdk/x11/Makfile.am + Move include files into /usr/include/gtk-2.0, + /usr/lib/gtk-2.0/include/ + + * autogen.sh acconfig.h configure.in gtk/gtkmain.c + gtk/gtkintl.h: Change package for gettext from + gtk+ to gtk20. Put hack in autogen.sh to modify + po/Makefile.in.in after gettextize to make this + possible. + + * gtk+.spec: Some updates, not tested. + + * gdk-pixbuf/Makefile.am: Move loaders into + $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders. + + * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations + $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir + to THEMENAME/gtk-2.0/. Move engine directory to + $(libdir)/gtk-2.0/$(GTK_VERSION)/engines + 2000-07-12 Tor Lillqvist Win32 changes, still doesn't build though. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a103db74a..dbe40ce79 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,35 @@ +Fri Jul 14 12:22:49 2000 Owen Taylor + + * configure.in Makefile.am gtk-config.m4 gtk.m4: Move + gtk-config to gtk-config-2.0 move gtk_.m4 to + gtk-2.0.m4 + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am demos/Makefile.am: Change + library names to libgtk-1.3.la, etc, so that we + can distinguish gtk-1.2 and gtk-2.0 on the linkline. + + * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am + gdk/Makefile.am gdk/x11/Makfile.am + Move include files into /usr/include/gtk-2.0, + /usr/lib/gtk-2.0/include/ + + * autogen.sh acconfig.h configure.in gtk/gtkmain.c + gtk/gtkintl.h: Change package for gettext from + gtk+ to gtk20. Put hack in autogen.sh to modify + po/Makefile.in.in after gettextize to make this + possible. + + * gtk+.spec: Some updates, not tested. + + * gdk-pixbuf/Makefile.am: Move loaders into + $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders. + + * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations + $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir + to THEMENAME/gtk-2.0/. Move engine directory to + $(libdir)/gtk-2.0/$(GTK_VERSION)/engines + 2000-07-12 Tor Lillqvist Win32 changes, still doesn't build though. diff --git a/Makefile.am b/Makefile.am index 24c865adc..d5ae251f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SRC_SUBDIRS = gdk-pixbuf gdk modules gtk demos SUBDIRS = po $(SRC_SUBDIRS) docs -bin_SCRIPTS = gtk-config +bin_SCRIPTS = gtk-config-2.0 # require automake 1.4 AUTOMAKE_OPTIONS = 1.4 @@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = 1.4 EXTRA_DIST = \ HACKING \ gtk+.spec.in \ - gtk.m4 \ + gtk-2.0.m4 \ makecopyright \ TODO \ TODO.xml \ @@ -122,7 +122,7 @@ dist-hook: gtk+.spec && cp gtk+.spec $(distdir) m4datadir = $(datadir)/aclocal -m4data_DATA = gtk.m4 +m4data_DATA = gtk-2.0.m4 .PHONY: files release sanity snapshot diff --git a/acconfig.h b/acconfig.h index 1ac89ef75..5093d4106 100644 --- a/acconfig.h +++ b/acconfig.h @@ -54,6 +54,8 @@ /* Most machines will be happy with int or void. IRIX requires '...' */ #undef SIGNAL_ARG_TYPE +#undef GETTEXT_PACKAGE + /* #undef PACKAGE */ /* #undef VERSION */ diff --git a/autogen.sh b/autogen.sh index 6fe026c86..441e33fcc 100755 --- a/autogen.sh +++ b/autogen.sh @@ -71,6 +71,12 @@ echo "Running gettextize... Ignore non-fatal messages." # while making dist. echo "no" | gettextize --copy --force +# +# Really bad hack +echo "Munging po/Makefile.in.in" +sed s%@PACKAGE@%@GETTEXT_PACKAGE@% < po/Makefile.in.in > po/Makefile.in.in.new +mv po/Makefile.in.in.new po/Makefile.in.in + aclocal $ACLOCAL_FLAGS # optionally feature autoheader diff --git a/configure.in b/configure.in index fa7eeca45..6f8d6afb0 100644 --- a/configure.in +++ b/configure.in @@ -70,6 +70,10 @@ AC_SUBST(GDK_PIXBUF_VERSION) VERSION=$GTK_VERSION PACKAGE=gtk+ +GETTEXT_PACKAGE=gtk20 +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"gtk2") + # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} @@ -114,8 +118,8 @@ AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ]) AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ]) gdktarget=x11 -gdktargetlib=libgdk-x11.la -gtktargetlib=libgtk-x11.la +gdktargetlib=libgdk-x11-1.3.la +gtktargetlib=libgtk-x11-1.3.la AC_ARG_WITH(gdktarget, [ --with-gdktarget=[x11/nanox/linux-fb] select GDK target [default=x11] ], gdktarget=$with_gdktarget) @@ -277,36 +281,36 @@ fi if test x$with_glib = x ; then # Look for separately installed glib - AM_PATH_GLIB(1.3.1,, + AM_PATH_GLIB_2_0(1.3.1,, AC_MSG_ERROR([ *** GLIB 1.3.1 or better is required. The latest version of GLIB *** is always available from ftp://ftp.gtk.org/.]), gobject gmodule gthread) # we do not want to make all gtk progs to link to thread libraries. - glib_cflags=`$GLIB_CONFIG glib gobject gmodule --cflags` + glib_cflags=`$GLIB_CONFIG_2_0 glib gobject gmodule --cflags` glib_thread_cflags="$GLIB_CFLAGS" - glib_libs=`$GLIB_CONFIG glib gobject gmodule --libs` + glib_libs=`$GLIB_CONFIG_2_0 glib gobject gmodule --libs` glib_thread_libs="$GLIB_LIBS" GLIB_LIBS="$glib_libs" GLIB_DEPLIBS="$glib_libs" else # Use uninstalled glib (assume they got the version right) - GLIB_CONFIG=$with_glib/glib-config - if test -x $GLIB_CONFIG ; then + GLIB_CONFIG_2_0=$with_glib/glib-config-2.0 + if test -x $GLIB_CONFIG_2_0 ; then : else AC_MSG_ERROR([GLIB directory ($with_glib) not present or not configured]) fi # For use in gtk-config - glib_cflags=`$GLIB_CONFIG --cflags gmodule` - glib_thread_cflags=`$GLIB_CONFIG --cflags gmodule gthread` - glib_libs=`$GLIB_CONFIG --libs gmodule` - glib_thread_libs=`$GLIB_CONFIG --libs gmodule gthread` + glib_cflags=`$GLIB_CONFIG_2_0 --cflags gmodule` + glib_thread_cflags=`$GLIB_CONFIG_2_0 --cflags gmodule gthread` + glib_libs=`$GLIB_CONFIG_2_0 --libs gmodule` + glib_thread_libs=`$GLIB_CONFIG_2_0 --libs gmodule gthread` - glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'` + glib_release=`$GLIB_CONFIG_2_0 --version | sed 's%\\.[[0-9]]*$%%'` # canonicalize relative paths case $with_glib in @@ -319,7 +323,7 @@ else esac GLIB_CFLAGS="-I$glib_dir -I$glib_dir/gmodule" - GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule/libgmodule.la" + GLIB_LIBS="$glib_dir/libglib-1.3.la $glib_dir/gmodule/libgmodule-1.3.la" GLIB_DEPLIBS= AC_SUBST(GLIB_CFLAGS) @@ -466,8 +470,8 @@ if test "x$gdktarget" = "xx11"; then more_includes="$x_includes" # these are already defined above - #gdktargetlib = "libgdk-x11.la" - #gtktargetlib = "libgtk-x11.la" + #gdktargetlib = "libgdk-x11-1.3.la" + #gtktargetlib = "libgtk-x11-1.3.la" AM_CONDITIONAL(USE_X11, true) else @@ -482,8 +486,8 @@ if test "x$gdktarget" = "xnanox"; then more_libs="-lnano-X" more_includes= - gdktargetlib="libgdk-nanox.la" - gtktargetlib="libgtk-nanox.la" + gdktargetlib="libgdk-nanox-1.3.la" + gtktargetlib="libgtk-nanox-1.3.la" with_xinput=no AC_DEFINE(XINPUT_NONE) @@ -503,8 +507,8 @@ if test "x$gdktarget" = "xlinux-fb"; then more_libs= more_includes= - gdktargetlib="libgdk-linux-fb.la" - gtktargetlib="libgtk-linux-fb.la" + gdktargetlib="libgdk-linux-fb-1.3.la" + gtktargetlib="libgtk-linux-fb-1.3.la" with_xinput=no AC_DEFINE(XINPUT_NONE) @@ -715,8 +719,8 @@ fi if $dynworks; then AC_DEFINE(USE_GMODULE) - GMODULE_LIBS="`glib-config --libs gmodule`" - GMODULE_FLAGS="`glib-config --cflags gmodule`" + GMODULE_LIBS="`$GLIB_CONFIG_2_0 --libs gmodule`" + GMODULE_FLAGS="`$GLIB_CONFIG_2_0 --cflags gmodule`" AC_SUBST(GMODULE_LIBS) AC_SUBST(GMODULE_FLAGS) AC_MSG_RESULT(yes) @@ -987,7 +991,7 @@ AC_OUTPUT([ gtk+.spec docs/gtk-config.1 Makefile -gtk-config +gtk-config-2.0 po/Makefile.in demos/Makefile docs/Makefile @@ -1007,4 +1011,4 @@ gtk/Makefile gtk/gtkcompat.h modules/Makefile modules/linux-fb/Makefile -], [chmod +x gtk-config]) +], [chmod +x gtk-config-2.0]) diff --git a/demos/Makefile.am b/demos/Makefile.am index 69c49272d..de568fea3 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -13,12 +13,12 @@ INCLUDES = @STRIP_BEGIN@ \ @STRIP_END@ DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf.la \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ $(top_builddir)/gdk/@gdktargetlib@ \ $(top_builddir)/gtk/@gtktargetlib@ LDADDS = @STRIP_BEGIN@ \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf.la \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ $(top_builddir)/gdk/@gdktargetlib@ \ $(top_builddir)/gtk/@gtktargetlib@ \ @more_ldflags@ \ diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 8bb61b676..79b04626f 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -1,9 +1,9 @@ SUBDIRS = pixops lib_LTLIBRARIES = \ - libgdk_pixbuf.la + libgdk_pixbuf-1.3.la -libexecdir = $(libdir)/gdk-pixbuf/loaders +loaderdir = $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders # # The PNG plugin. @@ -94,7 +94,7 @@ BMP_LIB = libpixbufloader-bmp.la if BUILD_DYNAMIC_MODULES -libexec_LTLIBRARIES = \ +loader_LTLIBRARIES = \ $(PNG_LIB) \ $(JPEG_LIB) \ $(GIF_LIB) \ @@ -109,7 +109,7 @@ libexec_LTLIBRARIES = \ extra_sources = else -libexec_LTLIBRARIES = +loader_LTLIBRARIES = extra_sources = $(libpixbufloader_png_la_SOURCES) \ $(libpixbufloader_jpeg_la_SOURCES) \ @@ -127,14 +127,14 @@ endif noinst_PROGRAMS = test-gdk-pixbuf TESTS = test-gdk-pixbuf -DEPS = libgdk_pixbuf.la +DEPS = libgdk_pixbuf-1.3.la INCLUDES = -I$(top_srcdir) -I$(top_builddir) \ -I$(top_srcdir)/gdk-pixbuf \ -I$(top_builddir)/gdk-pixbuf \ $(GLIB_CFLAGS) -AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\"" +AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" -LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(STATIC_LIB_DEPS) +LDADDS = libgdk_pixbuf-1.3.la $(GLIB_LIBS) $(STATIC_LIB_DEPS) test_gdk_pixbuf_LDADD = $(LDADDS) -lgmodule @@ -144,9 +144,9 @@ GDK_PIXBUF_LIBS = $(GLIB_LIBS) # The GdkPixBuf library # -libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf +libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf -libgdk_pixbuf_la_SOURCES = \ +libgdk_pixbuf_1_3_la_SOURCES = \ gdk-pixbuf.c \ gdk-pixbuf-animation.c \ gdk-pixbuf-data.c \ @@ -155,11 +155,10 @@ libgdk_pixbuf_la_SOURCES = \ gdk-pixbuf-util.c \ $(extra_sources) -libgdk_pixbuf_la_LDFLAGS = \ +libgdk_pixbuf_1_3_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) \ $(GLIB_LIBS) -libgdk_pixbuf_la_LIBADD = pixops/libpixops.la +libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la libgdk_pixbufinclude_HEADERS = \ gdk-pixbuf.h \ diff --git a/gdk/Makefile.am b/gdk/Makefile.am index a84c494e1..223e826fc 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -30,7 +30,6 @@ gtarget=@gdktarget@ # we use the general approach here LDFLAGS = @STRIP_BEGIN@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) \ -export-dynamic \ -rpath @prefix@/lib \ @PANGO_LIBS@ \ @@ -109,39 +108,39 @@ gdk_c_sources = @STRIP_BEGIN@ \ extra = @gdktargetlib@ if USE_X11 -libgdk_x11_includedir = $(includedir)/gdk +libgdk_x11_includedir = $(includedir)/gtk-2.0/gdk -libgdk_x11_la_LIBADD = \ +libgdk_x11_1_3_la_LIBADD = \ $(gtarget)/libgdk-$(gtarget).la libgdk_x11_include_HEADERS = $(gdk_public_h_sources) -libgdk_x11_la_SOURCES = $(gdk_c_sources) +libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources) endif if USE_NANOX -libgdk_nanox_includedir = $(includedir)/gdk +libgdk_nanox_includedir = $(includedir)/gtk-2.0/gdk -libgdk_nanox_la_LIBADD = \ +libgdk_nanox_1_3_la_LIBADD = \ $(gtarget)/libgdk-$(gtarget).la libgdk_nanox_include_HEADERS = $(gdk_public_h_sources) -libgdk_nanox_la_SOURCES = $(gdk_c_sources) +libgdk_nanox_1_3_la_SOURCES = $(gdk_c_sources) endif if USE_LINUX_FB -libgdk_linux_fb_includedir = $(includedir)/gdk +libgdk_linux_fb_includedir = $(includedir)/gtk-2.0/gdk -libgdk_linux_fb_la_LIBADD = \ +libgdk_linux_fb_1_3_la_LIBADD = \ $(gtarget)/libgdk-$(gtarget).la libgdk_linux_fb_include_HEADERS = $(gdk_public_h_sources) -libgdk_linux_fb_la_SOURCES = $(gdk_c_sources) +libgdk_linux_fb_1_3_la_SOURCES = $(gdk_c_sources) endif # now define the real one to workaround automake's mishandling lib_LTLIBRARIES = $(extra) -EXTRA_LTLIBRARIES = libgdk-x11.la libgdk-nanox.la libgdk-linux-fb.la +EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-linux-fb-1.3.la MAINTAINERCLEANFILES += EXTRA_HEADERS += @@ -164,7 +163,7 @@ X-derived-headers: # # Rule to install gdkconfig.h header file # -configexecincludedir = $(pkglibdir)/include +configexecincludedir = $(libdir)/gtk-2.0/include #configexecinclude_DATA = gdkconfig.h install-exec-local: gdkconfig.h $(mkinstalldirs) $(DESTDIR)$(configexecincludedir) diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index 5c73ef3ad..d4870774d 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -libgdkincludedir = $(includedir)/gdk -libgdkx11includedir = $(includedir)/gdk/x11 +libgdkincludedir = $(includedir)/gtk-2.0/gdk +libgdkx11includedir = $(includedir)/gtk-2.0/gdk/x11 INCLUDES = @STRIP_BEGIN@ \ -DG_LOG_DOMAIN=\"Gdk\" \ diff --git a/gtk+.spec.in b/gtk+.spec.in index 7e29a6e0e..4706e51a8 100644 --- a/gtk+.spec.in +++ b/gtk+.spec.in @@ -15,7 +15,6 @@ BuildRoot: /var/tmp/gtk-%{PACKAGE_VERSION}-root Obsoletes: gtk Packager: Christopher Blizzard URL: http://www.gtk.org -Prereq: /sbin/install-info Requires: glib Docdir: %{prefix}/doc @@ -28,7 +27,6 @@ Summary: GIMP Toolkit and GIMP Drawing Kit Group: X11/Libraries Requires: gtk+ Obsoletes: gtk-devel -PreReq: /sbin/install-info %description devel Static libraries and header files for the GIMP's X libraries, which are @@ -130,8 +128,6 @@ rm -rf $RPM_BUILD_ROOT make prefix=$RPM_BUILD_ROOT%{prefix} install -gzip -9n $RPM_BUILD_ROOT%{prefix}/info/* - %clean rm -rf $RPM_BUILD_ROOT @@ -139,16 +135,6 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig -%post devel -/sbin/install-info %{prefix}/info/gdk.info.gz %{prefix}/info/dir -/sbin/install-info %{prefix}/info/gtk.info.gz %{prefix}/info/dir - -%preun devel -if [ $1 = 0 ]; then - /sbin/install-info --delete %{prefix}/info/gdk.info.gz %{prefix}/info/dir - /sbin/install-info --delete %{prefix}/info/gtk.info.gz %{prefix}/info/dir -fi - %files %defattr(-, root, root) @@ -165,8 +151,7 @@ fi %{prefix}/lib/lib*.so %{prefix}/lib/*a %{prefix}/include/* -%{prefix}/include/lib/gtk+/include/* -%{prefix}/info/* +%{prefix}/include/lib/gtk+-2.0/include/* %{prefix}/man/man1/* %{prefix}/share/aclocal/* %{prefix}/bin/* diff --git a/gtk.m4 b/gtk-2.0.m4 similarity index 78% rename from gtk.m4 rename to gtk-2.0.m4 index ef5a673a3..7672e2f13 100644 --- a/gtk.m4 +++ b/gtk-2.0.m4 @@ -1,12 +1,12 @@ # Configure paths for GTK+ # Owen Taylor 97-11-3 -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl AM_PATH_GTK2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS dnl -AC_DEFUN(AM_PATH_GTK, +AC_DEFUN(AM_PATH_GTK2, [dnl -dnl Get the cflags and libraries from the gtk-config script +dnl Get the cflags and libraries from the gtk2-config script dnl AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], gtk_config_prefix="$withval", gtk_config_prefix="") @@ -26,31 +26,31 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run if test x$gtk_config_exec_prefix != x ; then gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + if test x${GTK2_CONFIG+set} != xset ; then + GTK2_CONFIG=$gtk_config_exec_prefix/bin/gtk2-config fi fi if test x$gtk_config_prefix != x ; then gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + if test x${GTK2_CONFIG+set} != xset ; then + GTK2_CONFIG=$gtk_config_prefix/bin/gtk2-config fi fi - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=ifelse([$1], ,0.99.7,$1) + AC_PATH_PROG(GTK2_CONFIG, gtk2-config, no) + min_gtk_version=ifelse([$1], ,1.3.1,$1) AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) no_gtk="" - if test "$GTK_CONFIG" = "no" ; then + if test "$GTK2_CONFIG" = "no" ; then no_gtk=yes else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ + GTK_CFLAGS=`$GTK2_CONFIG $gtk_config_args --cflags` + GTK_LIBS=`$GTK2_CONFIG $gtk_config_args --libs` + gtk_config_major_version=`$GTK2_CONFIG $gtk_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ + gtk_config_minor_version=`$GTK2_CONFIG $gtk_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ + gtk_config_micro_version=`$GTK2_CONFIG $gtk_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` if test "x$enable_gtktest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" @@ -59,7 +59,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run LIBS="$GTK_LIBS $LIBS" dnl dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent +dnl checks the results of gtk2-config to some extent dnl rm -f conf.gtktest AC_TRY_RUN([ @@ -86,16 +86,16 @@ main () (gtk_minor_version != $gtk_config_minor_version) || (gtk_micro_version != $gtk_config_micro_version)) { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + printf("\n*** 'gtk2-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); + printf ("*** was found! If gtk2-config was correct, then it is best\n"); printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); + printf("*** If gtk2-config was wrong, set the environment variable GTK2_CONFIG\n"); + printf("*** to point to the correct copy of gtk2-config, and remove the file config.cache\n"); printf("*** before re-running configure\n"); } #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) @@ -126,10 +126,10 @@ main () printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); printf("***\n"); printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); + printf("*** probably means that the wrong copy of the gtk2-config shell script is\n"); printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); + printf("*** of GTK+, but you can also set the GTK2_CONFIG environment to point to the\n"); + printf("*** correct copy of gtk2-config. (In this case, you will have to\n"); printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); printf("*** so that the correct libraries are found at run-time))\n"); } @@ -146,11 +146,11 @@ main () ifelse([$2], , :, [$2]) else AC_MSG_RESULT(no) - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" + if test "$GTK2_CONFIG" = "no" ; then + echo "*** The gtk2-config script installed by GTK could not be found" echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." + echo "*** your path, or set the GTK2_CONFIG environment variable to the" + echo "*** full path to gtk2-config." else if test -f conf.gtktest ; then : @@ -179,7 +179,7 @@ main () [ echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means GTK was incorrectly installed" echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) + echo "*** may want to edit the gtk2-config script: $GTK2_CONFIG" ]) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi diff --git a/gtk-config.in b/gtk-config-2.0.in similarity index 79% rename from gtk-config.in rename to gtk-config-2.0.in index b186ea1e9..84c4e3cca 100644 --- a/gtk-config.in +++ b/gtk-config-2.0.in @@ -13,7 +13,7 @@ exec_prefix_set=no usage() { cat < \ - $(DESTDIR)$(datadir)/themes/Default/gtk/gtkrc + $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc $(mkinstalldirs) $(DESTDIR)$(gtkconfdir) cd $(DESTDIR)$(gtkconfdir) && \ for i in cs hr hu pl ro sk sl sq sr ; do \ @@ -513,16 +513,16 @@ install-data-local: ln -s gtkrc.cp1251 gtkrc.bg uninstall-local: - rm -f $(DESTDIR)$(datadir)/themes/Default/gtkrc + rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc # # test programs, not to be installed # noinst_PROGRAMS = testgtk testcalendar testinput testselection testrgb testdnd testtext simple testtextbuffer # testthreads -DEPS = @gtktargetlib@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf.la $(top_builddir)/gdk/@gdktargetlib@ +DEPS = @gtktargetlib@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la $(top_builddir)/gdk/@gdktargetlib@ LDADDS = @STRIP_BEGIN@ \ @gtktargetlib@ \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf.la \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ $(top_builddir)/gdk/@gdktargetlib@ \ @more_ldflags@ \ @more_libs@ \ diff --git a/gtk/gtkintl.h b/gtk/gtkintl.h index bd2ff54b3..ab0478e6c 100644 --- a/gtk/gtkintl.h +++ b/gtk/gtkintl.h @@ -5,7 +5,7 @@ #ifdef ENABLE_NLS #include -#define _(String) dgettext("gtk+",String) +#define _(String) dgettext(GETTEXT_PACKAGE,String) #ifdef gettext_noop #define N_(String) gettext_noop(String) #else diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 644677688..5fb6eeb22 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -401,15 +401,15 @@ gtk_init_check (int *argc, #ifdef ENABLE_NLS #ifndef G_OS_WIN32 - bindtextdomain("gtk+", GTK_LOCALEDIR); + bindtextdomain(GETTEXT_PACKAGE, GTK_LOCALEDIR); #else { /* GTk+ locale dir is %WinDir%\gtk+\locale */ extern char *get_gtk_sysconf_directory (); - bindtextdomain ("gtk+", g_strconcat (get_gtk_sysconf_directory (), - G_DIR_SEPARATOR_S, - "locale", - NULL)); + bindtextdomain (GETTEXT_PACKAGE, g_strconcat (get_gtk_sysconf_directory (), + G_DIR_SEPARATOR_S, + "locale", + NULL)); } #endif #endif diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index b5b7f9f7a..41c6b2e29 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -320,9 +320,9 @@ gtk_rc_get_module_dir(void) #ifndef G_OS_WIN32 var = getenv("GTK_EXE_PREFIX"); if (var) - path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines"); + path = g_strdup_printf("%s%s", var, "/lib/gtk-2.0/" GTK_VERSION "/engines"); else - path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); + path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk-2.0/" GTK_VERSION "/engines"); #else path = g_strdup_printf ("%s%s", get_themes_directory (), "\\engines"); #endif @@ -369,9 +369,9 @@ gtk_rc_append_default_module_path(void) #ifndef G_OS_WIN32 var = getenv("GTK_EXE_PREFIX"); if (var) - path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines"); + path = g_strdup_printf("%s%s", var, "/lib/gtk-2.0/" GTK_VERSION "/engines"); else - path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); + path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk-2.0/" GTK_VERSION "/engines"); #else path = g_strdup_printf ("%s%s", get_themes_directory (), "\\engines"); #endif @@ -381,7 +381,7 @@ gtk_rc_append_default_module_path(void) if (var) { #ifndef G_OS_WIN32 - path = g_strdup_printf ("%s%s", var, "/.gtk/lib/themes/engines"); + path = g_strdup_printf ("%s%s", var, "/.gtk-2.0/" GTK_VERSION "/engines"); #else path = g_strdup_printf ("%s%s", var, "\\_gtk\\themes\\engines"); #endif @@ -419,17 +419,18 @@ gtk_rc_add_initial_default_files (void) else { #ifndef G_OS_WIN32 - str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk" G_DIR_SEPARATOR_S "gtkrc"); + str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc"); #else str = g_strdup_printf ("%s\\gtkrc", get_gtk_sysconf_directory ()); #endif + gtk_rc_add_default_file (str); g_free (str); var = g_get_home_dir (); if (var) { - str = g_strdup_printf ("%s" G_DIR_SEPARATOR_S ".gtkrc", var); + str = g_strdup_printf ("%s" G_DIR_SEPARATOR_S ".gtkrc-2.0", var); gtk_rc_add_default_file (str); g_free (str); } diff --git a/m4macros/gtk-2.0.m4 b/m4macros/gtk-2.0.m4 new file mode 100644 index 000000000..7672e2f13 --- /dev/null +++ b/m4macros/gtk-2.0.m4 @@ -0,0 +1,194 @@ +# Configure paths for GTK+ +# Owen Taylor 97-11-3 + +dnl AM_PATH_GTK2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS +dnl +AC_DEFUN(AM_PATH_GTK2, +[dnl +dnl Get the cflags and libraries from the gtk2-config script +dnl +AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], + gtk_config_prefix="$withval", gtk_config_prefix="") +AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], + gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") +AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], + , enable_gtktest=yes) + + for module in . $4 + do + case "$module" in + gthread) + gtk_config_args="$gtk_config_args gthread" + ;; + esac + done + + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK2_CONFIG+set} != xset ; then + GTK2_CONFIG=$gtk_config_exec_prefix/bin/gtk2-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK2_CONFIG+set} != xset ; then + GTK2_CONFIG=$gtk_config_prefix/bin/gtk2-config + fi + fi + + AC_PATH_PROG(GTK2_CONFIG, gtk2-config, no) + min_gtk_version=ifelse([$1], ,1.3.1,$1) + AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) + no_gtk="" + if test "$GTK2_CONFIG" = "no" ; then + no_gtk=yes + else + GTK_CFLAGS=`$GTK2_CONFIG $gtk_config_args --cflags` + GTK_LIBS=`$GTK2_CONFIG $gtk_config_args --libs` + gtk_config_major_version=`$GTK2_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gtk_config_minor_version=`$GTK2_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gtk_config_micro_version=`$GTK2_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gtktest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$GTK_LIBS $LIBS" +dnl +dnl Now check if the installed GTK is sufficiently new. (Also sanity +dnl checks the results of gtk2-config to some extent +dnl + rm -f conf.gtktest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.gtktest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_gtk_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } + + if ((gtk_major_version != $gtk_config_major_version) || + (gtk_minor_version != $gtk_config_minor_version) || + (gtk_micro_version != $gtk_config_micro_version)) + { + printf("\n*** 'gtk2-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf ("*** was found! If gtk2-config was correct, then it is best\n"); + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If gtk2-config was wrong, set the environment variable GTK2_CONFIG\n"); + printf("*** to point to the correct copy of gtk2-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } +#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) + { + printf("*** GTK+ header files (version %d.%d.%d) do not match\n", + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + } +#endif /* defined (GTK_MAJOR_VERSION) ... */ + else + { + if ((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the gtk2-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GTK+, but you can also set the GTK2_CONFIG environment to point to the\n"); + printf("*** correct copy of gtk2-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$GTK2_CONFIG" = "no" ; then + echo "*** The gtk2-config script installed by GTK could not be found" + echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GTK2_CONFIG environment variable to the" + echo "*** full path to gtk2-config." + else + if test -f conf.gtktest ; then + : + else + echo "*** Could not run GTK test program, checking why..." + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK or finding the wrong" + echo "*** version of GTK. If it is not finding GTK, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" + echo "*** came with the system with the command" + echo "***" + echo "*** rpm --erase --nodeps gtk gtk-devel" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GTK was incorrectly installed" + echo "*** or that you have moved GTK since it was installed. In the latter case, you" + echo "*** may want to edit the gtk2-config script: $GTK2_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GTK_CFLAGS="" + GTK_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + rm -f conf.gtktest +]) diff --git a/po/ca.po b/po/ca.po index ba5e97067..2312ca7e8 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-11-18 21:11+01:00\n" "Last-Translator: Softcatala \n" "Language-Team: linux-ca@chanae.alphanet.ch\n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "Val" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Cancel·lar" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Ajuda" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "Directoris" msgid "Files" msgstr "Fitxers" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "Val" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Cancel·lar" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,12 +264,12 @@ msgstr "esborrar" msgid "Page %u" msgstr "Pàgina %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "No s'ha trobat un fitxer d'imatge al pixmap_path: «%s», línia %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "No s'ha trobat un fitxer d'imatge al pixmap_path: «%s»" @@ -277,9 +283,6 @@ msgstr "No s'ha trobat un m msgid "--- No Tip ---" msgstr "-- Sense pista --" -#~ msgid "Help" -#~ msgstr "Ajuda" - #~ msgid "Foundry:" #~ msgstr "Fosa:" diff --git a/po/cs.po b/po/cs.po index d883930aa..093fe2349 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-10-04 14:50+02:00\n" "Last-Translator: Stanislav Brabec \n" "Language-Team: Czech \n" @@ -55,6 +55,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Zru¹it" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Nápovìda" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -65,17 +82,6 @@ msgstr "Adres msgid "Files" msgstr "Soubory" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Zru¹it" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -259,12 +265,12 @@ msgstr "smazat" msgid "Page %u" msgstr "Strana %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Obrázek \"%s\" (øádek %d) nebyl nalezen v pixmap_path." -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Obrázek \"%s\" nebyl nalezen v pixmap_path." @@ -278,9 +284,6 @@ msgstr "P msgid "--- No Tip ---" msgstr "--- Není tip ---" -#~ msgid "Help" -#~ msgstr "Nápovìda" - #~ msgid "Foundry:" #~ msgstr "Písmolijna:" diff --git a/po/da.po b/po/da.po index 36dc00895..a4101082f 100644 --- a/po/da.po +++ b/po/da.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-12-08 17:14+01:00\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Annullér" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Hjælp" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "Mapper" msgid "Files" msgstr "Filer" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Annullér" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,12 +264,12 @@ msgstr "ryd" msgid "Page %u" msgstr "Side %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Kunne ikke finde billedfil i pixmap_path: \"%s\" linje %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Kunne ikke finde billedfil i pixmap_path: \"%s\"" @@ -277,9 +283,6 @@ msgstr "Kunne ikke finde modul i module_path: \"%s\"," msgid "--- No Tip ---" msgstr "--- Ingen hjælp ---" -#~ msgid "Help" -#~ msgstr "Hjælp" - #~ msgid "Foundry:" #~ msgstr "Skaber:" diff --git a/po/de.po b/po/de.po index 14c6c0401..268488d85 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.9\n" -"POT-Creation-Date: 2000-07-12 23:26+0200\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 2000-07-12 23:25+02:00\n" "Last-Translator: Benedikt Roth >\n" "Language-Team: German \n" @@ -54,6 +54,23 @@ msgstr "Angepasste Palette" msgid "Set Color" msgstr "Farbe setzen:" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Abbrechen" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Hilfe" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "Verzeichnisse" msgid "Files" msgstr "Dateien" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Abbrechen" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -257,12 +263,12 @@ msgstr "gel msgid "Page %u" msgstr "Seite %u" -#: gtk/gtkrc.c:1902 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Kann Bilddatei in Pixmap-Pfad: \"%s\" nicht finden. Zeile %d" -#: gtk/gtkrc.c:1905 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Kann Bilddatei in Pixmap-Pfad: \"%s\" nicht finden" @@ -276,9 +282,6 @@ msgstr "Kann ladbares Modul in Module-Pfad: \"%s\" nicht finden," msgid "--- No Tip ---" msgstr "--- Kein Tip ---" -#~ msgid "Help" -#~ msgstr "Hilfe" - #~ msgid "Foundry:" #~ msgstr "Ursprung:" diff --git a/po/el.po b/po/el.po index 0009459c1..afe0c4bb5 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.2.6\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-10-22 22:43-0000\n" "Last-Translator: Spiros Papadimitriou \n" "Language-Team: Greek \n" @@ -63,6 +63,26 @@ msgstr "" msgid "Set Color" msgstr "" +# +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "ÅíôÜîåé" + +# +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "¶êõñï" + +# +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "ÂïÞèåéá" + # #. The directories clist #: gtk/gtkfilesel.c:514 @@ -75,19 +95,6 @@ msgstr " msgid "Files" msgstr "Áñ÷åßá" -# -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "ÅíôÜîåé" - -# -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "¶êõñï" - # #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format @@ -312,13 +319,13 @@ msgid "Page %u" msgstr "Óåëßäá %u" # -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Ôï áñ÷åßï åéêüíáò äå âñÝèçêå óôï pixmap_path: \"%s\" line %d" # -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Ôï áñ÷åßï åéêüíáò äå âñÝèçêå óôï pixmap_path: \"%s\"" @@ -334,10 +341,6 @@ msgstr " msgid "--- No Tip ---" msgstr "--- Êáìßá óõìâïõëÞ ---" -# -#~ msgid "Help" -#~ msgstr "ÂïÞèåéá" - # #~ msgid "Foundry:" #~ msgstr "×õôÞñéï:" diff --git a/po/es.po b/po/es.po index fe7f3bbb9..21ebbff5e 100644 --- a/po/es.po +++ b/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-02-07 17:37+0100\n" "Last-Translator: Pablo Saratxaga \n" "Language-Team: \n" @@ -56,6 +56,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "Aceptar" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Cancelar" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Ayuda" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -66,17 +83,6 @@ msgstr "Directorios" msgid "Files" msgstr "Archivos" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "Aceptar" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Cancelar" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -260,13 +266,13 @@ msgstr "limpiar" msgid "Page %u" msgstr "Página %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "" "Imposible de encontrar un archivo imagen en pixmap_path: \"%s\" línea %s" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Imposible de encontrar un archivo imagen en pixmap_path: \"%s\"" @@ -280,9 +286,6 @@ msgstr "Imposible de encontrar un m msgid "--- No Tip ---" msgstr "--- Ningún Tip ---" -#~ msgid "Help" -#~ msgstr "Ayuda" - #~ msgid "Foundry:" #~ msgstr "Fundición:" diff --git a/po/et.po b/po/et.po index bf85e142d..d2a1fde9a 100644 --- a/po/et.po +++ b/po/et.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.2.6\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-09-26 23:40+0300\n" "Last-Translator: Lauris Kaplinski \n" "Language-Team: Estonian\n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "Sobib" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Vabandust" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Abimees" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "Kataloogid" msgid "Files" msgstr "Failid" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "Sobib" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Vabandust" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,12 +264,12 @@ msgstr "kustuta" msgid "Page %u" msgstr "Lehekülg %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Ei leia pildifaili otsingurajalt 'pixmap_path': \"%s\" rida %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Ei leia pildifaili otsingurajalt 'pixmap_path': \"%s\"" @@ -277,9 +283,6 @@ msgstr "Ei leia moodulit otsingurajalt 'module_path': \"%s\"," msgid "--- No Tip ---" msgstr "--- Vihjet ei ole ---" -#~ msgid "Help" -#~ msgstr "Abimees" - #~ msgid "Foundry:" #~ msgstr "Päritolu:" diff --git a/po/eu.po b/po/eu.po index ccf6298ba..f9504dba7 100644 --- a/po/eu.po +++ b/po/eu.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ VERSION\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-07-05 19:17+0200\n" "Last-Translator: Joseba Bidaurrazaga van Dierdonck \n" "Language-Team: euskare \n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "Ados" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Ezeztatu" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Laguntza" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "Direktorioak" msgid "Files" msgstr "Fitxategiak" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "Ados" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Ezeztatu" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,12 +264,12 @@ msgstr "garbitu" msgid "Page %u" msgstr "Orria %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Imaginaren fitxategia ezin aurkitu pixmap_path-en: \"%s\",%d lerroa" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Imaginaren fitxategia ezin aurkitu pixmap_path-en: \"%s\"" @@ -277,9 +283,6 @@ msgstr "Modulua ezin aurkitu modulu_path-en: \"%s\"," msgid "--- No Tip ---" msgstr "--- Erpinik ez ---" -#~ msgid "Help" -#~ msgstr "Laguntza" - #~ msgid "Foundry:" #~ msgstr "Ola:" diff --git a/po/fi.po b/po/fi.po index 68608fc30..298f76897 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.9\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 2000-04-17 12:56+0300\n" "Last-Translator: Pauli Virtanen \n" "Language-Team: Finnish \n" @@ -55,6 +55,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Peruuta" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Ohje" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -65,17 +82,6 @@ msgstr "Kansiot" msgid "Files" msgstr "Tiedostot" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Peruuta" - # , c-format #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format @@ -262,13 +268,13 @@ msgid "Page %u" msgstr "Sivu %u" # , c-format -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Kuvatiedostoa ei löytynyt pixmap_path:sta: \"%s\" rivi %d" # , c-format -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Kuvatiedostoa ei löytynyt pixmap_path:sta: \"%s\"" @@ -283,9 +289,6 @@ msgstr "Ladattavaa moduulia ei l msgid "--- No Tip ---" msgstr "--- Ei vinkkiä ---" -#~ msgid "Help" -#~ msgstr "Ohje" - #~ msgid "Foundry:" #~ msgstr "Valmistaja:" diff --git a/po/fr.po b/po/fr.po index ce5fc2fe2..c1caf0628 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ VERSION\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1998-12-18 20:32+0100\n" "Last-Translator: Vincent Renardias \n" "Language-Team: Vincent Renardias \n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Annuler" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Aide" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "R msgid "Files" msgstr "Fichiers" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Annuler" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,14 +264,14 @@ msgstr "effacer" msgid "Page %u" msgstr "Page %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "" "Impossible de localiser le fichier image dans le chemin des pixmaps : " "\"%s\" ligne %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "" @@ -282,9 +288,6 @@ msgstr "" msgid "--- No Tip ---" msgstr "--- Pas de Conseil du Jour ---" -#~ msgid "Help" -#~ msgstr "Aide" - #~ msgid "Foundry:" #~ msgstr "Fonderie :" diff --git a/po/ga.po b/po/ga.po index 7847c24cf..1ad50f319 100644 --- a/po/ga.po +++ b/po/ga.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-08-23 21:28+0600\n" "Last-Translator: Sean V. Kelley \n" "Language-Team: Gaeilge \n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "Ceart go leor" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Cealaigh" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Cuidigh" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "Eolair msgid "Files" msgstr "Comhaid" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "Ceart go leor" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Cealaigh" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,13 +264,13 @@ msgstr "b msgid "Page %u" msgstr "Leathanach %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "" "Ní rabhthas ábalta íomhá comhaid a aimsiú in pixmap_path: \"%s\" líne %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Ní rabhthas ábalta íomhá comhaid a aimsiú in pixmap_path: \"%s\"" @@ -278,9 +284,6 @@ msgstr "N msgid "--- No Tip ---" msgstr "--- Níl aon nod ann ---" -#~ msgid "Help" -#~ msgstr "Cuidigh" - #~ msgid "Foundry:" #~ msgstr "Teilgcheárta:" diff --git a/po/gl.po b/po/gl.po index 0aba61c37..a29220cf1 100644 --- a/po/gl.po +++ b/po/gl.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.1\n" -"POT-Creation-Date: 2000-07-10 23:07+0200\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 2000-08-10 23:10+0200\n" "Last-Translator: Jesus Bravo Alvarez \n" "Language-Team: Galician \n" @@ -60,6 +60,23 @@ msgstr "Paleta Personalizada" msgid "Set Color" msgstr "Poñer Cor" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "Aceptar" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Cancelar" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Axuda" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -70,17 +87,6 @@ msgstr "Directorios" msgid "Files" msgstr "Ficheiros" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "Aceptar" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Cancelar" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -264,13 +270,13 @@ msgstr "limpar" msgid "Page %u" msgstr "Páxina %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "" "Foi imposible atopa-lo ficheiro de imaxe no pixmap_path: \"%s\" liña %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Foi imposible atopa-lo ficheiro de imaxe no pixmap_path: \"%s\"" @@ -457,6 +463,3 @@ msgstr "--- Sen Tip ---" #~ msgid "MAX_FONTS exceeded. Some fonts may be missing." #~ msgstr "MAX_FONTS excedido. Poden faltar algunhas fontes." - -#~ msgid "Help" -#~ msgstr "Axuda" diff --git a/po/hr.po b/po/hr.po index c0a5e471e..d2a16a1b8 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: Tue Jan 11 2000 16:35:38+0200\n" "Last-Translator: Vladimir Vuksan \n" "Language-Team: Croatian \n" @@ -58,6 +58,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "U redu" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Poni¹ti" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Pomoæ" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -68,17 +85,6 @@ msgstr "Direktoriji" msgid "Files" msgstr "Datoteke" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "U redu" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Poni¹ti" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -262,12 +268,12 @@ msgstr "obri msgid "Page %u" msgstr "Stranica %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Ne mogu pronaæi slikovnu datoteku u pixmap_path: \"%s\" line %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Ne mogu pronaæi slikovnu datoteku u pixmap_path: \"%s\"" @@ -281,9 +287,6 @@ msgstr "Ne mogu prona msgid "--- No Tip ---" msgstr "--- Nema savjeta ---" -#~ msgid "Help" -#~ msgstr "Pomoæ" - #~ msgid "Foundry:" #~ msgstr "Izvor:" diff --git a/po/hu.po b/po/hu.po index 6497c0786..e8b2cb025 100644 --- a/po/hu.po +++ b/po/hu.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.2\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 2000-05-10 13:52+0100\n" "Last-Translator: Szabolcs BAN \n" "Language-Team: Hungarian \n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Mégsem" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Súgó" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "K msgid "Files" msgstr "Fájlok" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Mégsem" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,12 +264,12 @@ msgstr "t msgid "Page %u" msgstr "%u. lap" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Nem találom a képet a pixmap_path (%s) útvonalon (%d. sor)" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Nem találom a pixmap_path (%s) útvonalon a képet" @@ -277,9 +283,6 @@ msgstr "Nem tal msgid "--- No Tip ---" msgstr "-- Nincs hintszöveg --" -#~ msgid "Help" -#~ msgstr "Súgó" - #~ msgid "Foundry:" #~ msgstr "Találat:" diff --git a/po/it.po b/po/it.po index 9f0506c66..7e11fac7f 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.2.7\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 2000-06-23 05:05+02:00\n" "Last-Translator: Christopher R. Gabriel \n" "Language-Team: Italiano \n" @@ -53,6 +53,23 @@ msgstr "Tavolozza personalizzata" msgid "Set Color" msgstr "Imposta il colore" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Annulla" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Aiuto" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -63,17 +80,6 @@ msgstr "Directory" msgid "Files" msgstr "File" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Annulla" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -256,14 +262,14 @@ msgstr "cancella" msgid "Page %u" msgstr "Pagina %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "" "Impossibile trovare il file di immagine nella cartella immagini: \"%s\". " "Linea %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "" @@ -279,9 +285,6 @@ msgstr "Impossibile trovare il modulo nella cartella moduli: \"%s\"," msgid "--- No Tip ---" msgstr "--- Nessun aiuto ---" -#~ msgid "Help" -#~ msgstr "Aiuto" - #~ msgid "Foundry:" #~ msgstr "Fornitore:" diff --git a/po/ja.po b/po/ja.po index c71b414ba..50122be8d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.2.7\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-10-08 11:42+0900\n" "Last-Translator: Çòºê ÂÙ¹° \n" "Language-Team: Japanese \n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "λ²ò" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "¼è¾Ã" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "¥Ø¥ë¥×" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr " msgid "Files" msgstr "¥Õ¥¡¥¤¥ë" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "λ²ò" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "¼è¾Ã" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,12 +264,12 @@ msgstr " msgid "Page %u" msgstr "¥Ú¡¼¥¸ %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "²èÁü¥Õ¥¡¥¤¥ë¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó piamap_path: \"%s\" %d ¹ÔÌÜ" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "²èÁü¥Õ¥¡¥¤¥ë¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó pixmap_path: \"%s\"" @@ -277,9 +283,6 @@ msgstr " msgid "--- No Tip ---" msgstr "--- Tip ̵¤· ---" -#~ msgid "Help" -#~ msgstr "¥Ø¥ë¥×" - #~ msgid "Foundry:" #~ msgstr "Ãò¤½ê:" diff --git a/po/ko.po b/po/ko.po index 523350b3d..5e4078514 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.15\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-04-24 22:53+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -53,6 +53,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "È®ÀÎ" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Ãë¼Ò" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "µµ¿ò¸»" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -63,17 +80,6 @@ msgstr " msgid "Files" msgstr "ÆÄÀÏ" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "È®ÀÎ" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Ãë¼Ò" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -257,12 +263,12 @@ msgstr " msgid "Page %u" msgstr "%uÂÊ" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "±×¸² ÆÄÀÏÀ» pixmap_path¿¡¼­ ãÀ» ¼ö ¾øÀ½: \"%s\" %d¹ø° ÁÙ" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "±×¸² ÆÄÀÏÀ» pixmap_path¿¡¼­ ãÀ» ¼ö ¾øÀ½: \"%s\"" @@ -276,9 +282,6 @@ msgstr " msgid "--- No Tip ---" msgstr "--- ÆÁ ¾øÀ½ ---" -#~ msgid "Help" -#~ msgstr "µµ¿ò¸»" - #~ msgid "Foundry:" #~ msgstr "¸¸µç°÷:" diff --git a/po/lt.po b/po/lt.po index 520f00033..ca90e1737 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 2000-03-16 03:44+0200\n" "Last-Translator: Gediminas Paulauskas \n" "Language-Team: Lithuanian\n" @@ -55,6 +55,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "Gerai" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Atðaukti" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Pagalba" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -65,17 +82,6 @@ msgstr "Katalogai" msgid "Files" msgstr "Bylos" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "Gerai" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Atðaukti" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -259,12 +265,12 @@ msgstr "i msgid "Page %u" msgstr "%u puslapis" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Negaliu rasti paveikslëlio bylos kelyje: ¥%s´ eilutë %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Negaliu rasti paveikslëlio bylos kelyje: ¥%s´" @@ -278,9 +284,6 @@ msgstr "Negaliu rasti keliamojo modulio kelyje: msgid "--- No Tip ---" msgstr "-Nëra pagalbos-" -#~ msgid "Help" -#~ msgstr "Pagalba" - #~ msgid "Foundry:" #~ msgstr "Liejykla:" diff --git a/po/nl.po b/po/nl.po index 9d621e255..04049af0f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-12 23:04+0200\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 2000-07-12 23:04+0200\n" "Last-Translator: Dennis Smit \n" "Language-Team: dutch \n" @@ -53,6 +53,23 @@ msgstr "Eigen Palette" msgid "Set Color" msgstr "Set kleur" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Annuleren" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Help" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -63,17 +80,6 @@ msgstr "Directories" msgid "Files" msgstr "Bestanden" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Annuleren" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -256,12 +262,12 @@ msgstr "wissen" msgid "Page %u" msgstr "Pagina %u" -#: gtk/gtkrc.c:1902 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Kan plaatjes bestand in pixmap_path: \"%s\" regel %d niet vinden" -#: gtk/gtkrc.c:1905 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Kan plaatjes bestand in pixmap_path: \"s\" niet vinden" @@ -275,9 +281,6 @@ msgstr "Kan module in module_path: \"%s\" niet vinden," msgid "--- No Tip ---" msgstr "--- Geen Tip ---" -#~ msgid "Help" -#~ msgstr "Help" - #~ msgid "Foundry:" #~ msgstr "Oorsprong:" diff --git a/po/no.po b/po/no.po index 938bd6823..f0589114a 100644 --- a/po/no.po +++ b/po/no.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-13 13:46+0200\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 2000-07-13 13:47+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -262,12 +262,12 @@ msgstr "t msgid "Page %u" msgstr "Side %u" -#: gtk/gtkrc.c:1902 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Kunne ikke finne bildefilen i pixmap_patg: \"%s\" linje %d" -#: gtk/gtkrc.c:1905 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Kunne ikke finne bildefil i pixmap_path: \"%s\"" diff --git a/po/pl.po b/po/pl.po index 2ad727c03..c4e3a2e8e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-09-03 05:00+0200\n" "Last-Translator: GNOME PL Team\n" "Language-Team: Polish \n" @@ -50,6 +50,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Anuluj" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Pomoc" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -60,17 +77,6 @@ msgstr "Katalogi" msgid "Files" msgstr "Pliki" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Anuluj" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -254,12 +260,12 @@ msgstr "wyczy msgid "Page %u" msgstr "Strona %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Nie mo¿na odnale¼æ pliku z obrazem na ¶cie¿ce: \"%s\" wiersz %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Nie mo¿na odnale¼æ pliku z obrazem na ¶cie¿ce: \"%s\"" @@ -273,9 +279,6 @@ msgstr "Nie mo msgid "--- No Tip ---" msgstr "--- Brak podpowiedzi ---" -#~ msgid "Help" -#~ msgstr "Pomoc" - #~ msgid "Foundry:" #~ msgstr "Druk:" diff --git a/po/pt.po b/po/pt.po index 8f8bcc305..e965d4569 100644 --- a/po/pt.po +++ b/po/pt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.12\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-02-17 01:20+00:00\n" "Last-Translator: Nuno Ferreira \n" "Language-Team: Portuguese \n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Cancelar" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Ajuda" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "Directorias" msgid "Files" msgstr "Ficheiros" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Cancelar" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,12 +264,12 @@ msgstr "limpar" msgid "Page %u" msgstr "Página %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Não encontrei ficheiro de imagem na pixmap_path: \"%s\" linha %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Não encontrei ficheiro de imagem na pixmap_path: \"%s\"" @@ -277,9 +283,6 @@ msgstr "N msgid "--- No Tip ---" msgstr "--- Sem Ajuda ---" -#~ msgid "Help" -#~ msgstr "Ajuda" - #~ msgid "Weight:" #~ msgstr "Peso:" diff --git a/po/pt_BR.po b/po/pt_BR.po index f0fb614ad..4e9ce1664 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.12\n" -"POT-Creation-Date: 2000-07-12 12:41-0300\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-09-29 17:40-03:00\n" "Last-Translator: Alex Sandro Queiroz e Silva \n" "Language-Team: Brazilian Portuguese \n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Cancelar" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Ajuda" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "Diret msgid "Files" msgstr "Arquivos" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Cancelar" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,12 +264,12 @@ msgstr "limpar" msgid "Page %u" msgstr "Página %u" -#: gtk/gtkrc.c:1902 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Não encontrei arquivo de imagem no pixmap_path: \"%s\" linha %d" -#: gtk/gtkrc.c:1905 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Não encontrei arquivo de imagem no pixmap_path: \"%s\"" @@ -277,179 +283,176 @@ msgstr "N msgid "--- No Tip ---" msgstr "--- Sem Ajuda ---" -msgid "Help" -msgstr "Ajuda" - -msgid "Foundry:" -msgstr "Estilo:" +#~ msgid "Foundry:" +#~ msgstr "Estilo:" -msgid "Weight:" -msgstr "Peso:" +#~ msgid "Weight:" +#~ msgstr "Peso:" -msgid "Slant:" -msgstr "Inclinação:" +#~ msgid "Slant:" +#~ msgstr "Inclinação:" -msgid "Set Width:" -msgstr "Espaçamento:" +#~ msgid "Set Width:" +#~ msgstr "Espaçamento:" -msgid "Pixel Size:" -msgstr "Tamanho em Pixeis:" +#~ msgid "Pixel Size:" +#~ msgstr "Tamanho em Pixeis:" -msgid "Point Size:" -msgstr "Tamanho em Pontos:" +#~ msgid "Point Size:" +#~ msgstr "Tamanho em Pontos:" -msgid "Resolution X:" -msgstr "Resolução X:" +#~ msgid "Resolution X:" +#~ msgstr "Resolução X:" -msgid "Resolution Y:" -msgstr "Resolução Y:" +#~ msgid "Resolution Y:" +#~ msgstr "Resolução Y:" -msgid "Spacing:" -msgstr "Espaçamento:" +#~ msgid "Spacing:" +#~ msgstr "Espaçamento:" -msgid "Average Width:" -msgstr "Largura Média:" +#~ msgid "Average Width:" +#~ msgstr "Largura Média:" -msgid "Charset:" -msgstr "Charset:" +#~ msgid "Charset:" +#~ msgstr "Charset:" -msgid "Font Property" -msgstr "Propriedade da Fonte" +#~ msgid "Font Property" +#~ msgstr "Propriedade da Fonte" -msgid "Requested Value" -msgstr "Valor Pedido" +#~ msgid "Requested Value" +#~ msgstr "Valor Pedido" -msgid "Actual Value" -msgstr "Valor Real" +#~ msgid "Actual Value" +#~ msgstr "Valor Real" -msgid "Font" -msgstr "Fonte" +#~ msgid "Font" +#~ msgstr "Fonte" -msgid "Font:" -msgstr "Fonte:" +#~ msgid "Font:" +#~ msgstr "Fonte:" -msgid "Font Style:" -msgstr "Estilo de Fonte:" +#~ msgid "Font Style:" +#~ msgstr "Estilo de Fonte:" -msgid "Reset Filter" -msgstr "Reiniciar Filtro" +#~ msgid "Reset Filter" +#~ msgstr "Reiniciar Filtro" -msgid "Metric:" -msgstr "Métrica:" +#~ msgid "Metric:" +#~ msgstr "Métrica:" -msgid "Points" -msgstr "Pontos" +#~ msgid "Points" +#~ msgstr "Pontos" -msgid "Pixels" -msgstr "Pixels" +#~ msgid "Pixels" +#~ msgstr "Pixels" -msgid "Font Information" -msgstr "Informação da Fonte" +#~ msgid "Font Information" +#~ msgstr "Informação da Fonte" -msgid "Requested Font Name:" -msgstr "Nome da Fonte Pedida:" +#~ msgid "Requested Font Name:" +#~ msgstr "Nome da Fonte Pedida:" -msgid "Actual Font Name:" -msgstr "Nome Real da Fonte:" +#~ msgid "Actual Font Name:" +#~ msgstr "Nome Real da Fonte:" -msgid "%i fonts available with a total of %i styles." -msgstr "%i fontes disponíveis com um total de %i estilos." +#~ msgid "%i fonts available with a total of %i styles." +#~ msgstr "%i fontes disponíveis com um total de %i estilos." -msgid "Filter" -msgstr "Filtro" +#~ msgid "Filter" +#~ msgstr "Filtro" -msgid "Font Types:" -msgstr "Tipos de Fonte:" +#~ msgid "Font Types:" +#~ msgstr "Tipos de Fonte:" -msgid "Bitmap" -msgstr "Imagem" +#~ msgid "Bitmap" +#~ msgstr "Imagem" -msgid "Scalable" -msgstr "Escalável" +#~ msgid "Scalable" +#~ msgstr "Escalável" -msgid "Scaled Bitmap" -msgstr "Bitmap Escalado" +#~ msgid "Scaled Bitmap" +#~ msgstr "Bitmap Escalado" -msgid "*" -msgstr "*" +#~ msgid "*" +#~ msgstr "*" -msgid "(nil)" -msgstr "(nulo)" +#~ msgid "(nil)" +#~ msgstr "(nulo)" -msgid "regular" -msgstr "regular" +#~ msgid "regular" +#~ msgstr "regular" -msgid "italic" -msgstr "itálico" +#~ msgid "italic" +#~ msgstr "itálico" -msgid "oblique" -msgstr "oblíquo" +#~ msgid "oblique" +#~ msgstr "oblíquo" -msgid "reverse italic" -msgstr "itálico invertido" +#~ msgid "reverse italic" +#~ msgstr "itálico invertido" -msgid "reverse oblique" -msgstr "oblíquo invertido" +#~ msgid "reverse oblique" +#~ msgstr "oblíquo invertido" -msgid "other" -msgstr "outro" +#~ msgid "other" +#~ msgstr "outro" -msgid "[M]" -msgstr "[M]" +#~ msgid "[M]" +#~ msgstr "[M]" -msgid "[C]" -msgstr "[C]" +#~ msgid "[C]" +#~ msgstr "[C]" -msgid "The selected font is not available." -msgstr "A fonte selecionada não está disponível." +#~ msgid "The selected font is not available." +#~ msgstr "A fonte selecionada não está disponível." -msgid "The selected font is not a valid font." -msgstr "A fonte selecionada não é uma fonte válida." +#~ msgid "The selected font is not a valid font." +#~ msgstr "A fonte selecionada não é uma fonte válida." -msgid "This is a 2-byte font and may not be displayed correctly." -msgstr "Esta é uma fonte de 2 bytes e pode não ser mostrada corretamente." +#~ msgid "This is a 2-byte font and may not be displayed correctly." +#~ msgstr "Esta é uma fonte de 2 bytes e pode não ser mostrada corretamente." -msgid "roman" -msgstr "romano" +#~ msgid "roman" +#~ msgstr "romano" -msgid "proportional" -msgstr "proporcional" +#~ msgid "proportional" +#~ msgstr "proporcional" -msgid "monospaced" -msgstr "monoespaçada" +#~ msgid "monospaced" +#~ msgstr "monoespaçada" -msgid "char cell" -msgstr "célula de caracter" +#~ msgid "char cell" +#~ msgstr "célula de caracter" -msgid "Font: (Filter Applied)" -msgstr "Fonte: (Filtro Aplicado)" +#~ msgid "Font: (Filter Applied)" +#~ msgstr "Fonte: (Filtro Aplicado)" -msgid "heavy" -msgstr "forte" +#~ msgid "heavy" +#~ msgstr "forte" -msgid "extrabold" -msgstr "extranegrito" +#~ msgid "extrabold" +#~ msgstr "extranegrito" -msgid "bold" -msgstr "negrito" +#~ msgid "bold" +#~ msgstr "negrito" -msgid "demibold" -msgstr "seminegrito" +#~ msgid "demibold" +#~ msgstr "seminegrito" -msgid "medium" -msgstr "médio" +#~ msgid "medium" +#~ msgstr "médio" -msgid "normal" -msgstr "normal" +#~ msgid "normal" +#~ msgstr "normal" -msgid "light" -msgstr "fraca" +#~ msgid "light" +#~ msgstr "fraca" -msgid "extralight" -msgstr "extrafraca" +#~ msgid "extralight" +#~ msgstr "extrafraca" -msgid "thin" -msgstr "fina" +#~ msgid "thin" +#~ msgstr "fina" -msgid "MAX_FONTS exceeded. Some fonts may be missing." -msgstr "MAX_FONTS foi excedido. Podem faltar algumas fontes." +#~ msgid "MAX_FONTS exceeded. Some fonts may be missing." +#~ msgstr "MAX_FONTS foi excedido. Podem faltar algumas fontes." diff --git a/po/ro.po b/po/ro.po index 7849b5e88..3dc167fdf 100644 --- a/po/ro.po +++ b/po/ro.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 2000-04-05 19:30+030\n" "Last-Translator: Dan Damian \n" "Language-Team: Romanian \n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Renunþã" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Ajutor" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "Directoare" msgid "Files" msgstr "Fiºiere" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Renunþã" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,12 +264,12 @@ msgstr " msgid "Page %u" msgstr "Pagina %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Nu pot localiza fiºierul imagine în pixmap_path: \"%s\" line %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Nu pot localiza fiºierul imagine în pixmap_path: \"%s\"" @@ -277,9 +283,6 @@ msgstr "Nu pot localiza modulul msgid "--- No Tip ---" msgstr "--- Nici un tip ---" -#~ msgid "Help" -#~ msgstr "Ajutor" - #~ msgid "Foundry:" #~ msgstr "Producãtor:" diff --git a/po/ru.po b/po/ru.po index ef2df2c6c..38f2af8bc 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-14 11:40+0000\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 2000-07-14 11:40+00:00\n" "Last-Translator: Valek Filippov \n" "Language-Team: Russian \n" @@ -261,12 +261,12 @@ msgstr " msgid "Page %u" msgstr "óÔÒÁÎÉÃÁ %u" -#: gtk/gtkrc.c:1902 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "æÁÊÌ Ó ÉÚÏÂÒÁÖÅÎÉÅÍ ÎÅ ÎÁÊÄÅÎ × pixmap_path: \"%s\", ÓÔÒÏËÁ %d" -#: gtk/gtkrc.c:1905 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "æÁÊÌ Ó ÉÚÏÂÒÁÖÅÎÉÅÍ ÎÅ ÎÁÊÄÅÎ × pixmap_path: \"%s\"" diff --git a/po/sk.po b/po/sk.po index b2ee43090..6bd65c3a7 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-04-19 16:30+0100\n" "Last-Translator: Stefan Ondrejicka \n" "Language-Team: Slovak \n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Zru¹i»" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Pomoc" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "Adres msgid "Files" msgstr "Súbory" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Zru¹i»" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,12 +264,12 @@ msgstr "zmaza msgid "Page %u" msgstr "Stránka %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Obrázok nebol nájdený v pixmap_path: \"%s\" riadok %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Obrázok nebol nájdený v pixmap_path: \"%s\"" @@ -277,9 +283,6 @@ msgstr "Zav msgid "--- No Tip ---" msgstr "--- Bez nápovedy ---" -#~ msgid "Help" -#~ msgstr "Pomoc" - #~ msgid "Foundry:" #~ msgstr "Tvorca:" diff --git a/po/sl.po b/po/sl.po index 5685c2471..0691a7e4c 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: GTK+ 1.2.8\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 2000-06-21 19:45+0200\n" "Last-Translator: Miha Tom¹iè \n" "Language-Team: slovenian \n" @@ -53,6 +53,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "Potrdi" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Preklièi" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Pomoè" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -63,17 +80,6 @@ msgstr "Imeniki" msgid "Files" msgstr "Datoteke" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "Potrdi" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Preklièi" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -257,12 +263,12 @@ msgstr "izprazni" msgid "Page %u" msgstr "%u. stran" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Ne najdem datoteke s sliko v poti pixmap_path: \"%s\" vrstica %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Ne najdem datoteke s sliko v poti pixmap_path: \"%s\"" @@ -276,9 +282,6 @@ msgstr "Ne najdem nalo msgid "--- No Tip ---" msgstr "--- Ni namiga ---" -#~ msgid "Help" -#~ msgstr "Pomoè" - #~ msgid "Foundry:" #~ msgstr "Èrkolivnica:" diff --git a/po/sv.po b/po/sv.po index 7fec96a88..0ffde48fc 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-01-12 22:50+0100\n" "Last-Translator: Tomas Ögren \n" "Language-Team: Swedish \n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "OK" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Avbryt" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Hjälp" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr "Kataloger" msgid "Files" msgstr "Filer" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "OK" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Avbryt" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,12 +264,12 @@ msgstr "rensa" msgid "Page %u" msgstr "Sida %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "Kunde ej hitta bild i 'pixmap_path': \"%s\" rad %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Kunde ej hitta bild i 'pixmap_path': \"%s\"" @@ -277,9 +283,6 @@ msgstr "Kunde ej hitta laddningsbar modul i 'module_path': \"%s\"," msgid "--- No Tip ---" msgstr "--- Inget tips ---" -#~ msgid "Help" -#~ msgstr "Hjälp" - #~ msgid "Foundry:" #~ msgstr "Form:" diff --git a/po/tr.po b/po/tr.po index 6b3827bb4..b7e1833ae 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 2000-04-10 17:38+02:00\n" "Last-Translator: Fatih Demir \n" "Language-Team: Turkish Gnome Tranlation Team \n" @@ -62,22 +62,11 @@ msgstr "" msgid "Set Color" msgstr "" -# gtk/gtkfilesel.c:520 -#. The directories clist -#: gtk/gtkfilesel.c:514 -msgid "Directories" -msgstr "Dizinler" - -# gtk/gtkfilesel.c:539 -#. The files clist -#: gtk/gtkfilesel.c:534 -msgid "Files" -msgstr "Dosyalar" - # gtk/gtkcolorsel.c:1668 gtk/gtkfilesel.c:571 gtk/gtkfontsel.c:3722 # gtk/gtkgamma.c:416 #. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 msgid "OK" msgstr "Oldu" @@ -85,11 +74,29 @@ msgstr "Oldu" # gtk/gtkfilesel.c:1060 gtk/gtkfilesel.c:1175 gtk/gtkfontsel.c:3735 # gtk/gtkgamma.c:424 #. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 msgid "Cancel" msgstr "Çýk" +# gtk/gtkcolorsel.c:1679 +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Yardým" + +# gtk/gtkfilesel.c:520 +#. The directories clist +#: gtk/gtkfilesel.c:514 +msgid "Directories" +msgstr "Dizinler" + +# gtk/gtkfilesel.c:539 +#. The files clist +#: gtk/gtkfilesel.c:534 +msgid "Files" +msgstr "Dosyalar" + # gtk/gtkfilesel.c:609 gtk/gtkfilesel.c:1639 #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format @@ -314,13 +321,13 @@ msgid "Page %u" msgstr "%u'nci sayfa" # gtk/gtkrc.c:1611 -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "\"%s\" resimini pixmap_path'da bulunamadý . Satýr %d" # gtk/gtkrc.c:1614 -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "\"%s\" resimini pixmap_path'da bulunamadý" @@ -336,10 +343,6 @@ msgstr "Y msgid "--- No Tip ---" msgstr "--- Yardýmý yok ---" -# gtk/gtkcolorsel.c:1679 -#~ msgid "Help" -#~ msgstr "Yardým" - # gtk/gtkfontsel.c:216 #~ msgid "Foundry:" #~ msgstr "Kök :" diff --git a/po/uk.po b/po/uk.po index 15300dc46..9c109b065 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-09-30 21:51 EST\n" "Last-Translator: Yuri Syrota \n" "Language-Team: Ukrainian \n" @@ -54,6 +54,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "çÁÒÁÚÄ" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "÷¦ÄͦÎÁ" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "äÏצÄËÁ" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -64,17 +81,6 @@ msgstr " msgid "Files" msgstr "æÁÊÌÉ" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "çÁÒÁÚÄ" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "÷¦ÄͦÎÁ" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -258,12 +264,12 @@ msgstr " msgid "Page %u" msgstr "óÔÏÒ¦ÎËÁ %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "æÁÊÌ ¦Ú ÚÏÂÒÁÖÅÎÎÑÍ ÎÅ ÚÎÁÊÄÅÎÏ × pixmap_path: \"%s\", ÒÑÄÏË %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "æÁÊÌ ¦Ú ÚÏÂÒÁÖÅÎÎÑÍ ÎÅ ÚÎÁÊÄÅÎÏ × pixmap_path: \"%s\"" @@ -277,9 +283,6 @@ msgstr " msgid "--- No Tip ---" msgstr "--- îÅÍÁ¤ ЦÄËÁÚËÉ ---" -#~ msgid "Help" -#~ msgstr "äÏצÄËÁ" - #~ msgid "Foundry:" #~ msgstr "ëÏÌÅËæÑ:" diff --git a/po/wa.po b/po/wa.po index 12cb458ab..53efb8a0e 100644 --- a/po/wa.po +++ b/po/wa.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.3.0\n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-02-07 17:37+0100\n" "Last-Translator: Pablo Saratxaga \n" "Language-Team: walon \n" @@ -60,6 +60,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "I Va" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "Rinoncî" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "Aide" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -70,17 +87,6 @@ msgstr "Ridants" msgid "Files" msgstr "Fitchîs" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "I Va" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "Rinoncî" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -264,13 +270,13 @@ msgstr "nety msgid "Page %u" msgstr "Pådje %u" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "" "Dji n' pout nén trover on fitchî imådje è pixmap_path: \"%s\" al roye %d" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "Dji n' pout nén trover on fitchî imådje è pixmap_path: \"%s\"" @@ -284,9 +290,6 @@ msgstr "Dji n' pout n msgid "--- No Tip ---" msgstr "--- Nole Racsegne ---" -#~ msgid "Help" -#~ msgstr "Aide" - #~ msgid "Foundry:" #~ msgstr "Fondeu:" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 6dad36426..794f2736c 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.7 \n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-01-31 19:33+0800\n" "Last-Translator: Dillion Chen \n" "Language-Team: TLDN\n" @@ -50,6 +50,23 @@ msgstr "" msgid "Set Color" msgstr "" +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "È·¶¨" + +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "È¡Ïû" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "ÇóÖú" + #. The directories clist #: gtk/gtkfilesel.c:514 msgid "Directories" @@ -60,17 +77,6 @@ msgstr "Ŀ¼" msgid "Files" msgstr "Îļþ" -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "È·¶¨" - -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "È¡Ïû" - #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format msgid "Directory unreadable: %s" @@ -254,12 +260,12 @@ msgstr " msgid "Page %u" msgstr "µÚ %u Ò³" -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "ÎÞ·¨ÓÉ pixmap_path ÕÒµ½Í¼µµ: \"%s\" µÚ %d ÐÐ" -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "ÎÞ·¨ÓÉ pixmap_path ÕÒµ½Í¼µµ: \"%s\"" @@ -273,9 +279,6 @@ msgstr " msgid "--- No Tip ---" msgstr "--- ÒÑÎÞÌáʾ ---" -#~ msgid "Help" -#~ msgstr "ÇóÖú" - #~ msgid "Foundry:" #~ msgstr "Ìṩ:" diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po index 6d0a447b9..76fd8138b 100644 --- a/po/zh_TW.Big5.po +++ b/po/zh_TW.Big5.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.2.6 \n" -"POT-Creation-Date: 2000-07-03 17:11-0400\n" +"POT-Creation-Date: 2000-07-14 14:48-0400\n" "PO-Revision-Date: 1999-01-31 19:33+0800\n" "Last-Translator: ¨¯¥ß¤¯ \n" "Language-Team: Chinese \n" @@ -63,6 +63,26 @@ msgstr " msgid "Set Color" msgstr "³]©w¦â±m" +# gtk/gtkfilesel.c:565 gtk/gtkfontsel.c:3785 gtk/gtkgamma.c:415 +#. The OK button +#: gtk/gtkcolorseldialog.c:105 gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 +#: gtk/gtkgamma.c:415 +msgid "OK" +msgstr "½T©w" + +# gtk/gtkfilesel.c:572 gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1060 +# gtk/gtkfilesel.c:1175 gtk/gtkfontsel.c:3798 gtk/gtkgamma.c:423 +#. The Cancel button +#: gtk/gtkcolorseldialog.c:111 gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 +#: gtk/gtkfilesel.c:1067 gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 +#: gtk/gtkgamma.c:423 +msgid "Cancel" +msgstr "¨ú®ø" + +#: gtk/gtkcolorseldialog.c:116 +msgid "Help" +msgstr "¨D§U" + # gtk/gtkfilesel.c:514 #. The directories clist #: gtk/gtkfilesel.c:514 @@ -75,20 +95,6 @@ msgstr " msgid "Files" msgstr "ÀÉ®×" -# gtk/gtkfilesel.c:565 gtk/gtkfontsel.c:3785 gtk/gtkgamma.c:415 -#. The OK button -#: gtk/gtkfilesel.c:567 gtk/gtkfontsel.c:952 gtk/gtkgamma.c:415 -msgid "OK" -msgstr "½T©w" - -# gtk/gtkfilesel.c:572 gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1060 -# gtk/gtkfilesel.c:1175 gtk/gtkfontsel.c:3798 gtk/gtkgamma.c:423 -#. The Cancel button -#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:963 gtk/gtkfilesel.c:1067 -#: gtk/gtkfilesel.c:1182 gtk/gtkfontsel.c:965 gtk/gtkgamma.c:423 -msgid "Cancel" -msgstr "¨ú®ø" - # gtk/gtkfilesel.c:603 gtk/gtkfilesel.c:1642 #: gtk/gtkfilesel.c:605 gtk/gtkfilesel.c:1621 #, c-format @@ -313,13 +319,13 @@ msgid "Page %u" msgstr "²Ä %u ­¶" # gtk/gtkrc.c:1801 -#: gtk/gtkrc.c:1824 +#: gtk/gtkrc.c:1903 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" msgstr "µLªk¥Ñ pixmap_path §ä¨ì¹ÏÀÉ: \"%s\" ²Ä %d ¦æ" # gtk/gtkrc.c:1804 -#: gtk/gtkrc.c:1827 +#: gtk/gtkrc.c:1906 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" msgstr "µLªk¥Ñ pixmap_path §ä¨ì¹ÏÀÉ: \"%s\"" @@ -563,6 +569,3 @@ msgstr "--- # gtk/gtkfontsel.c:2905 #~ msgid "MAX_FONTS exceeded. Some fonts may be missing." #~ msgstr "¤w¶W¥X MAX_FONTS ,¥i¯à¿ò¥¢¬Y¨Ç¦r«¬¡C" - -#~ msgid "Help" -#~ msgstr "¨D§U"