summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-12-20 15:23:12 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-12-20 15:23:12 +0000
commit7eafb2373cea96a9fa83036ff8813d85a5d83879 (patch)
tree848a4e11bb2eba70651f2d78b6aa81e71786c042
parent5ab7a70230b650fdfe8a1024468366f6a39f4ef1 (diff)
downloadglib-7eafb2373cea96a9fa83036ff8813d85a5d83879.tar.gz
glib-7eafb2373cea96a9fa83036ff8813d85a5d83879.tar.bz2
glib-7eafb2373cea96a9fa83036ff8813d85a5d83879.zip
=== Released 2.2.0 ===
Fri Dec 20 09:52:15 2002 Owen Taylor <otaylor@redhat.com> * === Released 2.2.0 === * INSTALL.in: Document --enable-trio, --disable-mempools, --enable-debug. Include docs on cross compilation. * NEWS: Update. * configure.in: Version 2.2.0, interface age 0.
-rw-r--r--ChangeLog11
-rw-r--r--ChangeLog.pre-2-1011
-rw-r--r--ChangeLog.pre-2-1211
-rw-r--r--ChangeLog.pre-2-211
-rw-r--r--ChangeLog.pre-2-411
-rw-r--r--ChangeLog.pre-2-611
-rw-r--r--ChangeLog.pre-2-811
-rw-r--r--INSTALL158
-rw-r--r--INSTALL.in154
-rw-r--r--NEWS18
-rw-r--r--README2
-rw-r--r--configure.in6
-rw-r--r--po/az.po11
-rw-r--r--po/be.po13
-rw-r--r--po/bg.po2
-rw-r--r--po/ca.po2
-rw-r--r--po/cs.po11
-rw-r--r--po/da.po2
-rw-r--r--po/de.po13
-rw-r--r--po/el.po11
-rw-r--r--po/es.po44
-rw-r--r--po/eu.po8
-rw-r--r--po/fi.po11
-rw-r--r--po/fr.po11
-rw-r--r--po/gl.po11
-rw-r--r--po/hi.po11
-rw-r--r--po/ja.po11
-rw-r--r--po/ko.po11
-rw-r--r--po/ms.po11
-rw-r--r--po/nl.po11
-rw-r--r--po/nn.po11
-rw-r--r--po/no.po11
-rw-r--r--po/pl.po11
-rw-r--r--po/pt.po11
-rw-r--r--po/pt_BR.po11
-rw-r--r--po/ro.po11
-rw-r--r--po/ru.po168
-rw-r--r--po/sk.po33
-rw-r--r--po/sl.po11
-rw-r--r--po/sq.po11
-rw-r--r--po/sv.po11
-rw-r--r--po/ta.po8
-rw-r--r--po/tr.po8
-rw-r--r--po/uk.po8
-rw-r--r--po/vi.po11
-rw-r--r--po/zh_CN.po11
-rw-r--r--po/zh_TW.po11
47 files changed, 669 insertions, 308 deletions
diff --git a/ChangeLog b/ChangeLog
index 1dc1854d6..ab1a83c7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Fri Dec 20 09:52:15 2002 Owen Taylor <otaylor@redhat.com>
+
+ * === Released 2.2.0 ===
+
+ * INSTALL.in: Document --enable-trio, --disable-mempools,
+ --enable-debug. Include docs on cross compilation.
+
+ * NEWS: Update.
+
+ * configure.in: Version 2.2.0, interface age 0.
+
Fri Dec 20 09:37:27 2002 Owen Taylor <otaylor@redhat.com>
* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1dc1854d6..ab1a83c7d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Fri Dec 20 09:52:15 2002 Owen Taylor <otaylor@redhat.com>
+
+ * === Released 2.2.0 ===
+
+ * INSTALL.in: Document --enable-trio, --disable-mempools,
+ --enable-debug. Include docs on cross compilation.
+
+ * NEWS: Update.
+
+ * configure.in: Version 2.2.0, interface age 0.
+
Fri Dec 20 09:37:27 2002 Owen Taylor <otaylor@redhat.com>
* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1dc1854d6..ab1a83c7d 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,14 @@
+Fri Dec 20 09:52:15 2002 Owen Taylor <otaylor@redhat.com>
+
+ * === Released 2.2.0 ===
+
+ * INSTALL.in: Document --enable-trio, --disable-mempools,
+ --enable-debug. Include docs on cross compilation.
+
+ * NEWS: Update.
+
+ * configure.in: Version 2.2.0, interface age 0.
+
Fri Dec 20 09:37:27 2002 Owen Taylor <otaylor@redhat.com>
* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1dc1854d6..ab1a83c7d 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Fri Dec 20 09:52:15 2002 Owen Taylor <otaylor@redhat.com>
+
+ * === Released 2.2.0 ===
+
+ * INSTALL.in: Document --enable-trio, --disable-mempools,
+ --enable-debug. Include docs on cross compilation.
+
+ * NEWS: Update.
+
+ * configure.in: Version 2.2.0, interface age 0.
+
Fri Dec 20 09:37:27 2002 Owen Taylor <otaylor@redhat.com>
* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1dc1854d6..ab1a83c7d 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Fri Dec 20 09:52:15 2002 Owen Taylor <otaylor@redhat.com>
+
+ * === Released 2.2.0 ===
+
+ * INSTALL.in: Document --enable-trio, --disable-mempools,
+ --enable-debug. Include docs on cross compilation.
+
+ * NEWS: Update.
+
+ * configure.in: Version 2.2.0, interface age 0.
+
Fri Dec 20 09:37:27 2002 Owen Taylor <otaylor@redhat.com>
* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1dc1854d6..ab1a83c7d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Fri Dec 20 09:52:15 2002 Owen Taylor <otaylor@redhat.com>
+
+ * === Released 2.2.0 ===
+
+ * INSTALL.in: Document --enable-trio, --disable-mempools,
+ --enable-debug. Include docs on cross compilation.
+
+ * NEWS: Update.
+
+ * configure.in: Version 2.2.0, interface age 0.
+
Fri Dec 20 09:37:27 2002 Owen Taylor <otaylor@redhat.com>
* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1dc1854d6..ab1a83c7d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Fri Dec 20 09:52:15 2002 Owen Taylor <otaylor@redhat.com>
+
+ * === Released 2.2.0 ===
+
+ * INSTALL.in: Document --enable-trio, --disable-mempools,
+ --enable-debug. Include docs on cross compilation.
+
+ * NEWS: Update.
+
+ * configure.in: Version 2.2.0, interface age 0.
+
Fri Dec 20 09:37:27 2002 Owen Taylor <otaylor@redhat.com>
* gthread/gthread-impl.c (g_thread_init): Call g_main_thread_init()
diff --git a/INSTALL b/INSTALL
index 319f510c4..01c55be80 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
Simple install procedure
========================
- % gzip -cd glib-2.1.5.tar.gz | tar xvf - # unpack the sources
- % cd glib-2.1.5 # change to the toplevel directory
+ % gzip -cd glib-2.2.0.tar.gz | tar xvf - # unpack the sources
+ % cd glib-2.2.0 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build GLIB
@@ -76,21 +76,39 @@ A few of the more important ones:
* --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[ Defaults to the value given to --prefix ]
+* --enable-debug=[yes/no/minimum] determines the amount of debugging
+ code to include. 'yes' will includes some
+ extra checks and debugging features that
+ may be useful for people developing with
+ GLib. 'no' produces a somewhat smaller and
+ faster library at the expense of reduced
+ robustness.
+ [ Defaults to 'minimum' for stable releases ]
+
* --enable-gc-friendly When enabled all memory freed by the application,
but retained by GLib for performance reasons
is set to zero, thus making deployed garbage
collection or memory profiling tools detect
unlinked memory correctly. This will make GLib
slightly slower.
- [ Disabled by default ]
-
-* --disable-threads Do not compile GLib to be multi thread safe. GLib
+ [ --disable-gc-friendly is default ]
+
+* --disable-mem-pools Do not cache freed objects. When specified,
+ GLib will immediately return freed memory
+ to the C library instead of keeping around
+ pools of free objects such as linked list
+ and hash table nodes. Specifying this
+ will make GLib slower in most cases, but it
+ will use less memory.
+ [ --enable-mem-pools is the default ]
+
+* --disable-threads Do not compile GLib to be multi thread safe. GLib
will be slightly faster then. This is however not
recommended, as many programs rely on GLib being
multi thread safe.
- [ Enabled by default ]
+ [ --enable-threads is the default ]
-* --with-threads=[none/posix/dce/solaris/win32] Specify a thread
+* --with-threads=[none/posix/dce/solaris/win32] Specify a thread
implementation to use.
* 'posix' and 'dce' can be used interchangeable
to mean the different versions of posix
@@ -104,6 +122,14 @@ A few of the more important ones:
g_thread_init() by the programmer.
[ Determined by configure by default ]
+* --enable-trio=[yes/no/auto] Specify whether to build using
+ the included copy of the Trio library
+ for string formatting functions like printf().
+ The default is 'auto', which means that
+ Trio will be used if configure detects
+ missing features in your system native
+ printf implementation.
+
Options can be given to the compiler and linker by setting
environment variables before running configure. A few of the more
important ones:
@@ -149,3 +175,121 @@ application with:
pkg-config --cflags glib-2.0
pkg-config --libs glib-2.0
+
+Cross-compiling GLib
+====================
+
+Cross-compilation is the proceess of compiling a program or
+library on a different architecture or operating system then
+it will be run upon. GLib is slightly more difficult to
+cross-compile than many packages because much of GLib is
+about hiding differences between different systems.
+
+These notes cover things specific to cross-compiling GLib;
+for general information about cross-compilation, see the
+autoconf info pages.
+
+GLib tries to detect as much information as possible about
+the target system by compiling and linking programs without
+actually running anything; however, some information GLib
+needs is not available this way. This information needs
+to be provided to the configure script via a "cache file"
+or by setting the cache variables in your environment.
+
+As an example of using a cache file, to cross compile for
+the "MingW32" Win32 runtine environment on a Linux system,
+create a file 'win32.cache' with the following contents:
+
+===
+glib_cv_long_long_format=ll
+glib_cv_stack_grows=no
+===
+
+Then execute the following commands:
+
+===
+PATH=/path/to/mingw32-compiler/bin:$PATH
+chmod a-w win32.cache # prevent configure from changing it
+./configure --cache-file=win32.cache --host=mingw32
+===
+
+The complete list of cache file variables follows. Most
+of these won't need to be set in most cases.
+
+Cache file variables
+====================
+
+glib_cv_long_long_format=[ll/q/I64]
+
+ Format used by printf and scanf for 64 bit integers. "ll" is
+ the C99 standard, and what is used by the 'trio' library
+ that GLib builds if your printf() is insufficiently capable.
+ Doesn't need to be set if you are compiling using trio.
+
+glib_cv_stack_grows=[yes/no]
+
+ Whether the stack grows up or down. Most places will want "no",
+ A few architectures, such as PA-RISC need "yes".
+
+glib_cv_working_bcopy=[yes/no]
+
+ Whether your bcopy can handle overlapping copies. Only needs to be set
+ if you don't have memmove. (Very unlikely)
+
+glib_cv_sane_realloc=[yes/np]
+
+ Whether your realloc() conforms to ANSI C and can handle NULL as
+ the first argument. Defaults to "yes" and probably doesn't need to be set.
+
+glib_cv_have_strlcpy=[yes/no]
+
+ Whether you have strlcpy that matches OpenBSD. Defaults to "no",
+ which is safe, since GLib uses a built-in version in that case.
+
+glib_cv_va_val_copy=[yes/no]
+
+ Whether va_list can be copied as a pointer. If set to "no",
+ then memcopy will be used. Only matters if you don't have
+ va_copy or __va_copy. (So, doesn't matter for GCC.) Defaults
+ to "yes" which is slightly more common than "no".
+
+glib_cv_rtldglobal_broken=[yes/no]
+
+ Whether you have a bug found in OSF/1 v5.0. Defaults to "no".
+
+glib_cv_uscore=[yes/no]
+
+ Whether an underscore needs to be prepended to symbols when
+ looking them up via dlsym. Only needs to be set if your system
+ uses dlopen/dlsym.
+
+ac_cv_func_posix_getpwuid_r=[yes/no]
+
+ Whether you have a getpwuid_r function (in your C library,
+ not your thread library) that conforms to the POSIX spec.
+ (Takes a 'struct passwd **' as the final argument)
+
+ac_cv_func_nonposix_getpwuid_r=[yes/no]
+
+ Whether you have some variant of getpwuid_r that doesn't
+ conform to to the POSIX spec, but GLib might be able to
+ use (or might segfault.) Only needs to be set if
+ ac_cv_func_posix_getpwuid_r is not set. It's safest to set
+ this to "no".
+
+glib_cv_use_pid_surrogate=[yes/no]
+
+ Whether to use a setpriority() on the PID of the thread as
+ a method for setting the priority of threads. This only
+ needs to be set when using POSIX threads.
+
+ac_cv_func_printf_unix98=[yes/no]
+
+ Whether your printf() family supports Unix98 style %N$
+ positional parameters. Defaults to "no".
+
+ac_cv_func_vsnprintf_c99=[yes/no]
+
+ Whether you have a vsnprintf() with C99 semantics. (C99 semantics
+ means returns the number of bytes that would have been written
+ had the output buffer had enough space.). Defaults to "no".
diff --git a/INSTALL.in b/INSTALL.in
index cd43e256c..eaa91c10a 100644
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -76,21 +76,39 @@ A few of the more important ones:
* --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[ Defaults to the value given to --prefix ]
+* --enable-debug=[yes/no/minimum] determines the amount of debugging
+ code to include. 'yes' will includes some
+ extra checks and debugging features that
+ may be useful for people developing with
+ GLib. 'no' produces a somewhat smaller and
+ faster library at the expense of reduced
+ robustness.
+ [ Defaults to 'minimum' for stable releases ]
+
* --enable-gc-friendly When enabled all memory freed by the application,
but retained by GLib for performance reasons
is set to zero, thus making deployed garbage
collection or memory profiling tools detect
unlinked memory correctly. This will make GLib
slightly slower.
- [ Disabled by default ]
-
-* --disable-threads Do not compile GLib to be multi thread safe. GLib
+ [ --disable-gc-friendly is default ]
+
+* --disable-mem-pools Do not cache freed objects. When specified,
+ GLib will immediately return freed memory
+ to the C library instead of keeping around
+ pools of free objects such as linked list
+ and hash table nodes. Specifying this
+ will make GLib slower in most cases, but it
+ will use less memory.
+ [ --enable-mem-pools is the default ]
+
+* --disable-threads Do not compile GLib to be multi thread safe. GLib
will be slightly faster then. This is however not
recommended, as many programs rely on GLib being
multi thread safe.
- [ Enabled by default ]
+ [ --enable-threads is the default ]
-* --with-threads=[none/posix/dce/solaris/win32] Specify a thread
+* --with-threads=[none/posix/dce/solaris/win32] Specify a thread
implementation to use.
* 'posix' and 'dce' can be used interchangeable
to mean the different versions of posix
@@ -104,6 +122,14 @@ A few of the more important ones:
g_thread_init() by the programmer.
[ Determined by configure by default ]
+* --enable-trio=[yes/no/auto] Specify whether to build using
+ the included copy of the Trio library
+ for string formatting functions like printf().
+ The default is 'auto', which means that
+ Trio will be used if configure detects
+ missing features in your system native
+ printf implementation.
+
Options can be given to the compiler and linker by setting
environment variables before running configure. A few of the more
important ones:
@@ -149,3 +175,121 @@ application with:
pkg-config --cflags glib-2.0
pkg-config --libs glib-2.0
+
+Cross-compiling GLib
+====================
+
+Cross-compilation is the proceess of compiling a program or
+library on a different architecture or operating system then
+it will be run upon. GLib is slightly more difficult to
+cross-compile than many packages because much of GLib is
+about hiding differences between different systems.
+
+These notes cover things specific to cross-compiling GLib;
+for general information about cross-compilation, see the
+autoconf info pages.
+
+GLib tries to detect as much information as possible about
+the target system by compiling and linking programs without
+actually running anything; however, some information GLib
+needs is not available this way. This information needs
+to be provided to the configure script via a "cache file"
+or by setting the cache variables in your environment.
+
+As an example of using a cache file, to cross compile for
+the "MingW32" Win32 runtine environment on a Linux system,
+create a file 'win32.cache' with the following contents:
+
+===
+glib_cv_long_long_format=ll
+glib_cv_stack_grows=no
+===
+
+Then execute the following commands:
+
+===
+PATH=/path/to/mingw32-compiler/bin:$PATH
+chmod a-w win32.cache # prevent configure from changing it
+./configure --cache-file=win32.cache --host=mingw32
+===
+
+The complete list of cache file variables follows. Most
+of these won't need to be set in most cases.
+
+Cache file variables
+====================
+
+glib_cv_long_long_format=[ll/q/I64]
+
+ Format used by printf and scanf for 64 bit integers. "ll" is
+ the C99 standard, and what is used by the 'trio' library
+ that GLib builds if your printf() is insufficiently capable.
+ Doesn't need to be set if you are compiling using trio.
+
+glib_cv_stack_grows=[yes/no]
+
+ Whether the stack grows up or down. Most places will want "no",
+ A few architectures, such as PA-RISC need "yes".
+
+glib_cv_working_bcopy=[yes/no]
+
+ Whether your bcopy can handle overlapping copies. Only needs to be set
+ if you don't have memmove. (Very unlikely)
+
+glib_cv_sane_realloc=[yes/np]
+
+ Whether your realloc() conforms to ANSI C and can handle NULL as
+ the first argument. Defaults to "yes" and probably doesn't need to be set.
+
+glib_cv_have_strlcpy=[yes/no]
+
+ Whether you have strlcpy that matches OpenBSD. Defaults to "no",
+ which is safe, since GLib uses a built-in version in that case.
+
+glib_cv_va_val_copy=[yes/no]
+
+ Whether va_list can be copied as a pointer. If set to "no",
+ then memcopy will be used. Only matters if you don't have
+ va_copy or __va_copy. (So, doesn't matter for GCC.) Defaults
+ to "yes" which is slightly more common than "no".
+
+glib_cv_rtldglobal_broken=[yes/no]
+
+ Whether you have a bug found in OSF/1 v5.0. Defaults to "no".
+
+glib_cv_uscore=[yes/no]
+
+ Whether an underscore needs to be prepended to symbols when
+ looking them up via dlsym. Only needs to be set if your system
+ uses dlopen/dlsym.
+
+ac_cv_func_posix_getpwuid_r=[yes/no]
+
+ Whether you have a getpwuid_r function (in your C library,
+ not your thread library) that conforms to the POSIX spec.
+ (Takes a 'struct passwd **' as the final argument)
+
+ac_cv_func_nonposix_getpwuid_r=[yes/no]
+
+ Whether you have some variant of getpwuid_r that doesn't
+ conform to to the POSIX spec, but GLib might be able to
+ use (or might segfault.) Only needs to be set if
+ ac_cv_func_posix_getpwuid_r is not set. It's safest to set
+ this to "no".
+
+glib_cv_use_pid_surrogate=[yes/no]
+
+ Whether to use a setpriority() on the PID of the thread as
+ a method for setting the priority of threads. This only
+ needs to be set when using POSIX threads.
+
+ac_cv_func_printf_unix98=[yes/no]
+
+ Whether your printf() family supports Unix98 style %N$
+ positional parameters. Defaults to "no".
+
+ac_cv_func_vsnprintf_c99=[yes/no]
+
+ Whether you have a vsnprintf() with C99 semantics. (C99 semantics
+ means returns the number of bytes that would have been written
+ had the output buffer had enough space.). Defaults to "no".
diff --git a/NEWS b/NEWS
index 0b11596bf..720144b33 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Overview of Changes from GLib 2.1.5 to GLib-2.2.0
+=================================================
+
+* Fix a problem with g_thread_init() on 64-bit problems
+ [Alceste Scalas, Sebastian Wilhelmi]
+* Add assembly implementations of byteswap macros
+ for ia64 and x86_64. [Manish Singh]
+* IOChannel fixes for Win32 [Tor Lillqvist, Thorsten Maerz]
+* Updated translations (bg,ca,es,da,fi,lv,ru,sk)
+
Overview of Changes from GLib 2.1.4 to GLib-2.1.5
=================================================
@@ -8,7 +18,7 @@ Overview of Changes from GLib 2.1.4 to GLib-2.1.5
if necessary [Manish Singh]
* Further Trio build fixes [Matthias Clasen, Owen]
* Hack around gcc, libtool issues with -pthread [Owen]
-* Docs improvements [Matthiass]
+* Docs improvements [Matthias]
* Bug and portability fixes
* Updated and new translations (bg,de,fi,fr,sq,fr)
@@ -143,8 +153,8 @@ Overview of Changes in GLib 2.0.1
* Fixes for g_log() and threading.
[Sebastian Wilhelmi, Miroslaw Dobrzanski-Neumann, Tim Janik]
* Make g_print(), g_printerr(), g_warning(), etc, convert from
- UTF-8 to the encoding of the locale [Sebastain Wilhelmi, Tim]
-* Fixes for GIOChannel on windows. [Tor Lillquist]
+ UTF-8 to the encoding of the locale [Sebastian Wilhelmi, Tim]
+* Fixes for GIOChannel on windows. [Tor Lillqvist]
* Fix gsize/gint mismatches in giochannel.c [Miroslaw Dobrzanski-Neumann]
* Fix file descriptor leak in g_file_get_contents() [Matthias]
* Workaround iconv() problems on older Solaris [Lauri Alanko]
@@ -184,7 +194,7 @@ Overview of Changes in GLib 1.3.15:
* Add G_DEBUG environment variable, G_DEBUG=fatal_warnings [Matthias Clasen]
* Fixes for AIX compilation [Miroslaw Dobrzanski-Neumann]
* Add padding to various structures [Owen Taylor, Tim]
-* Win32 fixes [Tor Lillquist]
+* Win32 fixes [Tor Lillqvist]
Other contributors: James Henstridge, Ryan Lovett, Morten Welinder,
Daniel Elstner
diff --git a/README b/README
index 0e5f28947..814d733b6 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
General Information
===================
-This is GLib version 2.1.5. GLib is the low-level core
+This is GLib version 2.2.0. GLib is the low-level core
library that forms the basis for projects such as GTK+ and GNOME. It
provides data structure handling for C, portability wrappers, and
interfaces for such runtime functionality as an event loop, threads,
diff --git a/configure.in b/configure.in
index eb711d7b4..7aee11b10 100644
--- a/configure.in
+++ b/configure.in
@@ -32,9 +32,9 @@ GLIB_AC_DIVERT_BEFORE_HELP([
# set GLIB_BINARY_AGE _and_ GLIB_INTERFACE_AGE to 0.
#
GLIB_MAJOR_VERSION=2
-GLIB_MINOR_VERSION=1
-GLIB_MICRO_VERSION=5
-GLIB_INTERFACE_AGE=2
+GLIB_MINOR_VERSION=2
+GLIB_MICRO_VERSION=0
+GLIB_INTERFACE_AGE=0
GLIB_BINARY_AGE=`expr 100 '*' $GLIB_MINOR_VERSION + $GLIB_MICRO_VERSION`
GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
])dnl
diff --git a/po/az.po b/po/az.po
index 0c3f61df7..a60a2b0e4 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 1.3.9\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2001-12-24 20:11GMT+0200\n"
"Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
"Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -161,14 +161,10 @@ msgstr "Can't do a raw read in g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Səhv ismarıc böyüklüyü"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Soket xətası"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Kanal bayraqları dəstəklənmir"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -510,3 +506,6 @@ msgstr "dönüşdürmə girişi içində hökmsüz qatar"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "UTF-16 üçün hərf sərhədinin xaricindədir"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Kanal bayraqları dəstəklənmir"
diff --git a/po/be.po b/po/be.po
index 8fd220a90..9d11b85da 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-11-20 17:52+0200\n"
"Last-Translator: Ales Nyakhaychyk <i18n@infonet.by>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
@@ -200,15 +200,10 @@ msgid "Incorrect message size"
msgstr "Памылковы памер паведамленьня"
# glib/giowin32.c:1037 glib/giowin32.c:1090
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Памылка сокету"
-# glib/giowin32.c:1290
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Набор сьцягоў каналу ня падтрымліваецца"
-
# glib/gmarkup.c:219
#: glib/gmarkup.c:222
#, c-format
@@ -606,3 +601,7 @@ msgstr "Нядапушчальная пасьлядоўнасьць для пе
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Сымбаль па-за дыяпазонам UTF-16"
+
+# glib/giowin32.c:1290
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Набор сьцягоў каналу ня падтрымліваецца"
diff --git a/po/bg.po b/po/bg.po
index 9df67de66..67b1e22d0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib\n"
-"POT-Creation-Date: 2002-12-19 14:10+0200\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-19 00:55+0200\n"
"Last-Translator: Alexander Shopov <al_shopov@yahoo.com>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
diff --git a/po/ca.po b/po/ca.po
index 9b79c1d06..112647e47 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 2.1.5.2\n"
-"POT-Creation-Date: 2002-12-19 15:55+0100\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-19 15:57+0100\n"
"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
"Language-Team: Catalan <tradgnome@softcatala.org>\n"
diff --git a/po/cs.po b/po/cs.po
index f3920eae2..100038042 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 2.0.1\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-03 17:03+0100\n"
"Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -160,14 +160,10 @@ msgstr "Nepodařilo se přímé čtení v g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Chybná velikost zprávy"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Chyba socketu"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Nepodporované nastavení příznaku kanálu"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -505,3 +501,6 @@ msgstr "Neplatná posloupnost na vstupu převodu"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Znak je mimo rozsah UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Nepodporované nastavení příznaku kanálu"
diff --git a/po/da.po b/po/da.po
index 4ed06527f..bd44b6b69 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 1.3.3\n"
-"POT-Creation-Date: 2002-12-18 18:02+0100\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-11-25 22:49+0100\n"
"Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 175281c56..163db230f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 2.2.x\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-11-25 10:59+0100\n"
"Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
"Language-Team: German <gnome-de@gnome.org>\n"
@@ -164,15 +164,10 @@ msgstr "Raw-read in g_io_channel_read_to_end nicht möglich"
msgid "Incorrect message size"
msgstr "Falsche Nachrichtengröße"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Socket-Fehler"
-# CHECK
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Kanal »set-flags« werden nicht unterstützt"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -528,3 +523,7 @@ msgstr "Ungültige Folge in Umwandlungseingabe"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Zeichen außerhalb des Bereiches für UTF-16"
+
+# CHECK
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Kanal »set-flags« werden nicht unterstützt"
diff --git a/po/el.po b/po/el.po
index b101199f3..6be6b6d08 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 1.0\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-03 20:09+0200\n"
"Last-Translator: Kostas Papadimas <pkst@gmx.net>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -176,14 +176,10 @@ msgstr "Δεν είναι δυνατή η raw ανάγνωση σε g_io_channe
msgid "Incorrect message size"
msgstr "Εσφαλμένο μέγεθος μηνύματος"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Σφάλμα υποδοχέα (socket)"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Channel set flags δεν υποστηρίζεται"
-
# gconf/gconfd.c:1676
#: glib/gmarkup.c:222
#, c-format
@@ -545,3 +541,6 @@ msgstr "Μή έγκυρη σειρά στην είσοδο μεταροπής"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Ο χαρακτήρας είναι έξω από την εμβέλεια για UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Channel set flags δεν υποστηρίζεται"
diff --git a/po/es.po b/po/es.po
index 2d3eba154..19c59efba 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 1.3\n"
-"POT-Creation-Date: 2002-12-17 20:58-0300\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-03-06 01:31-0300\n"
"Last-Translator: German Poo Caaman~o <gpoo@ubiobio.cl>\n"
"Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -111,7 +111,9 @@ msgstr "Ha ocurrido un error al abrir el archivo '%s':·%s"
#: glib/gfileutils.c:532
#, c-format
msgid "Failed to get attributes of file '%s': fstat() failed: %s"
-msgstr "Ha ocurrido un error al obtener los atributos del archivo %s':·fstat()·falló:·%s"
+msgstr ""
+"Ha ocurrido un error al obtener los atributos del archivo %s':·fstat()·falló:"
+"·%s"
#: glib/gfileutils.c:558
#, c-format
@@ -136,7 +138,8 @@ msgstr "Ha ocurrido un error al crear el archivo '%s':·%s"
#: glib/giochannel.c:1123
#, c-format
msgid "Conversion from character set `%s' to `%s' is not supported"
-msgstr "La conversión desde el conjunto de caracteres `%s'·a·`%s'·no es soportada"
+msgstr ""
+"La conversión desde el conjunto de caracteres `%s'·a·`%s'·no es soportada"
#: glib/giochannel.c:1127
#, c-format
@@ -178,7 +181,8 @@ msgid "Error on line %d: %s"
msgstr "Error·en la línea·%d:·%s"
#: glib/gmarkup.c:385
-msgid "Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
+msgid ""
+"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
msgstr ""
"La entidad '&;' está vacía; las entidades válidas son:·&amp;·&quot;·&lt;·&gt;"
"·&apos;"
@@ -210,8 +214,8 @@ msgid ""
"character without intending to start an entity - escape ampersand as &amp;"
msgstr ""
"La entidad no termina con un punto y coma; probablemente utilizó el caracter "
-"\"&\" sin la intención de indicar una entidad - nombre el signo \"&\" "
-"como &amp;"
+"\"&\" sin la intención de indicar una entidad - nombre el signo \"&\" como "
+"&amp;"
#: glib/gmarkup.c:531
#, c-format
@@ -219,8 +223,9 @@ msgid ""
"Failed to parse '%s', which should have been a digit inside a character "
"reference (&#234; for example) - perhaps the digit is too large"
msgstr ""
-"Ha ocurrido un error al analizar '%s',·el cual debería tener un dígito dentro de "
-"un carácter de referencia·( por ejemplo &#234;·)·-·tal vez el dígito es demasiado grande"
+"Ha ocurrido un error al analizar '%s',·el cual debería tener un dígito "
+"dentro de un carácter de referencia·( por ejemplo &#234;·)·-·tal vez el "
+"dígito es demasiado grande"
#: glib/gmarkup.c:556
#, c-format
@@ -279,7 +284,8 @@ msgstr ""
#: glib/gmarkup.c:1144
#, c-format
-msgid "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
+msgid ""
+"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
msgstr ""
"Caracter impropio '%s',·se esperaba el caracter '='·después del nombre de "
"atributo·'%s'·del elemento·'%s'"
@@ -412,7 +418,8 @@ msgstr ""
#: glib/gshell.c:530
#, c-format
msgid "Text ended just after a '\\' character. (The text was '%s')"
-msgstr "El texto termina justo después de un carácter '\\'. (El texto era '%s')"
+msgstr ""
+"El texto termina justo después de un carácter '\\'. (El texto era '%s')"
#: glib/gshell.c:537
#, c-format
@@ -460,8 +467,8 @@ msgstr "Ha ocurrido un error al ejecutar el proceso hijo (%s)"
#, c-format
msgid "Failed to create pipe for communicating with child process (%s)"
msgstr ""
-"Ha ocurrido un error enla creación de un pipe para la comunicación con "
-"el proceso hijo (%s)"
+"Ha ocurrido un error enla creación de un pipe para la comunicación con el "
+"proceso hijo (%s)"
#: glib/gspawn.c:167
#, c-format
@@ -471,7 +478,9 @@ msgstr "Ha ocurrido un error en la lectura de datos desde el proceso hijo (%s)"
#: glib/gspawn.c:299
#, c-format
msgid "Unexpected error in select() reading data from a child process (%s)"
-msgstr "Ha ocurrido un error inesperado en select()·leyendo datos desde el proceso hijo (%s)"
+msgstr ""
+"Ha ocurrido un error inesperado en select()·leyendo datos desde el proceso "
+"hijo (%s)"
#: glib/gspawn.c:382
#, c-format
@@ -491,7 +500,9 @@ msgstr "Ha ocurrido un error al ejecutar el proceso hijo \"%s\" (%s)"
#: glib/gspawn.c:1186
#, c-format
msgid "Failed to redirect output or input of child process (%s)"
-msgstr "Ha ocurrido un error al redirigir la salida o la entrada del proceso hijo (%s)"
+msgstr ""
+"Ha ocurrido un error al redirigir la salida o la entrada del proceso hijo (%"
+"s)"
#: glib/gspawn.c:1195
#, c-format
@@ -506,7 +517,9 @@ msgstr "Ha ocurrido un error desconocido al ejecutar el proceso hijo \"%s\""
#: glib/gspawn.c:1225
#, c-format
msgid "Failed to read enough data from child pid pipe (%s)"
-msgstr "Ha ocurrido un error al intentar leer suficientes datos desde el pipe hijo (%s)"
+msgstr ""
+"Ha ocurrido un error al intentar leer suficientes datos desde el pipe hijo (%"
+"s)"
#: glib/gutf8.c:982
msgid "Character out of range for UTF-8"
@@ -520,4 +533,3 @@ msgstr "La secuencia en la conversión de entrada no es válida"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "El caracter se encuentra fuera de los márgenes de UTF 16"
-
diff --git a/po/eu.po b/po/eu.po
index f6d584854..0f725c940 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 1.3.9\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2001-07-06 14:23+0200\n"
"Last-Translator: Joseba Bidaurrazaga van Dierdonck <jbv@euskalnet.net>\n"
"Language-Team: euskare <linux-eu@chanae.alphanet.ch>\n"
@@ -160,14 +160,10 @@ msgstr ""
msgid "Incorrect message size"
msgstr ""
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr ""
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr ""
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
diff --git a/po/fi.po b/po/fi.po
index 46c81bfb4..62f8b35bf 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib VERSION\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-12 00:20+0200\n"
"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
"Language-Team: Gnome Finnish Translation Team <gnome-fi-laatu@lists."
@@ -163,14 +163,10 @@ msgstr "Funktiossa g_io_channel_read_to_end ei voi suorittaa raakalukemista"
msgid "Incorrect message size"
msgstr "Virheellinen viestin koko"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Pistokevirhe"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Kanavalipun asetusta ei ole tuettu"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -518,3 +514,6 @@ msgstr "Virheellinen sarja muunnettavassa syötteessä"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Merkki on sallitun UTF-16-välin ulkopuolella"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Kanavalipun asetusta ei ole tuettu"
diff --git a/po/fr.po b/po/fr.po
index 915350fe7..37dfc004b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 2.1.4\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-15 16:53+0100\n"
"Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -162,14 +162,10 @@ msgstr "Ne peut faire une lecture brut dans g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Taille de message incorect"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Erreur de socket"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "La canal défini des drapeaux non supportés"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -529,3 +525,6 @@ msgstr "Séquence invalide dans la conversion de l'entrée"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Caractère hors des limites UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "La canal défini des drapeaux non supportés"
diff --git a/po/gl.po b/po/gl.po
index 5ef4e99d8..a1e6f79f1 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2001-12-19 21:39+0100\n"
"Last-Translator: Manuel A. Fernández Montecelo <manuel@sindominio.net>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
@@ -161,14 +161,10 @@ msgstr "Non se pode facer unha lectura crúa (raw) en g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Tamaño de mensaxe incorrecto"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Erro de socket"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Non está soportado o establecemento de sinaladores na canle"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -521,3 +517,6 @@ msgstr "Secuencia non válida na entrada da conversión"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Caracter fóra de rango para UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Non está soportado o establecemento de sinaladores na canle"
diff --git a/po/hi.po b/po/hi.po
index f10c4816c..ff28f13b0 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -161,14 +161,10 @@ msgstr "145 का"
msgid "Incorrect message size"
msgstr "संदेश का आकार गलत है"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "साकेत त्रुटि"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "चैनल के फ्लैग का समायोजन संभव नहीं"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -479,3 +475,6 @@ msgstr ""
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr ""
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "चैनल के फ्लैग का समायोजन संभव नहीं"
diff --git a/po/ja.po b/po/ja.po
index 013189d3e..16832c15c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 2.1.3\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-05 01:51+0900\n"
"Last-Translator: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>\n"
"Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -159,14 +159,10 @@ msgstr "g_io_channel_read_to_end では raw モードで読めません"
msgid "Incorrect message size"
msgstr "メッセージの大きさが変です"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Socket のエラー"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "フラグの設定がサポートされていません"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -508,3 +504,6 @@ msgstr "変換への入力でおかしなシーケンス"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "UTF-16 の範囲外の文字"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "フラグの設定がサポートされていません"
diff --git a/po/ko.po b/po/ko.po
index b3642c17a..3c30a81a4 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 2.1.4\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-12 11:42+0900\n"
"Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
"Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -160,14 +160,10 @@ msgstr "g_io_channel_read_to_endi로 raw 읽기를 할수 없습니다"
msgid "Incorrect message size"
msgstr "잘못된 메세지 크기"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "소켓 오류"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "채널 프래그 지정을 지원하지 않습니다"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -514,3 +510,6 @@ msgstr "변환 입력에서 잘못된 순서"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "UTF-16 범위 밖의 문자"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "채널 프래그 지정을 지원하지 않습니다"
diff --git a/po/ms.po b/po/ms.po
index a563e556d..4defd55cf 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib HEAD\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-11-04 23:48+0800\n"
"Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
"Language-Team: Projek Gabai <gabai-penyumbang@lists.sourceforge.org>\n"
@@ -159,14 +159,10 @@ msgstr "Tak dapat membuat bacaan rawak pada g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Saiz mesej tidak betul"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Ralat soket"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Flag set saluran disokong"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -503,3 +499,6 @@ msgstr "Turutan tidak sah semasa penukaran input"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Aksara di luar julat UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Flag set saluran disokong"
diff --git a/po/nl.po b/po/nl.po
index ab20e2734..6d8ce4726 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib (HEAD)\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-06-07 03:25+0200\n"
"Last-Translator: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>\n"
"Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -163,14 +163,10 @@ msgstr ""
msgid "Incorrect message size"
msgstr "Ongeldige berichtlengte"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Socketfout"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Kanaalsetvlaggen worden niet ondersteund"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -518,3 +514,6 @@ msgstr "Ongeldige reeks in conversie-invoer"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Karakter buiten bereik van UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Kanaalsetvlaggen worden niet ondersteund"
diff --git a/po/nn.po b/po/nn.po
index 924b2131e..4a1927698 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib/2.0\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-09 21:10+0100\n"
"Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
"Language-Team: nynorsk <nn@li.org>\n"
@@ -159,14 +159,10 @@ msgstr "Kan ikkje lese rått i g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Feil meldingsstorleik"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Sokkelfeil"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Kanalen set flag ustøtta"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -502,3 +498,6 @@ msgstr "Ugyldig sekvens i inndata konvertering"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Teikn ikkje gyldig for UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Kanalen set flag ustøtta"
diff --git a/po/no.po b/po/no.po
index 6f41a1561..de7ea59f7 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 1.3.3\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-11-22 21:14+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -159,14 +159,10 @@ msgstr "Kan ikke utføre rå avlesing i g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Ukorrekt meldingsstørrelse"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Feil i socket"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Ikke-støttede flagg satt i kanal"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -505,3 +501,6 @@ msgstr "Ugyldig sekvens i inndata for konvertering"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Tegn utenfor gyldig område for UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Ikke-støttede flagg satt i kanal"
diff --git a/po/pl.po b/po/pl.po
index e5671b08e..250d23301 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-02-28 16:49+0100\n"
"Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -167,14 +167,10 @@ msgstr "Nie można wykonać surowego odczytu w g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Niepoprawny rozmiar danych"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Błąd przy operacji na gnieździe"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Ustawianie znaczników kanału nie jest obsługiwane"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -534,3 +530,6 @@ msgstr "Niepoprawna sekwencja na wejściu konwersji"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Znak jest poza zakresem dopuszczalnym dla UTF-8"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Ustawianie znaczników kanału nie jest obsługiwane"
diff --git a/po/pt.po b/po/pt.po
index b7eb292d8..d8547271f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.0\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-05-16 01:38+0000\n"
"Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
"Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -159,14 +159,10 @@ msgstr "Incapaz de fazer uma leitura em bruto de g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Tamanho de mensagem incorrecto"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Erro de socket"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Canal definiu flags não suportadas"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -516,3 +512,6 @@ msgstr "Sequência inválida na conversão da entrada"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Caracter fora do limite para UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Canal definiu flags não suportadas"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 71904b583..b4bba97b8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.0\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-08-10 15:00-0300\n"
"Last-Translator: Gustavo Noronha Silva <kov@debian.org>\n"
"Language-Team: Gnome-BR <gnome-br@listas.cipsga.org.br>\n"
@@ -161,14 +161,10 @@ msgstr ""
msgid "Incorrect message size"
msgstr "Tamanho de mensagem incorreto"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Erro de socket"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Canal definiu flags não suportadas"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -518,3 +514,6 @@ msgstr "Sequência inválida na conversão da entrada"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Caracter fora do limite para UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Canal definiu flags não suportadas"
diff --git a/po/ro.po b/po/ro.po
index e524cb3f4..2346c995c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 1.3.10\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2001-10-22 09:35-0400\n"
"Last-Translator: Marius Andreiana <mandreiana@yahoo.com>\n"
"Language-Team: Română <ro@li.org>\n"
@@ -160,14 +160,10 @@ msgstr "Nu pot face o citire brută în g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Marime mesaj incorectă"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Eroare socket"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Setare flaguri canal nesuportată"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -514,3 +510,6 @@ msgstr "Secvenţă invalidă în conversia intrării"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Caracterul în afara domeniului UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Setare flaguri canal nesuportată"
diff --git a/po/ru.po b/po/ru.po
index f2ac8524d..f80c39aea 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib\n"
-"POT-Creation-Date: 2002-12-03 10:16+0300\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-11 10:57+0300\n"
"Last-Translator: Dmitry G. Mastrukov <dmitry@taurussoft.org>\n"
"Language-Team: Russian <gnome-cyr@gnome.org>\n"
@@ -28,9 +28,9 @@ msgstr "Не удалось открыть преобразователь из \
# glib/gconvert.c:592 glib/gconvert.c:882 glib/giochannel.c:1282
# glib/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
# glib/gutf8.c:1320
-#: glib/gconvert.c:603 glib/gconvert.c:893 glib/giochannel.c:1294
-#: glib/giochannel.c:1336 glib/giochannel.c:2178 glib/gutf8.c:875
-#: glib/gutf8.c:1320
+#: glib/gconvert.c:603 glib/gconvert.c:893 glib/giochannel.c:1295
+#: glib/giochannel.c:1337 glib/giochannel.c:2179 glib/gutf8.c:907
+#: glib/gutf8.c:1352
msgid "Invalid byte sequence in conversion input"
msgstr ""
"Недопустимая последовательность байтов для преобразования содержится во "
@@ -38,16 +38,16 @@ msgstr ""
# glib/gconvert.c:597 glib/gconvert.c:813 glib/giochannel.c:1289
# glib/giochannel.c:2175
-#: glib/gconvert.c:608 glib/gconvert.c:824 glib/giochannel.c:1301
-#: glib/giochannel.c:2190
+#: glib/gconvert.c:608 glib/gconvert.c:824 glib/giochannel.c:1302
+#: glib/giochannel.c:2191
#, c-format
msgid "Error during conversion: %s"
msgstr "Произошла ошибка при преобразовании: %s"
# glib/gconvert.c:615 glib/gutf8.c:871 glib/gutf8.c:1071 glib/gutf8.c:1212
# glib/gutf8.c:1316
-#: glib/gconvert.c:626 glib/gutf8.c:871 glib/gutf8.c:1071 glib/gutf8.c:1212
-#: glib/gutf8.c:1316
+#: glib/gconvert.c:626 glib/gutf8.c:903 glib/gutf8.c:1103 glib/gutf8.c:1244
+#: glib/gutf8.c:1348
msgid "Partial character sequence at end of input"
msgstr "Неполный символ содержится в конце входной строки"
@@ -62,14 +62,16 @@ msgstr ""
#: glib/gconvert.c:1633
#, c-format
msgid "The URI '%s' is not an absolute URI using the file scheme"
-msgstr "Идентификатор URI \"%s\" не является абсолютным идентификатором при "
+msgstr ""
+"Идентификатор URI \"%s\" не является абсолютным идентификатором при "
"использовании файловой схемы"
# glib/gconvert.c:1603
#: glib/gconvert.c:1643
#, c-format
msgid "The local file URI '%s' may not include a '#'"
-msgstr "Идентификатор URI \"%s\" локального файла не может включать символ \"#\""
+msgstr ""
+"Идентификатор URI \"%s\" локального файла не может включать символ \"#\""
# glib/gconvert.c:1620
#: glib/gconvert.c:1660
@@ -107,92 +109,92 @@ msgid "Error opening directory '%s': %s"
msgstr "Произошла ошибка при открытии каталога \"%s\": %s"
# glib/gfileutils.c:337 glib/gfileutils.c:402
-#: glib/gfileutils.c:337 glib/gfileutils.c:402
+#: glib/gfileutils.c:384 glib/gfileutils.c:449
#, c-format
msgid "Could not allocate %lu bytes to read file \"%s\""
msgstr "Не удалось распределить %lu байтов для прочтения файла \"%s\""
# glib/gfileutils.c:348
-#: glib/gfileutils.c:348
+#: glib/gfileutils.c:395
#, c-format
msgid "Error reading file '%s': %s"
msgstr "Произошла ошибка при чтении файла \"%s\": %s"
# glib/gfileutils.c:426
-#: glib/gfileutils.c:424
+#: glib/gfileutils.c:471
#, c-format
msgid "Failed to read from file '%s': %s"
msgstr "Произошёл сбой при чтении из файла \"%s\": %s"
# glib/gfileutils.c:465 glib/gfileutils.c:533
-#: glib/gfileutils.c:471 glib/gfileutils.c:539
+#: glib/gfileutils.c:518 glib/gfileutils.c:586
#, c-format
msgid "Failed to open file '%s': %s"
msgstr "Произошёл сбой при открытии файла \"%s\": %s"
# glib/gfileutils.c:479
-#: glib/gfileutils.c:485
+#: glib/gfileutils.c:532
#, c-format
msgid "Failed to get attributes of file '%s': fstat() failed: %s"
msgstr ""
-"Произошёл сбой при получении аттрибутов файла \"%s\": сбой в функции fstat(): "
-"%s"
+"Произошёл сбой при получении аттрибутов файла \"%s\": сбой в функции fstat"
+"(): %s"
# glib/gfileutils.c:505
-#: glib/gfileutils.c:511
+#: glib/gfileutils.c:558
#, c-format
msgid "Failed to open file '%s': fdopen() failed: %s"
msgstr "Произошёл сбой при открытии файла \"%s\": сбой в функции fdopen(): %s"
# glib/gfileutils.c:712
-#: glib/gfileutils.c:718
+#: glib/gfileutils.c:765
#, c-format
msgid "Template '%s' invalid, should not contain a '%s'"
msgstr "Шаблон \"%s\" недопустим: он не должен содержать \"%s\""
# glib/gfileutils.c:724
-#: glib/gfileutils.c:730
+#: glib/gfileutils.c:777
#, c-format
msgid "Template '%s' doesn't end with XXXXXX"
msgstr "Шаблон \"%s\" не заканчивается на XXXXXX"
# glib/gfileutils.c:745
-#: glib/gfileutils.c:751
+#: glib/gfileutils.c:798
#, c-format
msgid "Failed to create file '%s': %s"
msgstr "Произошёл сбой при создании файла \"%s\": %s"
# glib/giochannel.c:1110
-#: glib/giochannel.c:1122
+#: glib/giochannel.c:1123
#, c-format
msgid "Conversion from character set `%s' to `%s' is not supported"
msgstr "Преобразование из набора символов \"%s\" в \"%s\" не поддерживается"
# glib/giochannel.c:1114
-#: glib/giochannel.c:1126
+#: glib/giochannel.c:1127
#, c-format
msgid "Could not open converter from `%s' to `%s': %s"
msgstr "Не удалось открыть преобразователь из \"%s\" в \"%s\": %s"
# glib/giochannel.c:1460
-#: glib/giochannel.c:1471
+#: glib/giochannel.c:1472
msgid "Can't do a raw read in g_io_channel_read_line_string"
msgstr ""
"Невозможно выполнить непосредственное чтение в функции "
"g_io_channel_read_line_string"
# glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
-#: glib/giochannel.c:1518 glib/giochannel.c:1775 glib/giochannel.c:1861
+#: glib/giochannel.c:1519 glib/giochannel.c:1776 glib/giochannel.c:1862
msgid "Leftover unconverted data in read buffer"
msgstr "В буфере чтения остались непреобразованные данные"
# glib/giochannel.c:1587 glib/giochannel.c:1661
-#: glib/giochannel.c:1598 glib/giochannel.c:1675
+#: glib/giochannel.c:1599 glib/giochannel.c:1676
msgid "Channel terminates in a partial character"
msgstr "Канал закрывается на неполном символе"
# glib/giochannel.c:1647
-#: glib/giochannel.c:1661
+#: glib/giochannel.c:1662
msgid "Can't do a raw read in g_io_channel_read_to_end"
msgstr ""
"Невозможно выполнить непосредственное чтение в функции "
@@ -204,15 +206,10 @@ msgid "Incorrect message size"
msgstr "Размер сообщения является неправильным"
# glib/giowin32.c:1037 glib/giowin32.c:1090
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Произошла ошибка сокета"
-# glib/giowin32.c:1290
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Набор флагов канала не поддерживается"
-
# glib/gmarkup.c:219
#: glib/gmarkup.c:222
#, c-format
@@ -230,8 +227,8 @@ msgstr "Произошла ошибка в строке %d: %s"
msgid ""
"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
msgstr ""
-"Пустая сущность \"&;\" найдена; допустимыми сущностями являются: &amp; &quot; "
-"&lt; &gt; &apos;"
+"Пустая сущность \"&;\" найдена; допустимыми сущностями являются: &amp; "
+"&quot; &lt; &gt; &apos;"
# glib/gmarkup.c:392
#: glib/gmarkup.c:395
@@ -241,9 +238,9 @@ msgid ""
"begins an entity; if this ampersand isn't supposed to be an entity, escape "
"it as &amp;"
msgstr ""
-"Символ \"%s\" недопустим в начале имени сущности; символ \"&\" "
-"начинает последовательность; если этот символ не должен быть частью "
-"сущности, то экранируйте его сущностью &amp;"
+"Символ \"%s\" недопустим в начале имени сущности; символ \"&\" начинает "
+"последовательность; если этот символ не должен быть частью сущности, то "
+"экранируйте его сущностью &amp;"
# glib/gmarkup.c:428
#: glib/gmarkup.c:431
@@ -273,8 +270,8 @@ msgid ""
"Failed to parse '%s', which should have been a digit inside a character "
"reference (&#234; for example) - perhaps the digit is too large"
msgstr ""
-"Произошёл сбой при разборе строки \"%s\", где должно быть число внутри ссылки "
-"на символ (&#234; например): возможно, номер слишком велик"
+"Произошёл сбой при разборе строки \"%s\", где должно быть число внутри "
+"ссылки на символ (&#234; например): возможно, номер слишком велик"
# glib/gmarkup.c:553
#: glib/gmarkup.c:556
@@ -342,8 +339,8 @@ msgstr ""
msgid ""
"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
msgstr ""
-"Встретился лишний символ \"%s\", ожидался символ \"=\" после имени атрибута \"%s\" "
-"элемента \"%s\""
+"Встретился лишний символ \"%s\", ожидался символ \"=\" после имени атрибута "
+"\"%s\" элемента \"%s\""
# glib/gmarkup.c:1161
#: glib/gmarkup.c:1185
@@ -353,9 +350,9 @@ msgid ""
"element '%s', or optionally an attribute; perhaps you used an invalid "
"character in an attribute name"
msgstr ""
-"Встретился лишний символ \"%s\", ожидались символы \">\" или \"/\" для закрытия "
-"начального тэга элемента \"%s\" или дополнительный атрибут; возможно, был "
-"использован недопустимый символ в имени атрибута"
+"Встретился лишний символ \"%s\", ожидались символы \">\" или \"/\" для "
+"закрытия начального тэга элемента \"%s\" или дополнительный атрибут; "
+"возможно, был использован недопустимый символ в имени атрибута"
# glib/gmarkup.c:1244
#: glib/gmarkup.c:1268
@@ -364,8 +361,8 @@ msgid ""
"Odd character '%s', expected an open quote mark after the equals sign when "
"giving value for attribute '%s' of element '%s'"
msgstr ""
-"Встретился лишний символ \"%s\", ожидалась открывающая двойная кавычка после знака "
-"равенства при присваивании значения атрибуту \"%s\" элемента \"%s\""
+"Встретился лишний символ \"%s\", ожидалась открывающая двойная кавычка после "
+"знака равенства при присваивании значения атрибуту \"%s\" элемента \"%s\""
# glib/gmarkup.c:1384
#: glib/gmarkup.c:1408
@@ -374,8 +371,8 @@ msgid ""
"'%s' is not a valid character following the characters '</'; '%s' may not "
"begin an element name"
msgstr ""
-"\"%s\" является недопустимым символом при следовании за символами \"</\"; символ "
-"\"%s\" не может начинать имя элемента"
+"\"%s\" является недопустимым символом при следовании за символами \"</\"; "
+"символ \"%s\" не может начинать имя элемента"
# glib/gmarkup.c:1422
#: glib/gmarkup.c:1446
@@ -473,88 +470,89 @@ msgstr ""
# glib/gmarkup.c:1654
#: glib/gmarkup.c:1693
msgid "Document ended unexpectedly inside a comment or processing instruction"
-msgstr
+msgstr ""
"Документ непредвиденно окончился внутри комментария или инструкции обработки"
# glib/gshell.c:71
-#: glib/gshell.c:71
+#: glib/gshell.c:72
msgid "Quoted text doesn't begin with a quotation mark"
msgstr "Текст в кавычках не начинается с символа кавычки"
# glib/gshell.c:161
-#: glib/gshell.c:161
+#: glib/gshell.c:162
msgid "Unmatched quotation mark in command line or other shell-quoted text"
msgstr "Несоответствующая кавычка в командной строке или ином тексте оболочки"
# glib/gshell.c:529
-#: glib/gshell.c:529
+#: glib/gshell.c:530
#, c-format
msgid "Text ended just after a '\\' character. (The text was '%s')"
msgstr "Текст закончился сразу после символа \"\\\". (Текст был \"%s\")"
# glib/gshell.c:536
-#: glib/gshell.c:536
+#: glib/gshell.c:537
#, c-format
msgid "Text ended before matching quote was found for %c. (The text was '%s')"
msgstr ""
"Текст закончился перед соответствующей кавычкой для %c. (Текст был \"%s\")"
# glib/gshell.c:548
-#: glib/gshell.c:548
+#: glib/gshell.c:549
msgid "Text was empty (or contained only whitespace)"
msgstr "Текст был пуст (или содержал только пробелы)"
# glib/gspawn-win32.c:214
-#: glib/gspawn-win32.c:206
+#: glib/gspawn-win32.c:208
msgid "Failed to read data from child process"
msgstr "Произошёл сбой при чтении данных из процесса-потомка"
# glib/gspawn-win32.c:365
-#: glib/gspawn-win32.c:334
+#: glib/gspawn-win32.c:336
msgid ""
"Unexpected error in g_io_channel_win32_poll() reading data from a child "
"process"
msgstr ""
-"Произошла непредвиденная ошибка в функции g_io_channel_win32_poll() при чтении данных "
-"из процесса-потомка"
+"Произошла непредвиденная ошибка в функции g_io_channel_win32_poll() при "
+"чтении данных из процесса-потомка"
# glib/gspawn-win32.c:843 glib/gspawn.c:914
-#: glib/gspawn-win32.c:703 glib/gspawn.c:960
+#: glib/gspawn-win32.c:706 glib/gspawn.c:961
#, c-format
msgid "Failed to read from child pipe (%s)"
msgstr "Произошёл сбой при чтении данных из канала потомка (%s)"
# glib/gspawn-win32.c:940
-#: glib/gspawn-win32.c:781
+#: glib/gspawn-win32.c:784
msgid "Failed to execute helper program"
msgstr "Произошёл сбой при выполнении вспомогательной программы"
# glib/gspawn-win32.c:931 glib/gspawn.c:1119
-#: glib/gspawn-win32.c:814 glib/gspawn.c:1165
+#: glib/gspawn-win32.c:817 glib/gspawn.c:1166
#, c-format
msgid "Failed to change to directory '%s' (%s)"
msgstr "Произошёл сбой при смене каталога \"%s\" (%s)"
# glib/gspawn-win32.c:940
-#: glib/gspawn-win32.c:823
+#: glib/gspawn-win32.c:826
#, c-format
msgid "Failed to execute child process (%s)"
msgstr "Произошёл сбой при выполнении процесса-потомка (%s)"
# glib/gspawn-win32.c:981 glib/gspawn.c:1228
-#: glib/gspawn-win32.c:866 glib/gspawn.c:1296
+#: glib/gspawn-win32.c:869 glib/gspawn.c:1297
#, c-format
msgid "Failed to create pipe for communicating with child process (%s)"
-msgstr "Произошёл сбой при создании канала для сообщения с процессом-потомком (%s)"
+msgstr ""
+"Произошёл сбой при создании канала для сообщения с процессом-потомком (%s)"
# glib/gspawn.c:161
-#: glib/gspawn.c:166
+#: glib/gspawn.c:167
#, c-format
msgid "Failed to read data from child process (%s)"
msgstr "Произошёл сбой при чтении данных из процесса-потомка (%s)"
# glib/gspawn.c:293
-#: glib/gspawn.c:298
+#: glib/gspawn.c:299
#, c-format
msgid "Unexpected error in select() reading data from a child process (%s)"
msgstr ""
@@ -562,61 +560,69 @@ msgstr ""
"процесса-потомка (%s)"
# glib/gspawn.c:376
-#: glib/gspawn.c:381
+#: glib/gspawn.c:382
#, c-format
msgid "Unexpected error in waitpid() (%s)"
msgstr "Произошла непредвиденная ошибка в функции waitpid() (%s)"
# glib/gspawn.c:979
-#: glib/gspawn.c:1025
+#: glib/gspawn.c:1026
#, c-format
msgid "Failed to fork (%s)"
msgstr "Произошёл сбой при ответвлении (%s)"
# glib/gspawn.c:1129
-#: glib/gspawn.c:1175
+#: glib/gspawn.c:1176
#, c-format
msgid "Failed to execute child process \"%s\" (%s)"
msgstr "Произошёл сбой при выполнении процесса-потомка \"%s\" (%s)"
# glib/gspawn.c:1139
-#: glib/gspawn.c:1185
+#: glib/gspawn.c:1186
#, c-format
msgid "Failed to redirect output or input of child process (%s)"
-msgstr "Произошёл сбой при перенаправлении вывода или ввода процесса-потомка (%s)"
+msgstr ""
+"Произошёл сбой при перенаправлении вывода или ввода процесса-потомка (%s)"
# glib/gspawn.c:1148
-#: glib/gspawn.c:1194
+#: glib/gspawn.c:1195
#, c-format
msgid "Failed to fork child process (%s)"
msgstr "Произошёл сбой при ответвлении процесса-потомка (%s)"
# glib/gspawn.c:1156
-#: glib/gspawn.c:1202
+#: glib/gspawn.c:1203
#, c-format
msgid "Unknown error executing child process \"%s\""
msgstr "Произошла неизвестная ошибка при выполнении процесса-потомка \"%s\""
# glib/gspawn.c:1178
-#: glib/gspawn.c:1224
+#: glib/gspawn.c:1225
#, c-format
msgid "Failed to read enough data from child pid pipe (%s)"
-msgstr "Произошёл сбой при чтении нужного количества данных из канала процесса-потомка (%s)"
+msgstr ""
+"Произошёл сбой при чтении нужного количества данных из канала процесса-"
+"потомка (%s)"
# glib/gutf8.c:950
-#: glib/gutf8.c:950
+#: glib/gutf8.c:982
msgid "Character out of range for UTF-8"
msgstr "Символ находится вне диапазона для UTF-8"
# glib/gutf8.c:1039 glib/gutf8.c:1048 glib/gutf8.c:1180 glib/gutf8.c:1189
# glib/gutf8.c:1330 glib/gutf8.c:1426
-#: glib/gutf8.c:1039 glib/gutf8.c:1048 glib/gutf8.c:1180 glib/gutf8.c:1189
-#: glib/gutf8.c:1330 glib/gutf8.c:1426
+#: glib/gutf8.c:1071 glib/gutf8.c:1080 glib/gutf8.c:1212 glib/gutf8.c:1221
+#: glib/gutf8.c:1362 glib/gutf8.c:1458
msgid "Invalid sequence in conversion input"
msgstr ""
-"Недопустимая последовательность для преобразования находится во входной строке"
+"Недопустимая последовательность для преобразования находится во входной "
+"строке"
# glib/gutf8.c:1341 glib/gutf8.c:1437
-#: glib/gutf8.c:1341 glib/gutf8.c:1437
+#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Символ находится вне диапазона для UTF-16"
+
+# glib/giowin32.c:1290
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Набор флагов канала не поддерживается"
diff --git a/po/sk.po b/po/sk.po
index e0cdda7ec..59e4aaa55 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: sk\n"
-"POT-Creation-Date: 2002-12-18 13:39+0100\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-18 13:40+0100\n"
"Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -176,8 +176,10 @@ msgid "Error on line %d: %s"
msgstr "Chyba na riadku %d: %s"
#: glib/gmarkup.c:385
-msgid "Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
-msgstr "Nájdená prázdna entita '&;', platné entity sú: &amp; &quot; &lt; &gt; &apos;"
+msgid ""
+"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
+msgstr ""
+"Nájdená prázdna entita '&;', platné entity sú: &amp; &quot; &lt; &gt; &apos;"
#: glib/gmarkup.c:395
#, c-format
@@ -223,7 +225,8 @@ msgstr "Odkaz na znak '%s' nie je kódom povoleného znaku"
#: glib/gmarkup.c:573
msgid "Empty character reference; should include a digit such as &#454;"
-msgstr "Prázdny odkaz na znak. Odkaz by mal obsahovať číslice, napríklad &#434;"
+msgstr ""
+"Prázdny odkaz na znak. Odkaz by mal obsahovať číslice, napríklad &#434;"
#: glib/gmarkup.c:583
msgid ""
@@ -268,7 +271,8 @@ msgstr ""
#: glib/gmarkup.c:1144
#, c-format
-msgid "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
+msgid ""
+"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
msgstr ""
"Prebytočný znak '%s'. Bol očakávaný znak '=' za menom atribútu '%s' elementu "
"'%s'"
@@ -298,14 +302,16 @@ msgstr ""
msgid ""
"'%s' is not a valid character following the characters '</'; '%s' may not "
"begin an element name"
-msgstr "'%s' nie je platný znak po znakoch '</'. '%s' nesmie začínať meno elementu"
+msgstr ""
+"'%s' nie je platný znak po znakoch '</'. '%s' nesmie začínať meno elementu"
#: glib/gmarkup.c:1446
#, c-format
msgid ""
"'%s' is not a valid character following the close element name '%s'; the "
"allowed character is '>'"
-msgstr "'%s' nie je platný znak po koncovom mene elementu '%s'. Povolený znak je '>'"
+msgstr ""
+"'%s' nie je platný znak po koncovom mene elementu '%s'. Povolený znak je '>'"
#: glib/gmarkup.c:1457
#, c-format
@@ -339,7 +345,8 @@ msgstr ""
msgid ""
"Document ended unexpectedly, expected to see a close angle bracket ending "
"the tag <%s/>"
-msgstr "Dokument neočakávane skončil, očakával sa znak '>' pre ukončenie značky <%s>"
+msgstr ""
+"Dokument neočakávane skončil, očakával sa znak '>' pre ukončenie značky <%s>"
#: glib/gmarkup.c:1649
msgid "Document ended unexpectedly inside an element name"
@@ -357,7 +364,8 @@ msgstr "Dokument neočakávane skončil v začiatočnej značke elementu."
msgid ""
"Document ended unexpectedly after the equals sign following an attribute "
"name; no attribute value"
-msgstr "Dokument neočakávane skončil po '=' za menom atribútu, chýba hodnota atribútu"
+msgstr ""
+"Dokument neočakávane skončil po '=' za menom atribútu, chýba hodnota atribútu"
#: glib/gmarkup.c:1672
msgid "Document ended unexpectedly while inside an attribute value"
@@ -370,7 +378,8 @@ msgstr "Dokument neočakávane skončil v koncovej značke pre element '%s'"
#: glib/gmarkup.c:1693
msgid "Document ended unexpectedly inside a comment or processing instruction"
-msgstr "Dokument neočakávane skončil v komentári alebo inštrukcii pre spracovanie"
+msgstr ""
+"Dokument neočakávane skončil v komentári alebo inštrukcii pre spracovanie"
#: glib/gshell.c:72
msgid "Quoted text doesn't begin with a quotation mark"
@@ -388,7 +397,8 @@ msgstr "Text skončil hneď po znaku '\\'. (Text bol '%s')"
#: glib/gshell.c:537
#, c-format
msgid "Text ended before matching quote was found for %c. (The text was '%s')"
-msgstr "Text skončil pred nájdením zodpovedajúcej úvodzovky pre %c. (Text bol '%s')"
+msgstr ""
+"Text skončil pred nájdením zodpovedajúcej úvodzovky pre %c. (Text bol '%s')"
#: glib/gshell.c:549
msgid "Text was empty (or contained only whitespace)"
@@ -487,4 +497,3 @@ msgstr "Neplatná sekvencia na vstupe prevodu"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Znak mimo rozsah UTF-16"
-
diff --git a/po/sl.po b/po/sl.po
index 0db0f78ca..8a879cada 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2001-02-16 12:30+0200\n"
"Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -159,14 +159,10 @@ msgstr "Ne morem narediti surovega branja v g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Neveljavna velikost sporočila"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Napaka vtiča"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Nastavitev zastavic kanala ni podprta"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -503,3 +499,6 @@ msgstr "Neveljavna sekvenca na vhodu pretvorbe"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Znak izven intervala za UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Nastavitev zastavic kanala ni podprta"
diff --git a/po/sq.po b/po/sq.po
index 138bd0f5c..c133e0636 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 2.0\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-12 16:29+0100\n"
"Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
"Language-Team: albanian < gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -163,14 +163,10 @@ msgstr ""
msgid "Incorrect message size"
msgstr "Dimension mesazhi jokorrekt"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Gabim socket"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Impostimi i flags në kanal nuk suportohet"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -521,3 +517,6 @@ msgstr "Sekuencë e pavlefshme në hyrje për konvertimin"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Karakteri nuk ekziston në UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Impostimi i flags në kanal nuk suportohet"
diff --git a/po/sv.po b/po/sv.po
index b01ed9ecf..58570d9f3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-11-26 20:54+0100\n"
"Last-Translator: Christian Rose <menthos@menthos.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -164,14 +164,10 @@ msgstr "Kan inte göra en rå läsning i g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Felaktig meddelandestorlek"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Uttagsfel"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Kanalinställningsflaggor stöds inte"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -520,6 +516,9 @@ msgstr "Ogiltig sekvens i konverteringsindata"
msgid "Character out of range for UTF-16"
msgstr "Tecknet är utanför intervallet för UTF-16"
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Kanalinställningsflaggor stöds inte"
+
#~ msgid ""
#~ "The hostname of the URI `%s' is contains invalidly escaped characters"
#~ msgstr "Värdnamnet för URI:n \"%s\" innehåller felaktigt inbäddade tecken"
diff --git a/po/ta.po b/po/ta.po
index 650a72691..24d70d8d0 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 2.0\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-08-18 18:43-0500\n"
"Last-Translator: Dinesh Nadarajah <n_dinesh@yahoo.com>\n"
"Language-Team: Tamil <tamilinix@yahoogroups.com>\n"
@@ -159,14 +159,10 @@ msgstr "g_io_channel_read_to_end þø ãÄÁ¡¸ Å¡º¢ì¸ ÓÊ¡Ð"
msgid "Incorrect message size"
msgstr "¾¸ÅÄ¢ý «Ç× À¢¨Æ¡ÉÐ"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Ð¨Ç À¢¨Æ"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr ""
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
diff --git a/po/tr.po b/po/tr.po
index fdf9495d8..454230800 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 1.3.2\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2001-02-05 20:28+0200\n"
"Last-Translator: Kemal Yılmaz <kyilmaz@uekae.tubitak.gov.tr>\n"
"Language-Team: GNOME Turk <gnome-turk@gnome.org>\n"
@@ -161,14 +161,10 @@ msgstr ""
msgid "Incorrect message size"
msgstr ""
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr ""
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr ""
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
diff --git a/po/uk.po b/po/uk.po
index 7e73ef531..dd4cd538f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 1.3.2\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-12-06 06:21--500\n"
"Last-Translator: Yuriy Syrota <yuri@renome.rovno.ua>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
@@ -165,14 +165,10 @@ msgstr ""
msgid "Incorrect message size"
msgstr "Неправильний розмір повідомлення"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Помилка сокета"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr ""
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
diff --git a/po/vi.po b/po/vi.po
index 2bdf7f547..e91dc7d91 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1.2\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-05-06 16:33GMT\n"
"Last-Translator: T.M.Thanh <tmthanhmd@fptnet.com ; tmthanh@yahoo.com>\n"
"Language-Team: Gnome-Vi Team <gnomevi-list@lists.sourceforge.net>\n"
@@ -161,14 +161,10 @@ msgstr "Không thể thực hiện đọc thô trong g_io_channel_read_to_end"
msgid "Incorrect message size"
msgstr "Kích thước thông điệp sai"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Lỗi Socket"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "Kênh đặt các flag không được hỗ trợ"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -513,3 +509,6 @@ msgstr "Sequence bất hợp lệ trong đầu vào chuyển đổi"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "Ký tự nằm ngoài vùng UTF-16"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "Kênh đặt các flag không được hỗ trợ"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bf76c8920..4944e71cb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-03-17 16:34+0800\n"
"Last-Translator: He Qiangqiang <carton@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -159,14 +159,10 @@ msgstr "g_io_channel_read_to_end 函数无法进行原始读取"
msgid "Incorrect message size"
msgstr "不正确的消息大小"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "套接字错误"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "不支持通道设置标志"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -479,3 +475,6 @@ msgstr "转换输入中出现无效序列"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "字符超出 UTF-16 范围"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "不支持通道设置标志"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9538ad8a0..89dce891a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: glib 2.0.1\n"
-"POT-Creation-Date: 2002-12-16 17:42-0500\n"
+"POT-Creation-Date: 2002-12-20 10:12-0500\n"
"PO-Revision-Date: 2002-03-31 05:02+0800\n"
"Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
"Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
@@ -159,14 +159,10 @@ msgstr "g_io_channel_read_to_end 中無法讀取原始資料"
msgid "Incorrect message size"
msgstr "訊息長度不正確"
-#: glib/giowin32.c:1045 glib/giowin32.c:1098
+#: glib/giowin32.c:1034 glib/giowin32.c:1087
msgid "Socket error"
msgstr "Socket 發生錯誤"
-#: glib/giowin32.c:1298
-msgid "Channel set flags unsupported"
-msgstr "不支援設定管道旗標的操作"
-
#: glib/gmarkup.c:222
#, c-format
msgid "Error on line %d char %d: %s"
@@ -480,3 +476,6 @@ msgstr "轉換輸入時遇到不正確的次序"
#: glib/gutf8.c:1373 glib/gutf8.c:1469
msgid "Character out of range for UTF-16"
msgstr "字元不在 UTF-16 範圍之內"
+
+#~ msgid "Channel set flags unsupported"
+#~ msgstr "不支援設定管道旗標的操作"