From 40d855bb0c39aeb01188f3bf84da54b9646fd0da Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 23 Aug 1999 19:35:22 +0000 Subject: [PATCH] invoke indent on gtkmarshal.*. rewrote source generation rules, use Mon Aug 23 19:11:17 1999 Tim Janik * gtk/Makefile.am: invoke indent on gtkmarshal.*. rewrote source generation rules, use COPYING as oldest source tag for a piggyback rule to generate all sources from (don't touch it ;). major cleanups, strip spaces on build rules for GNU Make. * gtk/genmarshal.pl: don't operate on hardcoded filenames but take source and target files from commandline arguments. don't invoke indent. * gdk/Makefile.am: minor cleanups, strip spaces on build rules for GNU Make. * docs/Makefile.am: added generation.txt. * Makefile.am: require automake 1.4, build README from README.in and INSTALL from INSTALL.in in dist-hook. * README.in: * INSTALL.in: new files to autogenerate README and INSTALL from. * gtk/COPYING: * gdk/COPYING: new files containing the GNU LESSER GENERAL PUBLIC LICENSE. * configure.in: figure wether we have GNU Make, version update to Gtk+ 1.2.4, interface age 2, binary age 4. * NEWS: updates. * docs/generation.txt: minor additions/corrections. --- ChangeLog | 33 +++ ChangeLog.pre-2-0 | 33 +++ ChangeLog.pre-2-10 | 33 +++ ChangeLog.pre-2-2 | 33 +++ ChangeLog.pre-2-4 | 33 +++ ChangeLog.pre-2-6 | 33 +++ ChangeLog.pre-2-8 | 33 +++ INSTALL | 12 +- Makefile.am | 13 +- NEWS | 13 ++ README | 8 +- configure.in | 23 +- docs/Makefile.am | 65 +++--- docs/generation.txt | 21 +- gdk/Makefile.am | 108 +++++---- gtk/.cvsignore | 7 +- gtk/Makefile.am | 553 +++++++++++++++++++++++--------------------- gtk/genmarshal.pl | 27 +-- po/ca.po | 28 +-- po/cs.po | 28 +-- po/de.po | 28 +-- po/es.po | 28 +-- po/fi.po | 28 +-- po/fr.po | 28 +-- po/hr.po | 28 +-- po/hu.po | 28 +-- po/it.po | 28 +-- po/ja.po | 28 +-- po/ko.po | 28 +-- po/nl.po | 234 ++++++++++--------- po/no.po | 28 +-- po/pl.po | 28 +-- po/pt.po | 28 +-- po/ru.po | 28 +-- po/sk.po | 28 +-- po/sl.po | 28 +-- po/sv.po | 28 +-- po/zh_TW.Big5.po | 28 +-- 38 files changed, 1073 insertions(+), 774 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c6cadb3bb..a92d49b04b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +Mon Aug 23 19:11:17 1999 Tim Janik + + * gtk/Makefile.am: + invoke indent on gtkmarshal.*. + rewrote source generation rules, use COPYING as oldest source tag for + a piggyback rule to generate all sources from (don't touch it ;). + major cleanups, strip spaces on build rules for GNU Make. + + * gtk/genmarshal.pl: don't operate on hardcoded filenames but take + source and target files from commandline arguments. don't invoke indent. + + * gdk/Makefile.am: minor cleanups, strip spaces on build rules for + GNU Make. + + * docs/Makefile.am: added generation.txt. + + * Makefile.am: require automake 1.4, build README from README.in and + INSTALL from INSTALL.in in dist-hook. + + * README.in: + * INSTALL.in: new files to autogenerate README and INSTALL from. + + * gtk/COPYING: + * gdk/COPYING: new files containing the GNU LESSER GENERAL PUBLIC + LICENSE. + + * configure.in: figure wether we have GNU Make, version update to + Gtk+ 1.2.4, interface age 2, binary age 4. + + * NEWS: updates. + + * docs/generation.txt: minor additions/corrections. + Sat Aug 21 14:07:36 1999 Lars Hamann * gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 6c6cadb3bb..a92d49b04b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,36 @@ +Mon Aug 23 19:11:17 1999 Tim Janik + + * gtk/Makefile.am: + invoke indent on gtkmarshal.*. + rewrote source generation rules, use COPYING as oldest source tag for + a piggyback rule to generate all sources from (don't touch it ;). + major cleanups, strip spaces on build rules for GNU Make. + + * gtk/genmarshal.pl: don't operate on hardcoded filenames but take + source and target files from commandline arguments. don't invoke indent. + + * gdk/Makefile.am: minor cleanups, strip spaces on build rules for + GNU Make. + + * docs/Makefile.am: added generation.txt. + + * Makefile.am: require automake 1.4, build README from README.in and + INSTALL from INSTALL.in in dist-hook. + + * README.in: + * INSTALL.in: new files to autogenerate README and INSTALL from. + + * gtk/COPYING: + * gdk/COPYING: new files containing the GNU LESSER GENERAL PUBLIC + LICENSE. + + * configure.in: figure wether we have GNU Make, version update to + Gtk+ 1.2.4, interface age 2, binary age 4. + + * NEWS: updates. + + * docs/generation.txt: minor additions/corrections. + Sat Aug 21 14:07:36 1999 Lars Hamann * gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6c6cadb3bb..a92d49b04b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,36 @@ +Mon Aug 23 19:11:17 1999 Tim Janik + + * gtk/Makefile.am: + invoke indent on gtkmarshal.*. + rewrote source generation rules, use COPYING as oldest source tag for + a piggyback rule to generate all sources from (don't touch it ;). + major cleanups, strip spaces on build rules for GNU Make. + + * gtk/genmarshal.pl: don't operate on hardcoded filenames but take + source and target files from commandline arguments. don't invoke indent. + + * gdk/Makefile.am: minor cleanups, strip spaces on build rules for + GNU Make. + + * docs/Makefile.am: added generation.txt. + + * Makefile.am: require automake 1.4, build README from README.in and + INSTALL from INSTALL.in in dist-hook. + + * README.in: + * INSTALL.in: new files to autogenerate README and INSTALL from. + + * gtk/COPYING: + * gdk/COPYING: new files containing the GNU LESSER GENERAL PUBLIC + LICENSE. + + * configure.in: figure wether we have GNU Make, version update to + Gtk+ 1.2.4, interface age 2, binary age 4. + + * NEWS: updates. + + * docs/generation.txt: minor additions/corrections. + Sat Aug 21 14:07:36 1999 Lars Hamann * gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6c6cadb3bb..a92d49b04b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,36 @@ +Mon Aug 23 19:11:17 1999 Tim Janik + + * gtk/Makefile.am: + invoke indent on gtkmarshal.*. + rewrote source generation rules, use COPYING as oldest source tag for + a piggyback rule to generate all sources from (don't touch it ;). + major cleanups, strip spaces on build rules for GNU Make. + + * gtk/genmarshal.pl: don't operate on hardcoded filenames but take + source and target files from commandline arguments. don't invoke indent. + + * gdk/Makefile.am: minor cleanups, strip spaces on build rules for + GNU Make. + + * docs/Makefile.am: added generation.txt. + + * Makefile.am: require automake 1.4, build README from README.in and + INSTALL from INSTALL.in in dist-hook. + + * README.in: + * INSTALL.in: new files to autogenerate README and INSTALL from. + + * gtk/COPYING: + * gdk/COPYING: new files containing the GNU LESSER GENERAL PUBLIC + LICENSE. + + * configure.in: figure wether we have GNU Make, version update to + Gtk+ 1.2.4, interface age 2, binary age 4. + + * NEWS: updates. + + * docs/generation.txt: minor additions/corrections. + Sat Aug 21 14:07:36 1999 Lars Hamann * gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6c6cadb3bb..a92d49b04b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,36 @@ +Mon Aug 23 19:11:17 1999 Tim Janik + + * gtk/Makefile.am: + invoke indent on gtkmarshal.*. + rewrote source generation rules, use COPYING as oldest source tag for + a piggyback rule to generate all sources from (don't touch it ;). + major cleanups, strip spaces on build rules for GNU Make. + + * gtk/genmarshal.pl: don't operate on hardcoded filenames but take + source and target files from commandline arguments. don't invoke indent. + + * gdk/Makefile.am: minor cleanups, strip spaces on build rules for + GNU Make. + + * docs/Makefile.am: added generation.txt. + + * Makefile.am: require automake 1.4, build README from README.in and + INSTALL from INSTALL.in in dist-hook. + + * README.in: + * INSTALL.in: new files to autogenerate README and INSTALL from. + + * gtk/COPYING: + * gdk/COPYING: new files containing the GNU LESSER GENERAL PUBLIC + LICENSE. + + * configure.in: figure wether we have GNU Make, version update to + Gtk+ 1.2.4, interface age 2, binary age 4. + + * NEWS: updates. + + * docs/generation.txt: minor additions/corrections. + Sat Aug 21 14:07:36 1999 Lars Hamann * gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6c6cadb3bb..a92d49b04b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,36 @@ +Mon Aug 23 19:11:17 1999 Tim Janik + + * gtk/Makefile.am: + invoke indent on gtkmarshal.*. + rewrote source generation rules, use COPYING as oldest source tag for + a piggyback rule to generate all sources from (don't touch it ;). + major cleanups, strip spaces on build rules for GNU Make. + + * gtk/genmarshal.pl: don't operate on hardcoded filenames but take + source and target files from commandline arguments. don't invoke indent. + + * gdk/Makefile.am: minor cleanups, strip spaces on build rules for + GNU Make. + + * docs/Makefile.am: added generation.txt. + + * Makefile.am: require automake 1.4, build README from README.in and + INSTALL from INSTALL.in in dist-hook. + + * README.in: + * INSTALL.in: new files to autogenerate README and INSTALL from. + + * gtk/COPYING: + * gdk/COPYING: new files containing the GNU LESSER GENERAL PUBLIC + LICENSE. + + * configure.in: figure wether we have GNU Make, version update to + Gtk+ 1.2.4, interface age 2, binary age 4. + + * NEWS: updates. + + * docs/generation.txt: minor additions/corrections. + Sat Aug 21 14:07:36 1999 Lars Hamann * gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6c6cadb3bb..a92d49b04b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,36 @@ +Mon Aug 23 19:11:17 1999 Tim Janik + + * gtk/Makefile.am: + invoke indent on gtkmarshal.*. + rewrote source generation rules, use COPYING as oldest source tag for + a piggyback rule to generate all sources from (don't touch it ;). + major cleanups, strip spaces on build rules for GNU Make. + + * gtk/genmarshal.pl: don't operate on hardcoded filenames but take + source and target files from commandline arguments. don't invoke indent. + + * gdk/Makefile.am: minor cleanups, strip spaces on build rules for + GNU Make. + + * docs/Makefile.am: added generation.txt. + + * Makefile.am: require automake 1.4, build README from README.in and + INSTALL from INSTALL.in in dist-hook. + + * README.in: + * INSTALL.in: new files to autogenerate README and INSTALL from. + + * gtk/COPYING: + * gdk/COPYING: new files containing the GNU LESSER GENERAL PUBLIC + LICENSE. + + * configure.in: figure wether we have GNU Make, version update to + Gtk+ 1.2.4, interface age 2, binary age 4. + + * NEWS: updates. + + * docs/generation.txt: minor additions/corrections. + Sat Aug 21 14:07:36 1999 Lars Hamann * gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize diff --git a/INSTALL b/INSTALL index 305e2f0308..bbfb0fd90d 100644 --- a/INSTALL +++ b/INSTALL @@ -7,12 +7,12 @@ you got this package. Simple install procedure ======================== - % gzip -cd gtk+-1.2.3.tar.gz | tar xvf - # unpack the sources - % cd gtk+-1.2.3 # change to the toplevel directory - % ./configure # run the `configure' script - % make # build GTK + % gzip -cd gtk+-1.2.4.tar.gz | tar xvf - # unpack the sources + % cd gtk+-1.2.4 # change to the toplevel directory + % ./configure # run the `configure' script + % make # build GTK [ Become root if necessary ] - % make install # install GTK + % make install # install GTK The Nitty-Gritty ================ @@ -118,7 +118,7 @@ You can compile GTK+ against a copy of GLIB that you have not yet installed. To do this, give the --with-glib=DIR options to ./configure. For instance: - ./configure --with-glib=../glib-1.2.3 + ./configure --with-glib=../glib-1.2.4 This, however, will not work if you built GLIB with different source and build directories. diff --git a/Makefile.am b/Makefile.am index 0ec9ada69a..3a029197da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,13 @@ -## Process this file with automake to produce Makefile.in +## Makefile.am for GTK+ SRC_SUBDIRS = gdk gtk SUBDIRS = po $(SRC_SUBDIRS) docs bin_SCRIPTS = gtk-config +# require automake 1.4 +AUTOMAKE_OPTIONS = 1.4 + EXTRA_DIST = \ HACKING \ gtk+.spec.in \ @@ -98,7 +101,13 @@ EXTRA_DIST = \ examples/find-examples.sh dist-hook: - cp gtk+.spec $(distdir) + if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \ + CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \ + CONFIG_HEADERS= \ + $(SHELL) config.status \ + && cp INSTALL README $(distdir) ; \ + fi \ + && cp gtk+.spec $(distdir) m4datadir = $(datadir)/aclocal m4data_DATA = gtk.m4 diff --git a/NEWS b/NEWS index ca82b7db82..5583dbc0da 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +Overview of Changes in GTK+ 1.2.4: + +* DnD improvements (drags can be canceled with Esc now). +* suppressed configure event reordering in Gdk. +* rewrite of Gtk's configure event handling. +* major improvements for the object argument system (Elena Devdariani). +* major bugfixes for threading, GtkNotebook, GtkItemFactory, GtkCList and + GtkCTree. +* tutorial/FAQ updates, new file generation.txt on autogenerated sources. +* configure's --with-glib= is "officially" unsupported. +* upgrade to libtool 1.3.3. +* various buglets fixed. + Overview of Changes in GTK+ 1.2.3: * Upgrade to libtool 1.3 diff --git a/README b/README index 7b5c91aea6..15eb2e21c4 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ General Information =================== -This is GTK+ version 1.2.3. GTK+, which stands for the Gimp ToolKit, +This is GTK+ version 1.2.4. GTK+, which stands for the Gimp ToolKit, is a library for creating graphical user interfaces for the X Window System. It is designed to be small, efficient, and flexible. GTK+ is written in C with a very object-oriented approach. @@ -37,9 +37,9 @@ version number. This should be separated by a blank line from the actual headers. Package: gtk+ - Version: 1.2.3 + Version: 1.2.4 -[ Please substitute 1.2.3 with the version of GTK+ that +[ Please substitute 1.2.4 with the version of GTK+ that you have installed ] Then describe the bug. Include: @@ -82,7 +82,7 @@ From: yourname@your.address.org Subject: handlebox test in testgtk is misnamed. Package: gtk+ -Version: 1.2.3 +Version: 1.2.4 When I run gtk/testgtk, the button "handle box" is misnamed. There are multiple handle boxes in diff --git a/configure.in b/configure.in index 60a98625ad..cf4082f2f8 100644 --- a/configure.in +++ b/configure.in @@ -29,9 +29,9 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl # GTK_MAJOR_VERSION=1 GTK_MINOR_VERSION=2 -GTK_MICRO_VERSION=3 -GTK_INTERFACE_AGE=1 -GTK_BINARY_AGE=3 +GTK_MICRO_VERSION=4 +GTK_INTERFACE_AGE=2 +GTK_BINARY_AGE=4 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION dnl AC_DIVERT_POP()dnl @@ -163,6 +163,19 @@ if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then fi AC_SUBST(REBUILD) +AC_MSG_CHECKING(whether make is GNU Make) +STRIP_BEGIN= +STRIP_END= +if make --version 2>/dev/null | grep '^GNU Make version ' >/dev/null ; then + STRIP_BEGIN='$(strip' + STRIP_END=')' + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi +AC_SUBST(STRIP_BEGIN) +AC_SUBST(STRIP_END) + # i18n stuff ALL_LINGUAS="ca cs de es fi fr hr hu it ja ko nl no pl pt ru sl sk sv wa zh_TW.Big5" AM_GTK_GNU_GETTEXT @@ -217,9 +230,9 @@ fi if test x$with_glib = x ; then # Look for separately installed glib - AM_PATH_GLIB(1.2.3,, + AM_PATH_GLIB(1.2.4,, AC_MSG_ERROR([ -*** GLIB 1.2.3 or better is required. The latest version of GLIB +*** GLIB 1.2.4 or better is required. The latest version of GLIB *** is always available from ftp://ftp.gtk.org/.]), gmodule gthread) diff --git a/docs/Makefile.am b/docs/Makefile.am index 0731e7e439..8d58f71fdd 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -101,38 +101,6 @@ FAQ_FILES=html/gtkfaq.html \ html/gtkfaq-7.html \ text/gtkfaq.txt -EXTRA_DIST = \ - Changes-1.2.txt \ - gtk-config.1.in \ - texinfo.tex \ - macros.texi \ - gtkdocs_fix \ - gtkfaq.sgml \ - gtk-config.txt \ - gtk_tut.sgml \ - gtk_tut_it.sgml \ - gtk_tut_fr.sgml \ - debugging.txt \ - developers.txt \ - refcounting.txt \ - styles.txt \ - text_widget.txt \ - widget_system.txt \ - gtk_tut_packbox1.gif \ - gtk_tut_packbox2.gif \ - html/gtk_tut_table.gif \ - html/gtk_tut_packbox1.gif \ - html/gtk_tut_packbox2.gif \ - gtk_tut_table.gif \ - html/gdk.html \ - html/gdk_toc.html \ - html/gtk.html \ - html/gtk_toc.html \ - $(TUTORIAL_FILES) \ - $(TUTORIAL_FR_FILES) \ - $(TUTORIAL_IT_FILES) \ - $(FAQ_FILES) - html/gtk_tut_table.gif: gdk.html gtk.html .PHONY: html htmldir faq tutorial tutorial_it tutorial_fr files @@ -198,3 +166,36 @@ files: @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \ echo $$p; \ done + +EXTRA_DIST += \ + Changes-1.2.txt \ + debugging.txt \ + developers.txt \ + refcounting.txt \ + styles.txt \ + text_widget.txt \ + widget_system.txt \ + generation.txt \ + gtk-config.txt \ + gtk-config.1.in \ + texinfo.tex \ + macros.texi \ + gtkdocs_fix \ + gtkfaq.sgml \ + gtk_tut.sgml \ + gtk_tut_it.sgml \ + gtk_tut_fr.sgml \ + gtk_tut_packbox1.gif \ + gtk_tut_packbox2.gif \ + html/gtk_tut_table.gif \ + html/gtk_tut_packbox1.gif \ + html/gtk_tut_packbox2.gif \ + gtk_tut_table.gif \ + html/gdk.html \ + html/gdk_toc.html \ + html/gtk.html \ + html/gtk_toc.html \ + $(TUTORIAL_FILES) \ + $(TUTORIAL_FR_FILES) \ + $(TUTORIAL_IT_FILES) \ + $(FAQ_FILES) diff --git a/docs/generation.txt b/docs/generation.txt index 429f9ff364..5ec2d83bea 100644 --- a/docs/generation.txt +++ b/docs/generation.txt @@ -41,8 +41,10 @@ the corresponding header files by some simple sed scripts. These are not actually run automatically because we want all the keysyms -even on systems with a limited set. -[ yosh - is this correct? ] +even on systems with a limited set. +So the Gdk rule to generate both files (X-derived-headers) +only needs to be rerun for every new release of the X Window +System. GTK+ - type definitions ======================= @@ -165,14 +167,11 @@ are marked above with the return types in parantheses. NOTES ===== -When autogenerating the GTK header files, the autogenerated +When autogenerating GTK+ files, the autogenerated files are often rebuild resulting in the same result. -To prevent unecessary rebuilds of the entire directory, the -actual files are actually not written to directly. Instead, an -intermediate file is written, this is compared to the -old file, and only if it is different is it copied into -the final location. - - - +To prevent unecessary rebuilds of the entire directory, some files +that multiple other source files depend on are not actually written +to directly. Instead, an intermediate file is written, which +is then compared to the old file, and only if it is different +is it copied into the final location. diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 3161727020..6c68265c65 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -1,19 +1,47 @@ -## Process this file with automake to produce Makefile.in +## Makefile.am for gtk+/gdk -gdkincludedir = $(includedir)/gdk - -lib_LTLIBRARIES = libgdk.la - -INCLUDES = \ +INCLUDES = @STRIP_BEGIN@ \ -DG_LOG_DOMAIN=\"Gdk\" \ -I$(top_srcdir) \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ @GTK_LOCALE_FLAGS@ \ @GLIB_CFLAGS@ \ - @x_cflags@ + @x_cflags@ \ +@STRIP_END@ -libgdk_la_SOURCES = \ +# +# libraries to compile and install +# +lib_LTLIBRARIES = libgdk.la + +# libtool stuff: set version and export symbols for resolving +libgdkincludedir = $(includedir)/gdk +libgdk_la_LDFLAGS = @STRIP_BEGIN@ \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -release $(LT_RELEASE) \ + -export-dynamic \ + @GLIB_DEPLIBS@ \ + @x_ldflags@ \ + @x_libs@ \ + -lm \ +@STRIP_END@ + +# +# setup source file variables +# +# GDK header files for public installation (non-generated) +gdk_public_h_sources = @STRIP_BEGIN@ \ + gdk.h \ + gdkcursors.h \ + gdkrgb.h \ + gdki18n.h \ + gdkkeysyms.h \ + gdkprivate.h \ + gdktypes.h \ + gdkx.h \ +@STRIP_END@ +gdk_c_sources = @STRIP_BEGIN@ \ gdk.c \ gdkcc.c \ gdkcolor.c \ @@ -44,42 +72,23 @@ libgdk_la_SOURCES = \ MwmUtil.h \ gxid_lib.h \ gxid_proto.h \ - gxid_lib.c -## this last one is ifdef'd out unless XINPUT_GXI is defined -## It's easier than trying to get automake to handle compiling -## it conditionally + gxid_lib.c \ +@STRIP_END@ -gdkinclude_HEADERS = \ - gdk.h \ - gdkcursors.h \ - gdkrgb.h \ - gdki18n.h \ - gdkkeysyms.h \ - gdkprivate.h \ - gdktypes.h \ - gdkx.h - -LDADDS = \ - @x_ldflags@ \ - @x_libs@ \ - @GLIB_LIBS@ \ - -lm - -libgdk_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \ - @GLIB_DEPLIBS@ \ - @x_ldflags@ \ - @x_libs@ \ - -lm - -EXTRA_PROGRAMS = gxid - -bin_PROGRAMS = @xinput_progs@ - -gxid_SOURCES = gxid.c - -gxid_LDADD = $(LDADDS) +# +# setup GDK sources and their dependancies +# +libgdkinclude_HEADERS = $(gdk_public_h_sources) +libgdk_la_SOURCES = $(gdk_c_sources) +MAINTAINERCLEANFILES += +EXTRA_HEADERS += +EXTRA_DIST += +EXTRA_DIST += +# +# rules to generate built sources +# +# we only need to remake these headers once a new X version is released X-derived-headers: sed -e 's/^#define[ ]*XC\([^ ]*\)[ ]*\([^ ]*\)[ ]*.*$$/GDK\1 = \2,/' \ -e 'tb' -e 'd' -e ':b' \ @@ -89,6 +98,21 @@ X-derived-headers: -e 'tb' -e 'd' -e ':b' -e 's/ 0X/ 0x/' \ < @x_includes@/X11/keysymdef.h > gdkkeysyms.h +# +# extra programs +# +EXTRA_PROGRAMS = gxid +bin_PROGRAMS = @xinput_progs@ +LDADDS = @STRIP_BEGIN@ \ + @x_ldflags@ \ + @x_libs@ \ + @GLIB_LIBS@ \ + -lm \ +@STRIP_END@ +gxid_SOURCES = gxid.c +gxid_LDADD = $(LDADDS) + + .PHONY: files files: diff --git a/gtk/.cvsignore b/gtk/.cvsignore index 5d15fd6a40..73b2cfeb3a 100644 --- a/gtk/.cvsignore +++ b/gtk/.cvsignore @@ -22,7 +22,6 @@ gtktypebuiltins_vars.c gtktypebuiltins_evals.c gtk.defs testdnd -stamp-d -stamp-t -stamp-m -s-* +stamp-gtktypebuiltins.h +stamp-gtkmarshal.h +stamp-gtk.defs diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 7c7d421448..366b608e3c 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,124 +1,45 @@ -### Process this file with automake to produce Makefile.in +## Makefile.am for gtk+/gtk -gtkincludedir = $(includedir)/gtk +INCLUDES = @STRIP_BEGIN@ \ + -DG_LOG_DOMAIN=\"Gtk\" \ + -DGTK_DISABLE_COMPAT_H \ + -DGTK_EXE_PREFIX=\"$(exec_prefix)\" \ + -DGTK_DATA_PREFIX=\"$(prefix)\" \ + -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ + -DGTK_LOCALEDIR=\"$(gtklocaledir)\" \ + -I$(top_srcdir) \ + @GTK_DEBUG_FLAGS@ \ + @GTK_XIM_FLAGS@ \ + @GTK_LOCALE_FLAGS@ \ + @GLIB_CFLAGS@ \ + @x_cflags@ \ +@STRIP_END@ + +# +# libraries to compile and install +# lib_LTLIBRARIES = libgtk.la -static_SOURCES = \ - gtkaccelgroup.c \ - gtkaccellabel.c \ - gtkadjustment.c \ - gtkalignment.c \ - gtkarg.c \ - gtkarrow.c \ - gtkaspectframe.c \ - gtkbin.c \ - gtkbindings.c \ - gtkbbox.c \ - gtkbox.c \ - gtkbutton.c \ - gtkcalendar.c \ - gtkcheckbutton.c \ - gtkcheckmenuitem.c \ - gtkclist.c \ - gtkcolorsel.c \ - gtkcombo.c \ - gtkcontainer.c \ - gtkctree.c \ - gtkcurve.c \ - gtkdata.c \ - gtkdialog.c \ - gtkdnd.c \ - gtkdrawingarea.c \ - gtkeditable.c \ - gtkentry.c \ - gtkeventbox.c \ - gtkfilesel.c \ - gtkfixed.c \ - gtkfontsel.c \ - gtkframe.c \ - gtkgamma.c \ - gtkgc.c \ - gtkhandlebox.c \ - gtkhbbox.c \ - gtkhbox.c \ - gtkhpaned.c \ - gtkhruler.c \ - gtkhscale.c \ - gtkhscrollbar.c \ - gtkhseparator.c \ - gtkimage.c \ - gtkinputdialog.c \ - gtkintl.h \ - gtkinvisible.c \ - gtkitem.c \ - gtkitemfactory.c \ - gtklabel.c \ - gtklayout.c \ - gtklist.c \ - gtklistitem.c \ - gtkmain.c \ - gtkmenu.c \ - gtkmenubar.c \ - gtkmenufactory.c \ - gtkmenuitem.c \ - gtkmenushell.c \ - gtkmisc.c \ - gtknotebook.c \ - gtkobject.c \ - gtkoptionmenu.c \ - gtkpacker.c \ - gtkpaned.c \ - gtkpixmap.c \ - gtkplug.c \ - gtkpreview.c \ - gtkprogress.c \ - gtkprogressbar.c \ - gtkradiobutton.c \ - gtkradiomenuitem.c \ - gtkrange.c \ - gtkrc.c \ - gtkruler.c \ - gtkscale.c \ - gtkscrollbar.c \ - gtkscrolledwindow.c \ - gtkselection.c \ - gtkseparator.c \ - gtksignal.c \ - gtksocket.c \ - gtkspinbutton.c \ - gtkstyle.c \ - gtkstatusbar.c \ - gtktable.c \ - gtktearoffmenuitem.c \ - gtktext.c \ - gtkthemes.c \ - gtktipsquery.c \ - gtktogglebutton.c \ - gtktoolbar.c \ - gtktooltips.c \ - gtktree.c \ - gtktreeitem.c \ - gtktypeutils.c \ - gtkvbbox.c \ - gtkvbox.c \ - gtkviewport.c \ - gtkvpaned.c \ - gtkvruler.c \ - gtkvscale.c \ - gtkvscrollbar.c \ - gtkvseparator.c \ - gtkwidget.c \ - gtkwindow.c \ - fnmatch.c \ - fnmatch.h +# libtool stuff: set version and export symbols for resolving +libgtkincludedir = $(includedir)/gtk +libgtk_la_LDFLAGS = @STRIP_BEGIN@ \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -release $(LT_RELEASE) \ + -export-dynamic \ + @GLIB_DEPLIBS@ \ + @x_ldflags@ \ + @x_libs@ \ + -lm \ +@STRIP_END@ +# $(top_builddir)/gdk/libgdk.la -libgtk_la_SOURCES = \ - $(static_SOURCES) \ - gtkmarshal.c -# Source headers which are non-autogenerated headers -source_headers = \ +# +# setup source file variables +# +# GTK+ header files for public installation (non-generated) +gtk_public_h_sources = @STRIP_BEGIN@ \ gtk.h \ gtkaccelgroup.h \ gtkaccellabel.h \ @@ -151,6 +72,7 @@ source_headers = \ gtkentry.h \ gtkenums.h \ gtkeventbox.h \ + gtkfeatures.h \ gtkfilesel.h \ gtkfixed.h \ gtkfontsel.h \ @@ -227,100 +149,230 @@ source_headers = \ gtkvscrollbar.h \ gtkvseparator.h \ gtkwidget.h \ - gtkwindow.h - -gtkinclude_HEADERS = \ - $(source_headers) \ - gtkfeatures.h \ + gtkwindow.h \ +@STRIP_END@ +# GTK+ header files that don't get installed +gtk_private_h_sources = @STRIP_BEGIN@ \ +@STRIP_END@ +# GTK+ C sources to build the library from +gtk_c_sources = @STRIP_BEGIN@ \ + gtkaccelgroup.c \ + gtkaccellabel.c \ + gtkadjustment.c \ + gtkalignment.c \ + gtkarg.c \ + gtkarrow.c \ + gtkaspectframe.c \ + gtkbin.c \ + gtkbindings.c \ + gtkbbox.c \ + gtkbox.c \ + gtkbutton.c \ + gtkcalendar.c \ + gtkcheckbutton.c \ + gtkcheckmenuitem.c \ + gtkclist.c \ + gtkcolorsel.c \ + gtkcombo.c \ + gtkcontainer.c \ + gtkctree.c \ + gtkcurve.c \ + gtkdata.c \ + gtkdialog.c \ + gtkdnd.c \ + gtkdrawingarea.c \ + gtkeditable.c \ + gtkentry.c \ + gtkeventbox.c \ + gtkfilesel.c \ + gtkfixed.c \ + gtkfontsel.c \ + gtkframe.c \ + gtkgamma.c \ + gtkgc.c \ + gtkhandlebox.c \ + gtkhbbox.c \ + gtkhbox.c \ + gtkhpaned.c \ + gtkhruler.c \ + gtkhscale.c \ + gtkhscrollbar.c \ + gtkhseparator.c \ + gtkimage.c \ + gtkinputdialog.c \ + gtkintl.h \ + gtkinvisible.c \ + gtkitem.c \ + gtkitemfactory.c \ + gtklabel.c \ + gtklayout.c \ + gtklist.c \ + gtklistitem.c \ + gtkmain.c \ + gtkmarshal.c \ + gtkmenu.c \ + gtkmenubar.c \ + gtkmenufactory.c \ + gtkmenuitem.c \ + gtkmenushell.c \ + gtkmisc.c \ + gtknotebook.c \ + gtkobject.c \ + gtkoptionmenu.c \ + gtkpacker.c \ + gtkpaned.c \ + gtkpixmap.c \ + gtkplug.c \ + gtkpreview.c \ + gtkprogress.c \ + gtkprogressbar.c \ + gtkradiobutton.c \ + gtkradiomenuitem.c \ + gtkrange.c \ + gtkrc.c \ + gtkruler.c \ + gtkscale.c \ + gtkscrollbar.c \ + gtkscrolledwindow.c \ + gtkselection.c \ + gtkseparator.c \ + gtksignal.c \ + gtksocket.c \ + gtkspinbutton.c \ + gtkstyle.c \ + gtkstatusbar.c \ + gtktable.c \ + gtktearoffmenuitem.c \ + gtktext.c \ + gtkthemes.c \ + gtktipsquery.c \ + gtktogglebutton.c \ + gtktoolbar.c \ + gtktooltips.c \ + gtktree.c \ + gtktreeitem.c \ + gtktypeutils.c \ + gtkvbbox.c \ + gtkvbox.c \ + gtkviewport.c \ + gtkvpaned.c \ + gtkvruler.c \ + gtkvscale.c \ + gtkvscrollbar.c \ + gtkvseparator.c \ + gtkwidget.c \ + gtkwindow.c \ + fnmatch.c \ + fnmatch.h \ +@STRIP_END@ +# we use our own built_sources variable rules to avoid automake's +# BUILT_SOURCES oddities +# we generate frequently rebuild files piggyback on a stamp file, so sources +# depending on them only get rebuild when the built source actually changed +# content +# +# built sources that don't get installed +gtk_built_sources = @STRIP_BEGIN@ \ + stamp-gtktypebuiltins.h \ + stamp-gtkmarshal.h \ + gtktypebuiltins_vars.c \ + gtktypebuiltins_ids.c \ + gtktypebuiltins_evals.c \ + gtkmarshal.c \ + stamp-gtk.defs \ + gtk.defs \ +@STRIP_END@ +# built sources that get installed with the header files +gtk_built_public_sources = @STRIP_BEGIN@ \ gtkmarshal.h \ - gtktypebuiltins.h + gtktypebuiltins.h \ +@STRIP_END@ +# non-header sources (headers should be specified in the above variables) +# that don't serve as direct make target sources, i.e. they don't have +# their own .lo rules and don't get publically installed +gtk_extra_sources = @STRIP_BEGIN@ \ + gtkfeatures.h.in \ + makeenums.pl \ + makeenums.awk \ + maketypes.awk \ + makeenums.h \ + gtkargcollector.c \ + gtk-boxed.defs \ + genmarshal.pl \ + gtkmarshal.list \ +@STRIP_END@ +# Extra headers that are used for enum type array/id generation +gdk_headers = @STRIP_BEGIN@ \ + ../gdk/gdktypes.h \ + ../gdk/gdkrgb.h \ +@STRIP_END@ -# note gtk.defs, gtktypebuiltin* and gtkmarshal.[ch] aren't here, but -# their stamps are. Another trick is to use the temporary output files as -# the stamp files. -BUILT_SOURCES = \ - s-gd s-gtb s-gtbv s-gtbi s-gtbe \ - stamp-m +# +# setup GTK+ sources and their dependancies +# +libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) +libgtk_la_SOURCES = $(gtk_c_sources) +MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources) +EXTRA_HEADERS += +EXTRA_DIST += $(gtk_private_h_sources) +EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources) -# cause the built sources to be rebuild when possible, even with --include-deps -$(static_SOURCES): $(BUILT_SOURCES) - -# More headers to use when autogenerating. -gdk_headers = \ - ../gdk/gdktypes.h \ - ../gdk/gdkrgb.h - -# generate gtk.defs file from gtk-boxed.defs and *.h -gtk.defs: @REBUILD@ s-gd - @: - -s-gd: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers) +# +# rules to generate built sources +# +gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc +CLEANFILES += $(gen_sources) +COPYING: $(gtk_built_public_sources) $(gtk_built_sources) +$(OBJECTS): COPYING # this is our oldest-source-stamp +gtk.defs: @REBUILD@ # stamp-gtk.defs + -test -e "$@" || touch $(srcdir)/gtk.defs +stamp-gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(gtk_public_h_sources) $(gdk_headers) cd $(srcdir) \ - && $(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) > s-gd \ - && cat gtk-boxed.defs >> s-gd \ - && (cmp -s s-gd gtk.defs || cp s-gd gtk.defs) - -# generate type identifier header (GTK_TYPE_WIDGET_FLAGS) -gtktypebuiltins.h: @REBUILD@ s-gtb - @: - -s-gtb: @REBUILD@ s-gd maketypes.awk + && $(PERL) makeenums.pl defs $(gtk_public_h_sources) $(gdk_headers) > xgen-gdef \ + && cat gtk-boxed.defs >> xgen-gdef \ + && (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \ + && rm -f xgen-gdef \ + && echo timestamp > $@ +gtkmarshal.h: @REBUILD@ # stamp-gtkmarshal.h + -test -e "$@" || touch $(srcdir)/gtkmarshal.h +stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.h +gtkmarshal.c stamp-gtkmarshal.h: @REBUILD@ genmarshal.pl gtkmarshal.list + $(PERL) genmarshal.pl gtkmarshal.list xgen-gmh xgen-gmc \ + && (test -z "$(INDENT)" || $(INDENT) xgen-gmh) \ + && (test -z "$(INDENT)" || $(INDENT) xgen-gmc) \ + && cp xgen-gmc gtkmarshal.c \ + && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \ + && rm -f xgen-gmh xgen-gmc \ + && echo timestamp > stamp-gtkmarshal.h +gtktypebuiltins.h: @REBUILD@ # stamp-gtktypebuiltins.h + -test -e "$@" || touch $(srcdir)/gtktypebuiltins.h +stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk gtk.defs gtktypebuiltins.h cd $(srcdir) \ - && $(AWK) -f maketypes.awk gtk.defs macros > s-gtb \ - && (cmp -s s-gtb gtktypebuiltins.h || cp s-gtb gtktypebuiltins.h) - -# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS) -gtktypebuiltins_vars.c: @REBUILD@ s-gtbv - @: -s-gtbv: @REBUILD@ s-gd maketypes.awk + && $(AWK) -f maketypes.awk gtk.defs macros > xgen-gtbh \ + && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h) \ + && rm -f xgen-gtbh \ + && echo timestamp > $@ +gtktypebuiltins_vars.c: @REBUILD@ maketypes.awk gtk.defs cd $(srcdir) \ - && $(AWK) -f maketypes.awk gtk.defs variables > s-gtbv \ - && (cmp -s s-gtbv gtktypebuiltins_vars.c || cp s-gtbv gtktypebuiltins_vars.c) - -# generate type entries for type-id registration -gtktypebuiltins_ids.c: @REBUILD@ s-gtbi - @: - -s-gtbi: @REBUILD@ s-gd maketypes.awk + && $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc \ + && cp xgen-gtbvc $@ \ + && rm -f xgen-gtbvc +gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk gtk.defs cd $(srcdir) \ - && $(AWK) -f maketypes.awk gtk.defs entries > s-gtbi \ - && (cmp -s s-gtbi gtktypebuiltins_ids.c || cp s-gtbi gtktypebuiltins_ids.c) - -# generate enum value arrays -gtktypebuiltins_evals.c: @REBUILD@ s-gtbe - @: - -s-gtbe: @REBUILD@ makeenums.pl s-gd + && $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \ + && cp xgen-gtbic $@ \ + && rm -f xgen-gtbic +gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl $(gtk_public_h_sources) $(gdk_headers) cd $(srcdir) \ - && $(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) > \ - s-gtbe \ - && (cmp -s s-gtbe gtktypebuiltins_evals.c || cp s-gtbe gtktypebuiltins_evals.c) + && $(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) > xgen-gtbec \ + && cp xgen-gtbec $@ \ + && rm -f xgen-gtbec -$(srcdir)/gtkmarshal.c $(srcdir)/gtkmarshal.h: @REBUILD@ stamp-m - @: - -stamp-m: @REBUILD@ $(srcdir)/gtkmarshal.list $(srcdir)/genmarshal.pl - (srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl \ - && (cmp -s s-gmc $(srcdir)/gtkmarshal.c || cp s-gmc $(srcdir)/gtkmarshal.c) \ - && rm -f s-gmc \ - && (cmp -s s-gmh $(srcdir)/gtkmarshal.h || cp s-gmh $(srcdir)/gtkmarshal.h) \ - && rm -f s-gmh) \ - && echo timestamp > stamp-m - -libgtk_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) \ - @GLIB_DEPLIBS@ \ - @x_ldflags@ \ - @x_libs@ \ - -lm -# $(top_builddir)/gdk/libgdk.la gtkconfdir = $(sysconfdir)/gtk gtkconf_DATA = gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.iso-8859-2 # We create a dummy theme for the default GTK+ theme - install-data-local: $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk echo "# Empty gtkrc for default theme" > \ @@ -335,86 +387,33 @@ install-data-local: uninstall-local: rm -f $(DESTDIR)$(datadir)/themes/Default/gtkrc -EXTRA_DIST = \ - line-arrow.xbm \ - line-wrap.xbm \ - testgtk.1 \ - testgtkrc \ - testgtkrc2 \ - gtkfeatures.h.in \ - makeenums.pl \ - makeenums.awk \ - maketypes.awk \ - makeenums.h \ - gtkargcollector.c \ - gtktypebuiltins_vars.c \ - gtktypebuiltins_ids.c \ - gtktypebuiltins_evals.c \ - gtk-boxed.defs \ - gtk.defs \ - genmarshal.pl \ - gtkmarshal.list \ - check-y.xpm \ - check-n.xpm \ - test.xpm \ - marble.xpm \ - 3DRings.xpm \ - FilesQueue.xpm \ - Modeller.xpm \ - tree_plus.xpm \ - tree_minus.xpm \ - tree_plus.xbm \ - tree_minus.xbm \ - circles.xbm \ - gtkrc.iso-8859-2 \ - gtkrc.ja \ - gtkrc.ko \ - gtkrc.ru - -INCLUDES = \ - -DGTK_DISABLE_COMPAT_H \ - -DG_LOG_DOMAIN=\"Gtk\" \ - -DGTK_EXE_PREFIX=\"$(exec_prefix)\" \ - -DGTK_DATA_PREFIX=\"$(prefix)\" \ - -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ - -DGTK_LOCALEDIR=\"$(gtklocaledir)\" \ - -I$(top_srcdir) \ - @GTK_DEBUG_FLAGS@ \ - @GTK_XIM_FLAGS@ \ - @GTK_LOCALE_FLAGS@ \ - @GLIB_CFLAGS@ \ - @x_cflags@ - -noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple -# testthreads - -DEPS = \ - libgtk.la \ - $(top_builddir)/gdk/libgdk.la - -LDADDS = \ - libgtk.la \ - $(top_builddir)/gdk/libgdk.la \ - @x_ldflags@ \ - @x_libs@ \ - @GLIB_LIBS@ \ - -lm - +# +# test programs, not to be installed +# +noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple # testthreads +DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la +LDADDS = @STRIP_BEGIN@ \ + libgtk.la \ + $(top_builddir)/gdk/libgdk.la \ + @x_ldflags@ \ + @x_libs@ \ + @GLIB_LIBS@ \ + -lm \ +@STRIP_END@ testgtk_DEPENDENCIES = $(DEPS) testinput_DEPENDENCIES = $(DEPS) -#testthreads_DEPENDENCIES = $(DEPS) testselection_DEPENDENCIES = $(DEPS) testrgb_DEPENDENCIES = $(DEPS) testdnd_DEPENDENCIES = $(DEPS) simple_DEPENDENCIES = $(DEPS) - +#testthreads_DEPENDENCIES = $(DEPS) testgtk_LDADD = $(LDADDS) testinput_LDADD = $(LDADDS) -#testthreads_LDADD = $(LDADDS) testselection_LDADD = $(LDADDS) testrgb_LDADD = $(LDADDS) testdnd_LDADD = $(LDADDS) simple_LDADD = $(LDADDS) +#testthreads_LDADD = $(LDADDS) .PHONY: files test test-debug @@ -433,5 +432,29 @@ test-debug: testgtk cd $$builddir; cd $(srcdir); \ $(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk -$(srcdir)/gtksignal.h: $(srcdir)/gtkmarshal.h - @: +EXTRA_DIST += @STRIP_BEGIN@ \ + testgtk.1 \ + testgtkrc \ + testgtkrc2 \ + circles.xbm \ + line-arrow.xbm \ + line-wrap.xbm \ + tree_plus.xbm \ + tree_minus.xbm \ + 3DRings.xpm \ + FilesQueue.xpm \ + Modeller.xpm \ + check-y.xpm \ + check-n.xpm \ + marble.xpm \ + tree_minus.xpm \ + tree_plus.xpm \ + test.xpm \ + check-y.xpm \ + check-n.xpm \ + test.xpm \ + gtkrc.iso-8859-2 \ + gtkrc.ja \ + gtkrc.ko \ + gtkrc.ru \ +@STRIP_END@ diff --git a/gtk/genmarshal.pl b/gtk/genmarshal.pl index db0487b990..3b5fdfaf87 100755 --- a/gtk/genmarshal.pl +++ b/gtk/genmarshal.pl @@ -20,25 +20,17 @@ "CALLBACK"=>"CALLBACK" ); -$srcdir = $ENV{'srcdir'} || '.'; -$indent = $ENV{'INDENT'}; - -sub indent { - my $filename = shift; - if (defined($indent) && $indent ne "") { - system($indent, $filename); - # we try the most likely names for backup files - system("rm", "-f", "$filename.bak", "$filename~"); - } +if ($#ARGV != 2) { + die ("Wrong number of arguments given, need "); } -open(IL, "<$srcdir/gtkmarshal.list") || die("Open failed: $!"); -open(OH, ">s-gmh") || die("Open failed: $!"); -open(OS, ">s-gmc") || die("Open failed: $!"); +open(IL, "<" . $ARGV[0]) || die ("Open failed: $!"); +open(OH, ">" . $ARGV[1]) || die ("Open failed: $!"); +open(OS, ">" . $ARGV[2]) || die ("Open failed: $!"); print OH < #include @@ -196,10 +188,7 @@ print OH <\n" "Language-Team: linux-ca@chanae.alphanet.ch\n" @@ -44,8 +44,8 @@ msgid "OK" msgstr "Val" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Cancel·lar" @@ -64,7 +64,7 @@ msgstr "Directoris" msgid "Files" msgstr "Fitxers" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "El directori no és legible: %s" @@ -73,11 +73,11 @@ msgstr "El directori no msgid "Create Dir" msgstr "Crear directori" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Esborrar fitxer" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Reanomenar fitxer" @@ -91,34 +91,34 @@ msgid "Error" msgstr "Error" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Tancar" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Crear directori" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Nom del directori:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Crear" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Esborrar" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Reanomenar" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "Selecció:" @@ -429,7 +429,7 @@ msgstr "(desactivat)" msgid "clear" msgstr "esborrar" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Pàgina %u" diff --git a/po/cs.po b/po/cs.po index 388f714c8a..b3099bfb4a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.2.3\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1999-05-25 00:02+02:00\n" "Last-Translator: Stanislav Brabec \n" "Language-Team: Czech \n" @@ -49,8 +49,8 @@ msgid "OK" msgstr "OK" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Zru¹it" @@ -69,7 +69,7 @@ msgstr "Adres msgid "Files" msgstr "Soubory" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Adresáø %s je neèitelný." @@ -78,11 +78,11 @@ msgstr "Adres msgid "Create Dir" msgstr "Vytvoøit adresáø" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Smazat soubor" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Pøejmenovat soubor" @@ -96,34 +96,34 @@ msgid "Error" msgstr "Chyba" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Zavøít" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Vytvoøit adresáø" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Jméno adresáøe:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Vytvoøit" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Smazat" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Pøejmenovat" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "Výbìr: " @@ -434,7 +434,7 @@ msgstr "(vypnuto)" msgid "clear" msgstr "smazat" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Strana %u" diff --git a/po/de.po b/po/de.po index 7742e0d655..aa889fd656 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.9\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1998-12-18 12:15+0100\n" "Last-Translator: Sven Neumann \n" "Language-Team: German \n" @@ -48,8 +48,8 @@ msgid "OK" msgstr "OK" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Abbrechen" @@ -68,7 +68,7 @@ msgstr "Verzeichnisse" msgid "Files" msgstr "Dateien" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Verzeichnis unlesbar: %s" @@ -77,11 +77,11 @@ msgstr "Verzeichnis unlesbar: %s" msgid "Create Dir" msgstr "Verzeichnis erstellen" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Datei löschen" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Datei umbenennen" @@ -95,34 +95,34 @@ msgid "Error" msgstr "Fehler" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Schließen" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Verzeichnis erstellen" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Verzeichnis:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Erstellen" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Löschen" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Umbenennen" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 #, fuzzy msgid "Selection: " msgstr "Schriftauswahl" @@ -434,7 +434,7 @@ msgstr "(ausgeschaltet)" msgid "clear" msgstr "gelöscht" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Seite %u" diff --git a/po/es.po b/po/es.po index a0d48ed5b5..c5f370aca5 100644 --- a/po/es.po +++ b/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.14\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1999-02-07 17:37+0100\n" "Last-Translator: Pablo Saratxaga \n" "Language-Team: \n" @@ -50,8 +50,8 @@ msgid "OK" msgstr "OK" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Anular" @@ -70,7 +70,7 @@ msgstr "Directorios" msgid "Files" msgstr "Archivos" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Directorio ilegible: %s" @@ -79,11 +79,11 @@ msgstr "Directorio ilegible: %s" msgid "Create Dir" msgstr "Crear Directorio" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Borrar Archivo" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Renombrar Archivo" @@ -97,34 +97,34 @@ msgid "Error" msgstr "Error" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Cerrar" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Crear Directorio" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Nombre del directorio:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Crear" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Borrar" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Renombrar" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "Selección: " @@ -436,7 +436,7 @@ msgstr "(desactivado)" msgid "clear" msgstr "limpiar" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Página %u" diff --git a/po/fi.po b/po/fi.po index 34e3c8443e..bd39185ecd 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.9\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1999-03-14 14:15+0100\n" "Last-Translator: Mikko Rauhala \n" "Language-Team: Finnish \n" @@ -48,8 +48,8 @@ msgid "OK" msgstr "OK" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Peruuta" @@ -69,7 +69,7 @@ msgid "Files" msgstr "Tiedostot" # , c-format -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Hakemisto ei luettavissa: %s" @@ -78,11 +78,11 @@ msgstr "Hakemisto ei luettavissa: %s" msgid "Create Dir" msgstr "Luo hakemisto" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Poista tiedosto" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Uudelleennimeä tiedosto" @@ -96,34 +96,34 @@ msgid "Error" msgstr "Virhe" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Sulje" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Luo hakemisto" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Hakemistonimi:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Luo" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Poista" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Uudelleennimeä" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "Valinta: " @@ -436,7 +436,7 @@ msgid "clear" msgstr "tyhjennä" # , c-format -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Sivu %u" diff --git a/po/fr.po b/po/fr.po index 506974b8da..1de7b24cc9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ VERSION\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1998-12-18 20:32+0100\n" "Last-Translator: Vincent Renardias \n" "Language-Team: Vincent Renardias \n" @@ -48,8 +48,8 @@ msgid "OK" msgstr "OK" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Annuler" @@ -68,7 +68,7 @@ msgstr "R msgid "Files" msgstr "Fichiers" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Répertoire illisible: %s" @@ -77,11 +77,11 @@ msgstr "R msgid "Create Dir" msgstr "Créer Rép." -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Effacer Fichier" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Renommer Fichier" @@ -95,34 +95,34 @@ msgid "Error" msgstr "Erreur" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Fermer" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Créer Répertoire" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Nom du répertoire:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Créer" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Effacer" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Renommer" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "Sélection:" @@ -435,7 +435,7 @@ msgstr "(d msgid "clear" msgstr "effacer" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Page %u" diff --git a/po/hr.po b/po/hr.po index 43c2de957e..81cee9a7d8 100644 --- a/po/hr.po +++ b/po/hr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.2.0\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1999-02-28 02:00+0100\n" "Last-Translator: Tomislav Vujec \n" "Language-Team: hr \n" @@ -49,8 +49,8 @@ msgid "OK" msgstr "OK" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Poni¹ti" @@ -69,7 +69,7 @@ msgstr "Direktoriji" msgid "Files" msgstr "Datoteke" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Neèitljiv direktorij: %s" @@ -78,11 +78,11 @@ msgstr "Ne msgid "Create Dir" msgstr "Napravi direktorij" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Obri¹i datoteku" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Promijeni ime datoteci" @@ -96,34 +96,34 @@ msgid "Error" msgstr "Gre¹ka" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Zatvori" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Napravi direktorij" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Ime direktorija:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Napravi" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Obri¹i" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Promijeni ime" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "Izbor: " @@ -434,7 +434,7 @@ msgstr "(onemogu msgid "clear" msgstr "obri¹i" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Stranica %u" diff --git a/po/hu.po b/po/hu.po index ce347e59fb..a1caa9a70f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.15\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1998-12-18 12:15+0100\n" "Last-Translator: Shooby Ban \n" "Language-Team: Hungarian \n" @@ -48,8 +48,8 @@ msgid "OK" msgstr "" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Mégsem" @@ -68,7 +68,7 @@ msgstr "K msgid "Files" msgstr "Fájlok" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Olvashatatlan könyvtár: %s" @@ -77,11 +77,11 @@ msgstr "Olvashatatlan k msgid "Create Dir" msgstr "Könyvtár létrehozása" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Fájl törlése" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Fájl átnevezése" @@ -95,34 +95,34 @@ msgid "Error" msgstr "Hiba" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Bezár" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Könyvtár létrehozása" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Könyvtár neve:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Létrehoz" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Töröl" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Átnevez" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 #, fuzzy msgid "Selection: " msgstr "Kiválasztva: " @@ -434,7 +434,7 @@ msgstr "(tiltva)" msgid "clear" msgstr "töröl" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "%u. lap" diff --git a/po/it.po b/po/it.po index 59ca3a4fb8..47c705f694 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.12\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1998-12-18 12:15+0100\n" "Last-Translator: Tristan Tarrant \n" "Language-Team: German \n" @@ -48,8 +48,8 @@ msgid "OK" msgstr "OK" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Annulla" @@ -68,7 +68,7 @@ msgstr "Directory" msgid "Files" msgstr "File" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Directory illeggibile: %s" @@ -77,11 +77,11 @@ msgstr "Directory illeggibile: %s" msgid "Create Dir" msgstr "Crea directory" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Cancella File" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Rinomina File" @@ -95,34 +95,34 @@ msgid "Error" msgstr "Errore" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Chiudi" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Crea Directory" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Nome cartella:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Crea" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Cancella" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Rinomina" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 #, fuzzy msgid "Selection: " msgstr "Selezione: " @@ -437,7 +437,7 @@ msgstr "(disabilitato)" msgid "clear" msgstr "cancella" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Pagina %u" diff --git a/po/ja.po b/po/ja.po index f44b39fcec..df2810f2ab 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.2.3\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1998-07-15 03:12+0900\n" "Last-Translator: Çòºê ÂÙ¹° \n" "Language-Team: Japanese \n" @@ -49,8 +49,8 @@ msgid "OK" msgstr "λ²ò" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "¼è¾Ã" @@ -69,7 +69,7 @@ msgstr " msgid "Files" msgstr "¥Õ¥¡¥¤¥ë" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤¬Æɤá¤Þ¤»¤ó: %s" @@ -78,11 +78,11 @@ msgstr " msgid "Create Dir" msgstr "¥Ç¥£¥ì¥¯¥È¥êºîÀ®" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "¥Õ¥¡¥¤¥ëºï½ü" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "¥Õ¥¡¥¤¥ë̾Êѹ¹" @@ -96,34 +96,34 @@ msgid "Error" msgstr "¥¨¥é¡¼" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "ÊĤ¸¤ë" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "¥Ç¥£¥ì¥¯¥È¥êºîÀ®" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "¥Ç¥£¥ì¥¯¥È¥ê̾:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "ºîÀ®" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "ºï½ü" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "̾¾ÎÊѹ¹" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "ÁªÂò: " @@ -434,7 +434,7 @@ msgstr "(̵ msgid "clear" msgstr "¥¯¥ê¥¢" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "¥Ú¡¼¥¸ %u" diff --git a/po/ko.po b/po/ko.po index b87180e9d2..240a6bb4ad 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.2.2\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1999-04-24 23:03+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -47,8 +47,8 @@ msgid "OK" msgstr "È®ÀÎ" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Ãë¼Ò" @@ -67,7 +67,7 @@ msgstr " msgid "Files" msgstr "ÆÄÀÏ" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "ÀÚ·á¹æÀ» ÀÐÀ» ¼ö ¾øÀ½: %s" @@ -76,11 +76,11 @@ msgstr " msgid "Create Dir" msgstr "ÀÚ·á¹æ ¸¸µé±â" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "ÆÄÀÏ Áö¿ì±â" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "ÆÄÀÏ¸í ¹Ù²Þ" @@ -94,34 +94,34 @@ msgid "Error" msgstr "¿À·ù" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "´Ý±â" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "ÀÚ·á¹æ ¸¸µé±â" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "ÀÚ·á¹æ À̸§:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "¸¸µé±â" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Áö¿ì±â" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "ÆÄÀÏ¸í ¹Ù²Þ" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "¼±ÅÃ:" @@ -432,7 +432,7 @@ msgstr "( msgid "clear" msgstr "Áö¿ò" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "ÆäÀÌÁö %u" diff --git a/po/nl.po b/po/nl.po index dde21fb3de..a87cfa60ce 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,90 +1,90 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , 1998. +# FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" -"PO-Revision-Date: 1999-01-31 23:04+0100\n" -"Last-Translator: Paul Siegmann \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" #: gtk/gtkcolorsel.c:221 msgid "Hue:" -msgstr "Kleur:" +msgstr "" #: gtk/gtkcolorsel.c:222 msgid "Saturation:" -msgstr "Verzadiging:" +msgstr "" #: gtk/gtkcolorsel.c:223 msgid "Value:" -msgstr "Waarde:" +msgstr "" #: gtk/gtkcolorsel.c:224 msgid "Red:" -msgstr "Rood:" +msgstr "" #: gtk/gtkcolorsel.c:225 msgid "Green:" -msgstr "Groen:" +msgstr "" #: gtk/gtkcolorsel.c:226 msgid "Blue:" -msgstr "Blauw:" +msgstr "" #: gtk/gtkcolorsel.c:227 msgid "Opacity:" -msgstr "Doorschijnendheid:" +msgstr "" #. The OK button #: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:469 gtk/gtkfontsel.c:3467 #: gtk/gtkgamma.c:416 msgid "OK" -msgstr "OK" +msgstr "" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" -msgstr "Annuleren" +msgstr "" #: gtk/gtkcolorsel.c:1738 msgid "Help" -msgstr "Help" +msgstr "" #. The directories clist #: gtk/gtkfilesel.c:418 msgid "Directories" -msgstr "Directories" +msgstr "" #. The files clist #: gtk/gtkfilesel.c:437 msgid "Files" -msgstr "Bestanden" +msgstr "" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" -msgstr "Directory onleesbaar: %s" +msgstr "" #: gtk/gtkfilesel.c:539 msgid "Create Dir" -msgstr "Maak Dir" +msgstr "" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" -msgstr "Verwijder Bestand" +msgstr "" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" -msgstr "Wijzig Bestandsnaam" +msgstr "" #. #. gtk_signal_connect (GTK_OBJECT (dialog), "destroy", @@ -93,138 +93,137 @@ msgstr "Wijzig Bestandsnaam" #. #: gtk/gtkfilesel.c:722 msgid "Error" -msgstr "Fout" +msgstr "" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" -msgstr "Sluiten" +msgstr "" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" -msgstr "Maak Directory" +msgstr "" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" -msgstr "Directory naam:" +msgstr "" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" -msgstr "Maak" +msgstr "" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" -msgstr "Verwijder" +msgstr "" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" -msgstr "Hernoem" +msgstr "" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " -msgstr "Selectie: " +msgstr "" #: gtk/gtkfontsel.c:210 msgid "Foundry:" -msgstr "Oorsprong:" +msgstr "" #: gtk/gtkfontsel.c:211 msgid "Family:" -msgstr "Familie:" +msgstr "" #: gtk/gtkfontsel.c:212 msgid "Weight:" -msgstr "Gewicht:" +msgstr "" #: gtk/gtkfontsel.c:213 msgid "Slant:" -msgstr "Helling:" +msgstr "" #: gtk/gtkfontsel.c:214 msgid "Set Width:" -msgstr "Zet Breedte:" +msgstr "" #: gtk/gtkfontsel.c:215 msgid "Add Style:" -msgstr "Voeg Stijl toe:" +msgstr "" #: gtk/gtkfontsel.c:216 msgid "Pixel Size:" -msgstr "Pixel Grootte:" +msgstr "" #: gtk/gtkfontsel.c:217 msgid "Point Size:" -msgstr "Punt Grootte:" +msgstr "" #: gtk/gtkfontsel.c:218 msgid "Resolution X:" -msgstr "Resolutie X:" +msgstr "" #: gtk/gtkfontsel.c:219 msgid "Resolution Y:" -msgstr "Resolutie Y:" +msgstr "" #: gtk/gtkfontsel.c:220 msgid "Spacing:" -msgstr "Spatiering:" +msgstr "" #: gtk/gtkfontsel.c:221 msgid "Average Width:" -msgstr "Gemiddelde Breedte:" +msgstr "" #: gtk/gtkfontsel.c:222 msgid "Charset:" -msgstr "Karakterset:" +msgstr "" #. Number of internationalized titles here must match number #. of NULL initializers above #: gtk/gtkfontsel.c:459 msgid "Font Property" -msgstr "Eigenschap Lettertype" +msgstr "" #: gtk/gtkfontsel.c:460 msgid "Requested Value" -msgstr "Gevraagde Waarde" +msgstr "" #: gtk/gtkfontsel.c:461 msgid "Actual Value" -msgstr "Werkelijke Waarde" +msgstr "" #: gtk/gtkfontsel.c:494 msgid "Font" -msgstr "Lettertype" +msgstr "" #: gtk/gtkfontsel.c:504 gtk/gtkfontsel.c:2158 gtk/gtkfontsel.c:2388 msgid "Font:" -msgstr "Lettertype:" +msgstr "" #: gtk/gtkfontsel.c:509 msgid "Font Style:" -msgstr "Lettertype Stijl:" +msgstr "" #: gtk/gtkfontsel.c:514 msgid "Size:" -msgstr "Grootte:" +msgstr "" #: gtk/gtkfontsel.c:646 gtk/gtkfontsel.c:868 -#, fuzzy msgid "Reset Filter" -msgstr "Verwijder Filter" +msgstr "" #: gtk/gtkfontsel.c:660 msgid "Metric:" -msgstr "Metriek:" +msgstr "" #: gtk/gtkfontsel.c:664 msgid "Points" -msgstr "Punten" +msgstr "" #: gtk/gtkfontsel.c:671 msgid "Pixels" -msgstr "Pixels" +msgstr "" #. create the text entry widget #: gtk/gtkfontsel.c:687 @@ -233,66 +232,65 @@ msgstr "" #: gtk/gtkfontsel.c:716 msgid "Font Information" -msgstr "Lettertype Informatie" +msgstr "" #: gtk/gtkfontsel.c:749 msgid "Requested Font Name:" -msgstr "Naam Gewenste Lettertype:" +msgstr "" #: gtk/gtkfontsel.c:760 msgid "Actual Font Name:" -msgstr "Naam Werkelijke Lettertype:" +msgstr "" #: gtk/gtkfontsel.c:771 #, c-format msgid "%i fonts available with a total of %i styles." -msgstr "%i lettertypen beschikbaar met in totaal %i stijlen." +msgstr "" #: gtk/gtkfontsel.c:786 -#, fuzzy msgid "Filter" -msgstr "Filter" +msgstr "" #: gtk/gtkfontsel.c:799 msgid "Font Types:" -msgstr "Lettertypen Types:" +msgstr "" #: gtk/gtkfontsel.c:807 msgid "Bitmap" -msgstr "Bitmap" +msgstr "" #: gtk/gtkfontsel.c:813 msgid "Scalable" -msgstr "Schaalbaar" +msgstr "" #: gtk/gtkfontsel.c:819 msgid "Scaled Bitmap" -msgstr "Geschaalde Bitmap" +msgstr "" #. Convert '(nil)' weights to 'regular', since it looks nicer. #: gtk/gtkfontsel.c:1215 msgid "regular" -msgstr "gewoon" +msgstr "" #: gtk/gtkfontsel.c:1220 gtk/gtkfontsel.c:1950 msgid "italic" -msgstr "schuingedrukt" +msgstr "" #: gtk/gtkfontsel.c:1221 gtk/gtkfontsel.c:1951 msgid "oblique" -msgstr "scheef" +msgstr "" #: gtk/gtkfontsel.c:1222 gtk/gtkfontsel.c:1952 msgid "reverse italic" -msgstr "omgekeerd schuingedrukt" +msgstr "" #: gtk/gtkfontsel.c:1223 gtk/gtkfontsel.c:1953 msgid "reverse oblique" -msgstr "omgekeerd scheef" +msgstr "" #: gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1954 msgid "other" -msgstr "anders" +msgstr "" #: gtk/gtkfontsel.c:1231 msgid "[M]" @@ -304,27 +302,27 @@ msgstr "" #: gtk/gtkfontsel.c:1782 msgid "The selected font is not available." -msgstr "Het gekozen lettertype is niet beschikbaar." +msgstr "" #: gtk/gtkfontsel.c:1788 msgid "The selected font is not a valid font." -msgstr "Het gekozen lettertype is niet een geldig lettertype." +msgstr "" #: gtk/gtkfontsel.c:1846 msgid "This is a 2-byte font and may not be displayed correctly." -msgstr "Dit is een 2-byte lettertype en wordt mischien niet goed weergegeven." +msgstr "" #: gtk/gtkfontsel.c:1938 gtk/gtkinputdialog.c:607 msgid "(unknown)" -msgstr "(onbekend)" +msgstr "" #: gtk/gtkfontsel.c:1949 msgid "roman" -msgstr "romaans" +msgstr "" #: gtk/gtkfontsel.c:1961 msgid "proportional" -msgstr "proportioneel" +msgstr "" #: gtk/gtkfontsel.c:1962 msgid "monospaced" @@ -332,56 +330,56 @@ msgstr "" #: gtk/gtkfontsel.c:1963 msgid "char cell" -msgstr "karakter cel" +msgstr "" #: gtk/gtkfontsel.c:2163 msgid "Font: (Filter Applied)" -msgstr "Lettertype: (Filter toegepast)" +msgstr "" #: gtk/gtkfontsel.c:2639 msgid "MAX_FONTS exceeded. Some fonts may be missing." -msgstr "MAX_FONTS overtreden. Sommige fonts kunnen ontbreken." +msgstr "" #: gtk/gtkfontsel.c:3474 msgid "Apply" -msgstr "Toepassen" +msgstr "" #: gtk/gtkfontsel.c:3496 msgid "Font Selection" -msgstr "Lettertype Selectie" +msgstr "" #: gtk/gtkgamma.c:396 msgid "Gamma" -msgstr "Gamma" +msgstr "" #: gtk/gtkgamma.c:403 msgid "Gamma value" -msgstr "Gamma waarde" +msgstr "" #. shell and main vbox #: gtk/gtkinputdialog.c:200 msgid "Input" -msgstr "Invoer" +msgstr "" #: gtk/gtkinputdialog.c:208 msgid "No input devices" -msgstr "Geen invoer apparaten" +msgstr "" #: gtk/gtkinputdialog.c:237 msgid "Device:" -msgstr "Apparaat:" +msgstr "" #: gtk/gtkinputdialog.c:253 msgid "Disabled" -msgstr "Uitgeschakeld" +msgstr "" #: gtk/gtkinputdialog.c:261 msgid "Screen" -msgstr "Scherm" +msgstr "" #: gtk/gtkinputdialog.c:269 msgid "Window" -msgstr "Venster" +msgstr "" #: gtk/gtkinputdialog.c:277 msgid "Mode: " @@ -390,72 +388,72 @@ msgstr "" #. The axis listbox #: gtk/gtkinputdialog.c:307 msgid "Axes" -msgstr "Assen" +msgstr "" #. Keys listbox #: gtk/gtkinputdialog.c:323 msgid "Keys" -msgstr "Sleutels" +msgstr "" #. We create the save button in any case, so that clients can #. connect to it, without paying attention to whether it exits #: gtk/gtkinputdialog.c:345 msgid "Save" -msgstr "Opslaan" +msgstr "" #: gtk/gtkinputdialog.c:500 msgid "X" -msgstr "X" +msgstr "" #: gtk/gtkinputdialog.c:501 msgid "Y" -msgstr "Y" +msgstr "" #: gtk/gtkinputdialog.c:502 msgid "Pressure" -msgstr "Druk" +msgstr "" #: gtk/gtkinputdialog.c:503 msgid "X Tilt" -msgstr "X Helling" +msgstr "" #: gtk/gtkinputdialog.c:504 msgid "Y Tilt" -msgstr "Y Helling" +msgstr "" #: gtk/gtkinputdialog.c:544 msgid "none" -msgstr "niets" +msgstr "" #: gtk/gtkinputdialog.c:578 gtk/gtkinputdialog.c:614 msgid "(disabled)" -msgstr "(uitgeschakeld)" +msgstr "" #. and clear button #: gtk/gtkinputdialog.c:692 msgid "clear" -msgstr "wissen" +msgstr "" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" -msgstr "Pagina %u" +msgstr "" #: gtk/gtkrc.c:1531 #, 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" +msgstr "" #: gtk/gtkrc.c:1534 #, c-format msgid "Unable to locate image file in pixmap_path: \"%s\"" -msgstr "Kan plaatjes bestand in pixmap_path: \"s\" niet vinden" +msgstr "" #: gtk/gtkthemes.c:79 #, c-format msgid "Unable to locate loadable module in module_path: \"%s\"," -msgstr "Kan module in module_path: \"%s\" niet vinden," +msgstr "" #: gtk/gtktipsquery.c:180 msgid "--- No Tip ---" -msgstr "--- Geen Tip ---" +msgstr "" diff --git a/po/no.po b/po/no.po index 9d2e0973e4..bae8300e78 100644 --- a/po/no.po +++ b/po/no.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.16\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1998-03-27 00:09+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -48,8 +48,8 @@ msgid "OK" msgstr "OK" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Avbryt" @@ -68,7 +68,7 @@ msgstr "Kataloger" msgid "Files" msgstr "Filer" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Uleselig katalog: %s" @@ -77,11 +77,11 @@ msgstr "Uleselig katalog: %s" msgid "Create Dir" msgstr "Lag katalog" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Slett fil" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Gi filen nytt navn" @@ -95,34 +95,34 @@ msgid "Error" msgstr "Feil" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Lukk" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Lag katalog" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Katalognavn:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Lag" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Slett" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Gi nytt navn" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "Valg:" @@ -433,7 +433,7 @@ msgstr "(sl msgid "clear" msgstr "tøm" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Side %u" diff --git a/po/pl.po b/po/pl.po index 2c49c6e555..a31c0f3fee 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.2.1\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1998-12-18 02:21+0100\n" "Last-Translator: Tomasz K³oczko \n" "Language-Team: Polish \n" @@ -51,8 +51,8 @@ msgid "OK" msgstr "OK" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Anuluj" @@ -71,7 +71,7 @@ msgstr "Katalogi" msgid "Files" msgstr "Pliki" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Nie mo¿na odczytaæ katalogu: %s" @@ -80,11 +80,11 @@ msgstr "Nie mo msgid "Create Dir" msgstr "Utwórz katalog" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Skasuj plik" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Zmieñ nazwê" @@ -98,34 +98,34 @@ msgid "Error" msgstr "B³±d" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Zamknij" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Utwórz katalog" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Nazwa katalogu:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Utwórz" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Skasuj" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Zmieñ nazwê" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "Zaznaczenie: " @@ -438,7 +438,7 @@ msgstr "(wy msgid "clear" msgstr "" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Strona %u" diff --git a/po/pt.po b/po/pt.po index a9ae41a275..513bd888fe 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: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1999-02-17 01:20+00:00\n" "Last-Translator: Nuno Ferreira \n" "Language-Team: Portuguese \n" @@ -48,8 +48,8 @@ msgid "OK" msgstr "OK" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Cancelar" @@ -68,7 +68,7 @@ msgstr "Directorias" msgid "Files" msgstr "Ficheiros" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Directoria ilegível: %s" @@ -77,11 +77,11 @@ msgstr "Directoria ileg msgid "Create Dir" msgstr "Criar Directoria" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Apagar Ficheiro" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Renomear Ficheiro" @@ -95,34 +95,34 @@ msgid "Error" msgstr "Erro" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Fechar" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Criar Directoria" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Nome da directoria:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Criar" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Apagar" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Renomear" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "Selecção: " @@ -433,7 +433,7 @@ msgstr "(inactivo)" msgid "clear" msgstr "limpar" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Página %u" diff --git a/po/ru.po b/po/ru.po index 1306891ba2..0c77c19ac3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1999-01-21 21:51 EST\n" "Last-Translator: Sergey Panov \n" "Language-Team: Russian \n" @@ -48,8 +48,8 @@ msgid "OK" msgstr "" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "ïÔÍÅÎÉÔØ" @@ -68,7 +68,7 @@ msgstr " msgid "Files" msgstr "æÁÊÌÙ" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "ëÁÔÁÌÏÇ ÎÅ ÞÉÔÁÅÍ: %s" @@ -77,11 +77,11 @@ msgstr " msgid "Create Dir" msgstr "óÏÚÄÁÔØ ËÁÔÁÌÏÇ" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "õÄÁÌÉÔØ ÆÁÊÌ" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ ÆÁÊÌ" @@ -95,34 +95,34 @@ msgid "Error" msgstr "ïÛÉÂËÁ" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "úÁËÒÙÔØ" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "óÏÚÄÁÔØ ËÁÔÁÌÏÇ" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "éÍÑ ËÁÔÁÌÏÇÁ:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "óÏÚÄÁÔØ" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "õÄÁÌÉÔØ" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "÷ÙÂÏÒ: " @@ -433,7 +433,7 @@ msgstr "( msgid "clear" msgstr "ÏÞÉÓÔÉÔØ" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "óÔÒÁÎÉÃÁ %u" diff --git a/po/sk.po b/po/sk.po index 031e10ec6a..086e8fd176 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+-1.2.2\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1999-04-19 16:30+0100\n" "Last-Translator: Stefan Ondrejicka \n" "Language-Team: Slovak \n" @@ -48,8 +48,8 @@ msgid "OK" msgstr "OK" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Zru¹i»" @@ -68,7 +68,7 @@ msgstr "Adres msgid "Files" msgstr "Súbory" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Neèitateµný adresár: %s" @@ -77,11 +77,11 @@ msgstr "Ne msgid "Create Dir" msgstr "Vytvori» adresár" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Zmaza» súbor" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Premenova» súbor" @@ -95,34 +95,34 @@ msgid "Error" msgstr "Chyba" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Zatvori»" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Vytvori» adresár" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Meno adresára:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Vytvori»" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Zmaza»" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Premenova»" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "Výber: " @@ -433,7 +433,7 @@ msgstr "(blokovan msgid "clear" msgstr "zmaza»" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Stránka %u" diff --git a/po/sl.po b/po/sl.po index 1d213839f6..33e8f31e59 100644 --- a/po/sl.po +++ b/po/sl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GTK+ 1.2.0\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1999-03-06 10:00+0100\n" "Last-Translator: Miha Tom¹iè \n" "Language-Team: slovenian \n" @@ -49,8 +49,8 @@ msgid "OK" msgstr "Potrdi" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Preklièi" @@ -69,7 +69,7 @@ msgstr "Imeniki" msgid "Files" msgstr "Datoteke" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Neberljiv imenik: %s" @@ -78,11 +78,11 @@ msgstr "Neberljiv imenik: %s" msgid "Create Dir" msgstr "Kreiraj imenik" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Zbri¹i datoteko" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Preimenuj datoteko" @@ -96,34 +96,34 @@ msgid "Error" msgstr "Napaka" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Zapri" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Kreiraj imenik" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Ime imenika:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Kreiraj" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Zbri¹i" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Preimenuj" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "Izbor: " @@ -435,7 +435,7 @@ msgstr "(onemogo msgid "clear" msgstr "izprazni" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "%u stran" diff --git a/po/sv.po b/po/sv.po index bb168dd488..54811d6759 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.2.3\n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1999-01-12 22:50+0100\n" "Last-Translator: Tomas Ögren \n" "Language-Team: Swedish \n" @@ -48,8 +48,8 @@ msgid "OK" msgstr "OK" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "Avbryt" @@ -68,7 +68,7 @@ msgstr "Kataloger" msgid "Files" msgstr "Filer" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "Katalog oläsbar: %s" @@ -77,11 +77,11 @@ msgstr "Katalog ol msgid "Create Dir" msgstr "Skapa katalog" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "Ta bort fil" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "Döp om fil" @@ -95,34 +95,34 @@ msgid "Error" msgstr "Fel" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Stäng" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "Skapa katalog" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "Katalogens namn:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "Skapa" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "Ta bort" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "Döp om" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "Markering: " @@ -433,7 +433,7 @@ msgstr "(avst msgid "clear" msgstr "rensa" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "Sida %u" diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po index ad53e8ad0c..40a3114785 100644 --- a/po/zh_TW.Big5.po +++ b/po/zh_TW.Big5.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gtk+ 1.1.7 \n" -"POT-Creation-Date: 1999-07-29 16:44-0400\n" +"POT-Creation-Date: 1999-08-23 14:10+0200\n" "PO-Revision-Date: 1999-01-31 19:33+0800\n" "Last-Translator: ¨¯¥ß¤¯ \n" "Language-Team: Chinese \n" @@ -47,8 +47,8 @@ msgid "OK" msgstr "½T©w" #. The Cancel button -#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:851 -#: gtk/gtkfilesel.c:951 gtk/gtkfilesel.c:1066 gtk/gtkfontsel.c:3480 +#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 +#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3480 #: gtk/gtkgamma.c:424 msgid "Cancel" msgstr "¨ú®ø" @@ -67,7 +67,7 @@ msgstr " msgid "Files" msgstr "ÀÉ®×" -#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1461 +#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 #, c-format msgid "Directory unreadable: %s" msgstr "µLªkŪ¨ú¥Ø¿ý: %s" @@ -76,11 +76,11 @@ msgstr " msgid "Create Dir" msgstr "·s¼W¥Ø¿ý" -#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:920 +#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 msgid "Delete File" msgstr "§R°£ÀÉ®×" -#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1024 +#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 msgid "Rename File" msgstr "­«·s©R¦W" @@ -94,34 +94,34 @@ msgid "Error" msgstr "¿ù»~" #. close button -#: gtk/gtkfilesel.c:740 gtk/gtkinputdialog.c:354 +#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 msgid "Close" msgstr "Ãö³¬" -#: gtk/gtkfilesel.c:815 +#: gtk/gtkfilesel.c:820 msgid "Create Directory" msgstr "·s¼W¥Ø¿ý" -#: gtk/gtkfilesel.c:829 +#: gtk/gtkfilesel.c:834 msgid "Directory name:" msgstr "¥Ø¿ý¦WºÙ:" #. buttons -#: gtk/gtkfilesel.c:842 +#: gtk/gtkfilesel.c:847 msgid "Create" msgstr "·s¼W" #. buttons -#: gtk/gtkfilesel.c:942 +#: gtk/gtkfilesel.c:947 msgid "Delete" msgstr "§R°£" #. buttons -#: gtk/gtkfilesel.c:1057 +#: gtk/gtkfilesel.c:1062 msgid "Rename" msgstr "§ó·s" -#: gtk/gtkfilesel.c:1440 +#: gtk/gtkfilesel.c:1445 msgid "Selection: " msgstr "¦r«¬¿ï¶µ: " @@ -432,7 +432,7 @@ msgstr "( msgid "clear" msgstr "²M°£" -#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4124 +#: gtk/gtknotebook.c:2048 gtk/gtknotebook.c:4120 #, c-format msgid "Page %u" msgstr "²Ä %u ­¶"