Merge lp:~mterry/ubuntu/maverick/libbonobo/2.32.0 into lp:ubuntu/maverick/libbonobo

[Michael Terry]

GNOME 2.32.0 merge

=== modified file 'NEWS'
--- NEWS	2010-09-03 12:04:00 +0000
+++ NEWS	2010-09-27 14:14:16 +0000
@@ -1,3 +1,6 @@
+libbonobo 2.32.0
+	* Translation updates
+
 libbonobo 2.31.91
 	* Port to GDBus
 	* Translation updates

=== modified file 'bonobo-activation/bonobo-activation-2.0.pc'
--- bonobo-activation/bonobo-activation-2.0.pc	2010-09-03 12:04:00 +0000
+++ bonobo-activation/bonobo-activation-2.0.pc	2010-09-27 14:14:16 +0000
@@ -7,7 +7,7 @@
 idldir=${datarootdir}/idl/bonobo-activation-2.0
 
 Name: Bonobo Activation
-Version: 2.31.91
+Version: 2.32.0
 Description: Object activation framework for GNOME
 Requires: glib-2.0 gmodule-no-export-2.0 ORBit-2.0
 Libs: -L${libdir} -lbonobo-activation

=== modified file 'bonobo-activation/bonobo-activation-version.h'
--- bonobo-activation/bonobo-activation-version.h	2010-09-03 12:04:00 +0000
+++ bonobo-activation/bonobo-activation-version.h	2010-09-27 14:14:16 +0000
@@ -24,8 +24,8 @@
 #define BONOBO_ACTIVATION_VERSION_H
 
 #define BONOBO_ACTIVATION_MAJOR_VERSION (2)
-#define BONOBO_ACTIVATION_MINOR_VERSION (31)
-#define BONOBO_ACTIVATION_MICRO_VERSION (91)
+#define BONOBO_ACTIVATION_MINOR_VERSION (32)
+#define BONOBO_ACTIVATION_MICRO_VERSION (0)
 
 #endif /* BONOBO_ACTIVATION_VERSION_H */
 

=== modified file 'configure'
--- configure	2010-09-03 12:04:00 +0000
+++ configure	2010-09-27 14:14:16 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for libbonobo 2.31.91.
+# Generated by GNU Autoconf 2.65 for libbonobo 2.32.0.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=bonobo&component=libbonobo>.
 #
@@ -702,8 +702,8 @@
 # Identity of this package.
 PACKAGE_NAME='libbonobo'
 PACKAGE_TARNAME='libbonobo'
-PACKAGE_VERSION='2.31.91'
-PACKAGE_STRING='libbonobo 2.31.91'
+PACKAGE_VERSION='2.32.0'
+PACKAGE_STRING='libbonobo 2.32.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=bonobo&component=libbonobo'
 PACKAGE_URL=''
 
@@ -1531,7 +1531,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libbonobo 2.31.91 to adapt to many kinds of systems.
+\`configure' configures libbonobo 2.32.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1601,7 +1601,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libbonobo 2.31.91:";;
+     short | recursive ) echo "Configuration of libbonobo 2.32.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1733,7 +1733,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libbonobo configure 2.31.91
+libbonobo configure 2.32.0
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2104,7 +2104,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libbonobo $as_me 2.31.91, which was
+It was created by libbonobo $as_me 2.32.0, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2917,7 +2917,7 @@
 
 # Define the identity of the package.
  PACKAGE='libbonobo'
- VERSION='2.31.91'
+ VERSION='2.32.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2972,8 +2972,8 @@
 
 
 BONOBO_MAJOR_VERSION=2
-BONOBO_MINOR_VERSION=31
-BONOBO_MICRO_VERSION=91
+BONOBO_MINOR_VERSION=32
+BONOBO_MICRO_VERSION=0
 
 
 
@@ -14982,7 +14982,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libbonobo $as_me 2.31.91, which was
+This file was extended by libbonobo $as_me 2.32.0, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15048,7 +15048,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libbonobo config.status 2.31.91
+libbonobo config.status 2.32.0
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.in'
--- configure.in	2010-09-03 12:04:00 +0000
+++ configure.in	2010-09-27 14:14:16 +0000
@@ -1,8 +1,8 @@
 AC_PREREQ([2.59])
 
 m4_define([bonobo_major_version],[2])
-m4_define([bonobo_minor_version],[31])
-m4_define([bonobo_micro_version],[91])
+m4_define([bonobo_minor_version],[32])
+m4_define([bonobo_micro_version],[0])
 m4_define([bonobo_version],[bonobo_major_version.bonobo_minor_version.bonobo_micro_version])
 
 AC_INIT([libbonobo],[bonobo_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=bonobo&component=libbonobo])

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-03 12:04:00 +0000
+++ debian/changelog	2010-09-27 14:14:16 +0000
@@ -1,3 +1,9 @@
+libbonobo (2.32.0-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+
+ -- Michael Terry <[e-mail]>  Mon, 27 Sep 2010 10:05:17 -0400
+
 libbonobo (2.31.91-0ubuntu1) maverick; urgency=low
 
   * New upstream release

=== modified file 'doc/activation-api/html/attribute-tag.html'
--- doc/activation-api/html/attribute-tag.html	2010-09-03 12:04:00 +0000
+++ doc/activation-api/html/attribute-tag.html	2010-09-27 14:14:16 +0000
@@ -84,7 +84,7 @@
       
       </p>
 <div class="table">
-<a name="id3073533"></a><p class="title"><b>Table 6. Normalized attributes</b></p>
+<a name="id2765514"></a><p class="title"><b>Table 6. Normalized attributes</b></p>
 <div class="table-contents"><table summary="Normalized attributes" border="1">
 <colgroup>
 <col align="left">

=== modified file 'doc/activation-api/html/bonobo-activation-Initialization.html'
--- doc/activation-api/html/bonobo-activation-Initialization.html	2010-09-03 12:04:00 +0000
+++ doc/activation-api/html/bonobo-activation-Initialization.html	2010-09-27 14:14:16 +0000
@@ -72,7 +72,7 @@
 <hr>
 <div class="refsect2">
 <a name="BONOBO-ACTIVATION-MINOR-VERSION:CAPS"></a><h3>BONOBO_ACTIVATION_MINOR_VERSION</h3>
-<pre class="programlisting">#define BONOBO_ACTIVATION_MINOR_VERSION (31)
+<pre class="programlisting">#define BONOBO_ACTIVATION_MINOR_VERSION (32)
 </pre>
 <p>
 </p>
@@ -80,7 +80,7 @@
 <hr>
 <div class="refsect2">
 <a name="BONOBO-ACTIVATION-MICRO-VERSION:CAPS"></a><h3>BONOBO_ACTIVATION_MICRO_VERSION</h3>
-<pre class="programlisting">#define BONOBO_ACTIVATION_MICRO_VERSION (90)
+<pre class="programlisting">#define BONOBO_ACTIVATION_MICRO_VERSION (0)
 </pre>
 <p>
 </p>

=== modified file 'doc/activation-api/html/bonobo-activation.devhelp'
--- doc/activation-api/html/bonobo-activation.devhelp	2010-09-03 12:04:00 +0000
+++ doc/activation-api/html/bonobo-activation.devhelp	2010-09-27 14:14:16 +0000
@@ -3,11 +3,11 @@
 <book xmlns="http://www.devhelp.net/book" title="Bonobo Activation API Reference Manual" link="index.html" author="Mathieu Lacage" name="bonobo-activation">
   <chapters>
     <sub name="Bonobo Activation tutorial" link="tutorial.html">
-      <sub name="What is Bonobo Activation ?" link="tutorial.html#id3027192"/>
+      <sub name="What is Bonobo Activation ?" link="tutorial.html#id2719173"/>
       <sub name="Checklist" link="checklist.html"/>
     </sub>
     <sub name="Configuring Bonobo Activation" link="configuring.html">
-      <sub name=".server search path." link="configuring.html#id3022101"/>
+      <sub name=".server search path." link="configuring.html#id2714081"/>
     </sub>
     <sub name="Bonobo Activation Architecture" link="architecture.html">
       <sub name="The Bonobo Activation daemon" link="architecture.html#oaf-daemon"/>
@@ -15,7 +15,7 @@
       <sub name="Async Activation" link="async-activation.html"/>
     </sub>
     <sub name="Bonobo Activation Query Langage" link="query-langage.html">
-      <sub name="The Bonobo Activation query langage" link="query-langage.html#id3071364"/>
+      <sub name="The Bonobo Activation query langage" link="query-langage.html#id2763345"/>
       <sub name="Syntax" link="query-syntax.html"/>
     </sub>
     <sub name=".server file format reference" link="server-xml-reference.html">
@@ -23,7 +23,7 @@
       <sub name="The oaf_attribute tag" link="attribute-tag.html"/>
     </sub>
     <sub name="Migrating from gnorba to Bonobo-activation" link="migrating.html">
-      <sub name="" link="migrating.html#id3075192"/>
+      <sub name="" link="migrating.html#id2767172"/>
     </sub>
     <sub name="API Reference" link="api-reference.html">
       <sub name="Initialization" link="bonobo-activation-Initialization.html"/>

=== modified file 'doc/activation-api/html/bonobo-activation.devhelp2'
--- doc/activation-api/html/bonobo-activation.devhelp2	2010-09-03 12:04:00 +0000
+++ doc/activation-api/html/bonobo-activation.devhelp2	2010-09-27 14:14:16 +0000
@@ -3,11 +3,11 @@
 <book xmlns="http://www.devhelp.net/book" title="Bonobo Activation API Reference Manual" link="index.html" author="Mathieu Lacage" name="bonobo-activation" version="2" language="c">
   <chapters>
     <sub name="Bonobo Activation tutorial" link="tutorial.html">
-      <sub name="What is Bonobo Activation ?" link="tutorial.html#id3027192"/>
+      <sub name="What is Bonobo Activation ?" link="tutorial.html#id2719173"/>
       <sub name="Checklist" link="checklist.html"/>
     </sub>
     <sub name="Configuring Bonobo Activation" link="configuring.html">
-      <sub name=".server search path." link="configuring.html#id3022101"/>
+      <sub name=".server search path." link="configuring.html#id2714081"/>
     </sub>
     <sub name="Bonobo Activation Architecture" link="architecture.html">
       <sub name="The Bonobo Activation daemon" link="architecture.html#oaf-daemon"/>
@@ -15,7 +15,7 @@
       <sub name="Async Activation" link="async-activation.html"/>
     </sub>
     <sub name="Bonobo Activation Query Langage" link="query-langage.html">
-      <sub name="The Bonobo Activation query langage" link="query-langage.html#id3071364"/>
+      <sub name="The Bonobo Activation query langage" link="query-langage.html#id2763345"/>
       <sub name="Syntax" link="query-syntax.html"/>
     </sub>
     <sub name=".server file format reference" link="server-xml-reference.html">
@@ -23,7 +23,7 @@
       <sub name="The oaf_attribute tag" link="attribute-tag.html"/>
     </sub>
     <sub name="Migrating from gnorba to Bonobo-activation" link="migrating.html">
-      <sub name="" link="migrating.html#id3075192"/>
+      <sub name="" link="migrating.html#id2767172"/>
     </sub>
     <sub name="API Reference" link="api-reference.html">
       <sub name="Initialization" link="bonobo-activation-Initialization.html"/>

=== modified file 'doc/activation-api/html/checklist.html'
--- doc/activation-api/html/checklist.html	2010-09-03 12:04:00 +0000
+++ doc/activation-api/html/checklist.html	2010-09-27 14:14:16 +0000
@@ -56,7 +56,7 @@
    </p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id3070621"></a>The non-local case</h3></div></div></div>
+<a name="id2762602"></a>The non-local case</h3></div></div></div>
 <p>
    Here, present how to use setup the system for the non-local case.
    If anyone is willing to write this part, mail [e-mail].

=== modified file 'doc/activation-api/html/configuring.html'
--- doc/activation-api/html/configuring.html	2010-09-03 12:04:00 +0000
+++ doc/activation-api/html/configuring.html	2010-09-27 14:14:16 +0000
@@ -22,10 +22,10 @@
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
 <a name="configuring"></a>Configuring Bonobo Activation</h2></div></div></div>
-<div class="toc"><dl><dt><span class="sect1"><a href="configuring.html#id3022101"><code class="filename">.server</code> search path.</a></span></dt></dl></div>
+<div class="toc"><dl><dt><span class="sect1"><a href="configuring.html#id2714081"><code class="filename">.server</code> search path.</a></span></dt></dl></div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id3022101"></a><code class="filename">.server</code> search path.</h2></div></div></div>
+<a name="id2714081"></a><code class="filename">.server</code> search path.</h2></div></div></div>
 <p>
       To know the list of available <a href="http://foldoc.org/CORBA"><span class="acronym">CORBA</span></a> servers on your
       local machine, the Bonobo Activation daemon searches a number of

=== modified file 'doc/activation-api/html/index.html'
--- doc/activation-api/html/index.html	2010-09-03 12:04:00 +0000
+++ doc/activation-api/html/index.html	2010-09-27 14:14:16 +0000
@@ -24,7 +24,7 @@
 </div></div></div>
 <div><p class="copyright">Copyright © 2000 The Free Software Foundation</p></div>
 <div><div class="legalnotice">
-<a name="id3061417"></a><p>
+<a name="id2753398"></a><p>
     This documentation is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
@@ -39,16 +39,16 @@
 <div class="toc"><dl>
 <dt><span class="chapter"><a href="tutorial.html">Bonobo Activation tutorial</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="tutorial.html#id3027192">What is Bonobo Activation ?</a></span></dt>
+<dt><span class="sect1"><a href="tutorial.html#id2719173">What is Bonobo Activation ?</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="tutorial.html#id3061508">The need for a replacement</a></span></dt>
-<dt><span class="sect2"><a href="tutorial.html#id3022589">Getting started</a></span></dt>
+<dt><span class="sect2"><a href="tutorial.html#id2753489">The need for a replacement</a></span></dt>
+<dt><span class="sect2"><a href="tutorial.html#id2714570">Getting started</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="checklist.html">Checklist</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="checklist.html#id3070621">The non-local case</a></span></dt></dl></dd>
+<dd><dl><dt><span class="sect2"><a href="checklist.html#id2762602">The non-local case</a></span></dt></dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="configuring.html">Configuring Bonobo Activation</a></span></dt>
-<dd><dl><dt><span class="sect1"><a href="configuring.html#id3022101"><code class="filename">.server</code> search path.</a></span></dt></dl></dd>
+<dd><dl><dt><span class="sect1"><a href="configuring.html#id2714081"><code class="filename">.server</code> search path.</a></span></dt></dl></dd>
 <dt><span class="chapter"><a href="architecture.html">Bonobo Activation Architecture</a></span></dt>
 <dd><dl>
 <dt><span class="sect1"><a href="architecture.html#oaf-daemon">The Bonobo Activation daemon</a></span></dt>
@@ -57,14 +57,14 @@
 </dl></dd>
 <dt><span class="chapter"><a href="query-langage.html">Bonobo Activation Query Langage</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="query-langage.html#id3071364">The Bonobo Activation query langage</a></span></dt>
+<dt><span class="sect1"><a href="query-langage.html#id2763345">The Bonobo Activation query langage</a></span></dt>
 <dt><span class="sect1"><a href="query-syntax.html">Syntax</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="query-syntax.html#oaf-query-ref-types">Constants</a></span></dt>
-<dt><span class="sect2"><a href="query-syntax.html#id3072013">Field identifiers</a></span></dt>
-<dt><span class="sect2"><a href="query-syntax.html#id3072039">Variables</a></span></dt>
-<dt><span class="sect2"><a href="query-syntax.html#id3072067">Functions</a></span></dt>
-<dt><span class="sect2"><a href="query-syntax.html#id3072151">Operators</a></span></dt>
+<dt><span class="sect2"><a href="query-syntax.html#id2763994">Field identifiers</a></span></dt>
+<dt><span class="sect2"><a href="query-syntax.html#id2764020">Variables</a></span></dt>
+<dt><span class="sect2"><a href="query-syntax.html#id2764048">Functions</a></span></dt>
+<dt><span class="sect2"><a href="query-syntax.html#id2764132">Operators</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="server-xml-reference.html"><code class="filename">.server</code> file format reference</a></span></dt>
@@ -73,7 +73,7 @@
 <dt><span class="sect1"><a href="attribute-tag.html">The <code class="sgmltag-element">oaf_attribute</code> tag</a></span></dt>
 </dl></dd>
 <dt><span class="chapter"><a href="migrating.html">Migrating from gnorba to Bonobo-activation</a></span></dt>
-<dd><dl><dt><span class="sect1"><a href="migrating.html#id3075192"></a></span></dt></dl></dd>
+<dd><dl><dt><span class="sect1"><a href="migrating.html#id2767172"></a></span></dt></dl></dd>
 <dt><span class="chapter"><a href="api-reference.html">API Reference</a></span></dt>
 <dd><dl>
 <dt>

=== modified file 'doc/activation-api/html/lgpl.html'
--- doc/activation-api/html/lgpl.html	2010-09-03 12:04:00 +0000
+++ doc/activation-api/html/lgpl.html	2010-09-27 14:14:16 +0000
@@ -23,7 +23,7 @@
 <div class="titlepage">
 <div>
 <div><h1 class="title">
-<a name="id3086392"></a>GNU Lesser General Public License</h1></div>
+<a name="id2778373"></a>GNU Lesser General Public License</h1></div>
 <div><p class="releaseinfo">
       Version 2.1, February 1999
     </p></div>

=== modified file 'doc/activation-api/html/migrating.html'
--- doc/activation-api/html/migrating.html	2010-09-03 12:04:00 +0000
+++ doc/activation-api/html/migrating.html	2010-09-27 14:14:16 +0000
@@ -22,9 +22,9 @@
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
 <a name="migrating"></a>Migrating from gnorba to Bonobo-activation</h2></div></div></div>
-<div class="toc"><dl><dt><span class="sect1"><a href="migrating.html#id3075192"></a></span></dt></dl></div>
+<div class="toc"><dl><dt><span class="sect1"><a href="migrating.html#id2767172"></a></span></dt></dl></div>
 <div class="sect1">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id3075192"></a></h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2767172"></a></h2></div></div></div>
 <p>
    Someone write this ?
    </p>

=== modified file 'doc/activation-api/html/query-langage.html'
--- doc/activation-api/html/query-langage.html	2010-09-03 12:04:00 +0000
+++ doc/activation-api/html/query-langage.html	2010-09-27 14:14:16 +0000
@@ -23,19 +23,19 @@
 <div class="titlepage"><div><div><h2 class="title">
 <a name="query-langage"></a>Bonobo Activation Query Langage</h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="sect1"><a href="query-langage.html#id3071364">The Bonobo Activation query langage</a></span></dt>
+<dt><span class="sect1"><a href="query-langage.html#id2763345">The Bonobo Activation query langage</a></span></dt>
 <dt><span class="sect1"><a href="query-syntax.html">Syntax</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="query-syntax.html#oaf-query-ref-types">Constants</a></span></dt>
-<dt><span class="sect2"><a href="query-syntax.html#id3072013">Field identifiers</a></span></dt>
-<dt><span class="sect2"><a href="query-syntax.html#id3072039">Variables</a></span></dt>
-<dt><span class="sect2"><a href="query-syntax.html#id3072067">Functions</a></span></dt>
-<dt><span class="sect2"><a href="query-syntax.html#id3072151">Operators</a></span></dt>
+<dt><span class="sect2"><a href="query-syntax.html#id2763994">Field identifiers</a></span></dt>
+<dt><span class="sect2"><a href="query-syntax.html#id2764020">Variables</a></span></dt>
+<dt><span class="sect2"><a href="query-syntax.html#id2764048">Functions</a></span></dt>
+<dt><span class="sect2"><a href="query-syntax.html#id2764132">Operators</a></span></dt>
 </dl></dd>
 </dl></div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id3071364"></a>The Bonobo Activation query langage</h2></div></div></div>
+<a name="id2763345"></a>The Bonobo Activation query langage</h2></div></div></div>
 <p>
 Bonobo Activation has a query language used to request components with
 specific properties from the Bonobo Activation daemon.

=== modified file 'doc/activation-api/html/query-syntax.html'
--- doc/activation-api/html/query-syntax.html	2010-09-03 12:04:00 +0000
+++ doc/activation-api/html/query-syntax.html	2010-09-27 14:14:16 +0000
@@ -40,7 +40,7 @@
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id3072013"></a>Field identifiers</h3></div></div></div>
+<a name="id2763994"></a>Field identifiers</h3></div></div></div>
 <p>
 Names of fields are attributes of a ServerInfo record. These include
 'server_type', 'location_info', and 'iid', even though these are explicitly
@@ -57,7 +57,7 @@
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id3072039"></a>Variables</h3></div></div></div>
+<a name="id2764020"></a>Variables</h3></div></div></div>
 <p>
 Variables are various miscellaneous data items that are part of the
 environment. The syntax for referring to a variable is a '$' sign
@@ -74,7 +74,7 @@
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id3072067"></a>Functions</h3></div></div></div>
+<a name="id2764048"></a>Functions</h3></div></div></div>
 <p>Functions perform transformations on data and return a result. There are 
 two possible syntaxes for a function call:
 </p>
@@ -135,7 +135,7 @@
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id3072151"></a>Operators</h3></div></div></div>
+<a name="id2764132"></a>Operators</h3></div></div></div>
 <p>
 	More complex queries can be built using the various operators described below. </p>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
@@ -144,7 +144,7 @@
 
 	</p>
 <div class="table">
-<a name="id3072165"></a><p class="title"><b>Table 1. Binary relational operators.</b></p>
+<a name="id2764146"></a><p class="title"><b>Table 1. Binary relational operators.</b></p>
 <div class="table-contents"><table summary="Binary relational operators." border="1">
 <colgroup>
 <col align="left">
@@ -186,7 +186,7 @@
 
 	</p>
 <div class="table">
-<a name="id3072269"></a><p class="title"><b>Table 2. Binary boolean operators.</b></p>
+<a name="id2764250"></a><p class="title"><b>Table 2. Binary boolean operators.</b></p>
 <div class="table-contents"><table summary="Binary boolean operators." border="1">
 <colgroup>
 <col align="left">
@@ -216,7 +216,7 @@
 
 	</p>
 <div class="table">
-<a name="id3072344"></a><p class="title"><b>Table 3. Unary boolean operators.</b></p>
+<a name="id2764325"></a><p class="title"><b>Table 3. Unary boolean operators.</b></p>
 <div class="table-contents"><table summary="Unary boolean operators." border="1">
 <colgroup>
 <col align="left">
@@ -236,7 +236,7 @@
 
 	</p>
 <div class="table">
-<a name="id3072399"></a><p class="title"><b>Table 4. Binary arithmetic operators.</b></p>
+<a name="id2764380"></a><p class="title"><b>Table 4. Binary arithmetic operators.</b></p>
 <div class="table-contents"><table summary="Binary arithmetic operators." border="1">
 <colgroup>
 <col align="left">
@@ -270,7 +270,7 @@
 
 	</p>
 <div class="table">
-<a name="id3072484"></a><p class="title"><b>Table 5. Unary arithmetic operators.</b></p>
+<a name="id2764465"></a><p class="title"><b>Table 5. Unary arithmetic operators.</b></p>
 <div class="table-contents"><table summary="Unary arithmetic operators." border="1">
 <colgroup>
 <col align="left">

=== modified file 'doc/activation-api/html/tutorial.html'
--- doc/activation-api/html/tutorial.html	2010-09-03 12:04:00 +0000
+++ doc/activation-api/html/tutorial.html	2010-09-27 14:14:16 +0000
@@ -23,17 +23,17 @@
 <div class="titlepage"><div><div><h2 class="title">
 <a name="tutorial"></a>Bonobo Activation tutorial</h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="sect1"><a href="tutorial.html#id3027192">What is Bonobo Activation ?</a></span></dt>
+<dt><span class="sect1"><a href="tutorial.html#id2719173">What is Bonobo Activation ?</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="tutorial.html#id3061508">The need for a replacement</a></span></dt>
-<dt><span class="sect2"><a href="tutorial.html#id3022589">Getting started</a></span></dt>
+<dt><span class="sect2"><a href="tutorial.html#id2753489">The need for a replacement</a></span></dt>
+<dt><span class="sect2"><a href="tutorial.html#id2714570">Getting started</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="checklist.html">Checklist</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="checklist.html#id3070621">The non-local case</a></span></dt></dl></dd>
+<dd><dl><dt><span class="sect2"><a href="checklist.html#id2762602">The non-local case</a></span></dt></dl></dd>
 </dl></div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id3027192"></a>What is Bonobo Activation ?</h2></div></div></div>
+<a name="id2719173"></a>What is Bonobo Activation ?</h2></div></div></div>
 <p>
    Bonobo Activation (originally named OAF) was designed as a replacement for the limited libgnorba library used
    in older GNOME released. bonobo-activation is responsible on GNOME 2.x systems for
@@ -44,7 +44,7 @@
    </p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id3061508"></a>The need for a replacement</h3></div></div></div>
+<a name="id2753489"></a>The need for a replacement</h3></div></div></div>
 <p>
       Gnorba works well in a limited number of cases and suffers of a 
       number of design issues. More specifically:
@@ -99,7 +99,7 @@
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id3022589"></a>Getting started</h3></div></div></div>
+<a name="id2714570"></a>Getting started</h3></div></div></div>
 <p>
       Here follows a very simple-stupid example of what you can do with Bonobo Activation.
       The complete API description of bonobo activation, the Bonobo Activation query langage reference and the

=== modified file 'po/da.po'
--- po/da.po	2007-07-03 14:06:15 +0000
+++ po/da.po	2010-09-27 14:14:16 +0000
@@ -16,64 +16,69 @@
 msgstr ""
 "Project-Id-Version: libbonobo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-24 03:48+0000\n"
-"PO-Revision-Date: 2007-04-14 23:44+0200\n"
+"POT-Creation-Date: 2010-09-19 17:41+0200\n"
+"PO-Revision-Date: 2010-09-19 17:25+0200\n"
 "Last-Translator: Kenneth Nielsen <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../activation-server/activation-context-corba.c:525
+#: ../activation-server/activation-context-corba.c:530
 msgid "Couldn't find which child the server was listed in"
 msgstr "Kunne ikke finde ud af hvilken underproces serveren var opført hos"
 
-#: ../activation-server/activation-context-corba.c:817
+#: ../activation-server/activation-context-corba.c:822
 msgid "Not a valid Activation ID"
 msgstr "Ikke en gyldig aktiverings-id"
 
-#: ../activation-server/activation-server-main.c:162
+#: ../activation-server/activation-server-main.c:174
 msgid "Directory to read .server files from"
 msgstr "Mappe som .server-filer læses fra"
 
-#: ../activation-server/activation-server-main.c:162
+#: ../activation-server/activation-server-main.c:174
 msgid "DIRECTORY"
 msgstr "Mappe"
 
-#: ../activation-server/activation-server-main.c:165
+#: ../activation-server/activation-server-main.c:177
 msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
 msgstr "Virk som en ActivationContext (standard er kun som et ObjectDirectory)"
 
-#: ../activation-server/activation-server-main.c:169
+#: ../activation-server/activation-server-main.c:181
 msgid "File descriptor to write IOR to"
 msgstr "Fildeskriptor som IOR skal skrives til"
 
-#: ../activation-server/activation-server-main.c:169
+#: ../activation-server/activation-server-main.c:181
 #: ../bonobo-activation/bonobo-activation-init.c:352
 #: ../bonobo-activation/bonobo-activation-init.c:397
 msgid "FD"
 msgstr "FD"
 
-#: ../activation-server/activation-server-main.c:172
+#: ../activation-server/activation-server-main.c:184
 msgid ""
 "Register as the user's activation server without locking.  Warning: this "
 "option can have dangerous side effects on the stability of the user's "
 "running session, and should only be used for debugging purposes"
-msgstr "Registrér som brugerens aktiveringsserver uden at låse. Advarsel: Denne valgmulighed kan have farlige bivirkninger for brugerens kørerende session og bør kun bruges til fejlfindingsformål"
+msgstr ""
+"Registrér som brugerens aktiveringsserver uden at låse. Advarsel: Denne "
+"valgmulighed kan have farlige bivirkninger for brugerens kørerende session "
+"og bør kun bruges til fejlfindingsformål"
 
-#: ../activation-server/activation-server-main.c:180
+#: ../activation-server/activation-server-main.c:192
 msgid "Query expression to evaluate"
 msgstr "Søgeudtryk der skal evalueres"
 
-#: ../activation-server/activation-server-main.c:180
+#: ../activation-server/activation-server-main.c:192
 msgid "EXPRESSION"
 msgstr "UDTRYK"
 
-#: ../activation-server/activation-server-main.c:429
+#: ../activation-server/activation-server-main.c:541
 #: ../utils/bonobo-activation-sysconf.c:305
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Kør \"%s --help\" for at se den fulde liste af tilgængelige kommandolinjetilvalg.\n"
+msgstr ""
+"Kør \"%s --help\" for at se den fulde liste af tilgængelige "
+"kommandolinjetilvalg.\n"
 
 #: ../activation-server/Bonobo_CosNaming_NamingContext.server.in.in.h:1
 msgid "CORBA CosNaming service."
@@ -129,12 +134,12 @@
 msgid "Property '%s' has no value"
 msgstr "Egenskaben '%s' har ingen værdi"
 
-#: ../activation-server/object-directory-load.c:581
+#: ../activation-server/object-directory-load.c:583
 #, c-format
 msgid "Could not parse badly formed XML document %s"
 msgstr "Kunne ikke fortolke ugyldig udformet XML-dokument %s"
 
-#: ../activation-server/object-directory-load.c:627
+#: ../activation-server/object-directory-load.c:629
 #, c-format
 msgid "Trying dir %s"
 msgstr "Forsøger mappe %s"
@@ -149,10 +154,11 @@
 msgstr "Det mislykkedes at læse fra underproces: %s\n"
 
 #: ../bonobo-activation/bonobo-activation-fork-server.c:247
+#, c-format
 msgid "EOF from child process\n"
 msgstr "EOF fra underproces\n"
 
-#: ../bonobo-activation/bonobo-activation-fork-server.c:434
+#: ../bonobo-activation/bonobo-activation-fork-server.c:438
 msgid "Couldn't spawn a new process"
 msgstr "Kunne ikke oprette en ny proces"
 
@@ -212,11 +218,11 @@
 msgid "Application unique name"
 msgstr "Program-unikt navn"
 
-#: ../bonobo/bonobo-object.c:926
+#: ../bonobo/bonobo-object.c:929
 msgid "POA"
 msgstr "POA"
 
-#: ../bonobo/bonobo-object.c:926
+#: ../bonobo/bonobo-object.c:929
 msgid "Custom CORBA POA"
 msgstr "Brugerdefineret CORBA POA"
 
@@ -362,8 +368,8 @@
 # imidlertid er den betydning vist overflødig her
 #: ../bonobo/bonobo-moniker.c:342
 #, c-format
-msgid "Failed to resolve, or extend '%s"
-msgstr "Det mislykkedes at finde '%s"
+msgid "Failed to resolve, or extend '%s'"
+msgstr "Kunne ikke finde '%s'"
 
 #: ../bonobo/bonobo-moniker-util.c:247
 msgid "Failed to activate object"
@@ -442,6 +448,7 @@
 msgstr "En undtagelse opstod '%s'"
 
 #: ../utils/bonobo-activation-sysconf.c:83
+#, c-format
 msgid "Could not save configuration file.\n"
 msgstr "Kunne ikke gemme konfigurationsfil.\n"
 
@@ -451,6 +458,7 @@
 msgstr "Sikr dig venligst at du har rettigheder til at skrive til '%s'.\n"
 
 #: ../utils/bonobo-activation-sysconf.c:87
+#, c-format
 msgid "Successfully wrote configuration file.\n"
 msgstr "Skrev konfigurationsfil.\n"
 
@@ -469,10 +477,12 @@
 msgstr "%s er allerede i konfigurationsfil\n"
 
 #: ../utils/bonobo-activation-sysconf.c:166
+#, c-format
 msgid "there is not a properly structured configuration file\n"
 msgstr "der er ikke en korrekt struktureret konfigurationsfil\n"
 
 #: ../utils/bonobo-activation-sysconf.c:237
+#, c-format
 msgid "Bonobo-activation configuration file contains:\n"
 msgstr "Bonobo-aktiverings-konfigurationsfilen indeholder:\n"
 

=== modified file 'po/id.po'
--- po/id.po	2010-09-03 12:04:00 +0000
+++ po/id.po	2010-09-27 14:14:16 +0000
@@ -6,9 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libbonobo master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=bonobo&component=libbonobo\n"
-"POT-Creation-Date: 2010-05-05 12:59+0000\n"
-"PO-Revision-Date: 2010-05-07 14:44+0700\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=bonobo&component=libbonobo\n"
+"POT-Creation-Date: 2010-08-31 14:43+0000\n"
+"PO-Revision-Date: 2010-09-01 09:59+0700\n"
 "Last-Translator: Andika Triwidada <[e-mail]>\n"
 "Language-Team: GNOME Indonesian Translation Team <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -25,45 +26,55 @@
 msgid "Not a valid Activation ID"
 msgstr "ID aktifasi tidak valid"
 
-#: ../activation-server/activation-server-main.c:176
+#: ../activation-server/activation-server-main.c:174
 msgid "Directory to read .server files from"
 msgstr "Direktori tempat membaca berkas .server"
 
-#: ../activation-server/activation-server-main.c:176
+#: ../activation-server/activation-server-main.c:174
 msgid "DIRECTORY"
 msgstr "DIREKTORI"
 
-#: ../activation-server/activation-server-main.c:179
+#: ../activation-server/activation-server-main.c:177
 msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
-msgstr "Melayani sebagai suatu ActivationContext (defaultnya adalah hanya untuk ObjectDirectory)"
+msgstr ""
+"Melayani sebagai suatu ActivationContext (defaultnya adalah hanya untuk "
+"ObjectDirectory)"
 
-#: ../activation-server/activation-server-main.c:183
+#: ../activation-server/activation-server-main.c:181
 msgid "File descriptor to write IOR to"
 msgstr "Descriptor berkas untuk menulis IOR"
 
-#: ../activation-server/activation-server-main.c:183
+#: ../activation-server/activation-server-main.c:181
 #: ../bonobo-activation/bonobo-activation-init.c:352
 #: ../bonobo-activation/bonobo-activation-init.c:397
 msgid "FD"
 msgstr "FD"
 
-#: ../activation-server/activation-server-main.c:186
-msgid "Register as the user's activation server without locking.  Warning: this option can have dangerous side effects on the stability of the user's running session, and should only be used for debugging purposes"
-msgstr "Mendaftar sebagai server aktivasi milik pengguna tanpa penguncian. Peringatan: pilihan ini bisa memiliki efek samping berbahaya atas kestabilan sesi berjalan milik pengguna, dan hanya dipakai untuk tujuan debug."
+#: ../activation-server/activation-server-main.c:184
+msgid ""
+"Register as the user's activation server without locking.  Warning: this "
+"option can have dangerous side effects on the stability of the user's "
+"running session, and should only be used for debugging purposes"
+msgstr ""
+"Mendaftar sebagai server aktivasi milik pengguna tanpa penguncian. "
+"Peringatan: pilihan ini bisa memiliki efek samping berbahaya atas kestabilan "
+"sesi berjalan milik pengguna, dan hanya dipakai untuk tujuan debug."
 
-#: ../activation-server/activation-server-main.c:194
+#: ../activation-server/activation-server-main.c:192
 msgid "Query expression to evaluate"
 msgstr "Ekspresi query untuk dijalankan"
 
-#: ../activation-server/activation-server-main.c:194
+#: ../activation-server/activation-server-main.c:192
 msgid "EXPRESSION"
 msgstr "EKSPRESI"
 
-#: ../activation-server/activation-server-main.c:547
+#: ../activation-server/activation-server-main.c:541
 #: ../utils/bonobo-activation-sysconf.c:305
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Jalankan '%s --help' untuk melihat daftar lengkap pilihan baris perintah yang tersedia.\n"
+msgstr ""
+"Jalankan '%s --help' untuk melihat daftar lengkap pilihan baris perintah "
+"yang tersedia.\n"
 
 #: ../activation-server/Bonobo_CosNaming_NamingContext.server.in.in.h:1
 msgid "CORBA CosNaming service."
@@ -87,8 +98,12 @@
 
 #: ../activation-server/object-directory-config-file.c:65
 #, c-format
-msgid "The Bonobo Activation configuration file was not read successfully. Please, check it is valid in: %s"
-msgstr "Berkas konfigurasi Aktifasi Bonobo tidak dapat dibaca sepenuhnya. Silakan periksa dulu keabsahannya: %s"
+msgid ""
+"The Bonobo Activation configuration file was not read successfully. Please, "
+"check it is valid in: %s"
+msgstr ""
+"Berkas konfigurasi Aktifasi Bonobo tidak dapat dibaca sepenuhnya. Silakan "
+"periksa dulu keabsahannya: %s"
 
 #: ../activation-server/object-directory-load.c:102
 msgid "a NULL iid is not valid"
@@ -126,7 +141,9 @@
 
 #: ../bonobo-activation/bonobo-activation-fork-server.c:107
 msgid "Child process did not give an error message, unknown failure occurred"
-msgstr "Proses child tidak memberikan pesan kesalahan, terjadi kegagalan tidak dikenal"
+msgstr ""
+"Proses child tidak memberikan pesan kesalahan, terjadi kegagalan tidak "
+"dikenal"
 
 #: ../bonobo-activation/bonobo-activation-fork-server.c:237
 #, c-format
@@ -481,4 +498,3 @@
 #: ../utils/bonobo-activation-sysconf.c:273
 msgid "Display path to configuration file"
 msgstr "Tampilkan path ke berkas konfigurasi"
-

=== modified file 'po/ja.po'
--- po/ja.po	2007-02-12 15:53:43 +0000
+++ po/ja.po	2010-09-27 14:14:16 +0000
@@ -1,54 +1,55 @@
 # libbonobo ja.po
-# Copyright (C) 1999-2007 Free Software Foundation, Inc.
+# Copyright (C) 1999-2007,2010 Free Software Foundation, Inc.
 # Yukihiro Nakai <[e-mail]>, 1999.
-# Takayuki KUSANO <[e-mail]>, 1999-2002.
+# Takayuki KUSANO <[e-mail]>, 1999-2002, 2010.
 # Takeshi Aihana <[e-mail]>, 2000,2003-2007.
 # KAMAGASAKO Masatoshi <[e-mail]>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libbonobo trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-27 18:28+0900\n"
-"PO-Revision-Date: 2007-01-27 18:23+0900\n"
-"Last-Translator: Takeshi AIHANA <[e-mail]>\n"
+"Project-Id-Version: libbonobo master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=bonobo&component=libbonobo\n"
+"POT-Creation-Date: 2010-09-01 03:12+0000\n"
+"PO-Revision-Date: 2010-09-13 23:53+0900\n"
+"Last-Translator: Takayuki KUSANO <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../activation-server/activation-context-corba.c:523
+#: ../activation-server/activation-context-corba.c:530
 msgid "Couldn't find which child the server was listed in"
 msgstr "どの子プロセスでサーバが登録されたか分かりませんでした"
 
-#: ../activation-server/activation-context-corba.c:815
+#: ../activation-server/activation-context-corba.c:822
 msgid "Not a valid Activation ID"
 msgstr "活性化 ID が正しくありません"
 
-#: ../activation-server/activation-server-main.c:163
+#: ../activation-server/activation-server-main.c:174
 msgid "Directory to read .server files from"
 msgstr ".server ファイルを読み込むディレクトリ"
 
-#: ../activation-server/activation-server-main.c:163
+#: ../activation-server/activation-server-main.c:174
 msgid "DIRECTORY"
 msgstr "DIRECTORY"
 
-#: ../activation-server/activation-server-main.c:166
+#: ../activation-server/activation-server-main.c:177
 msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
 msgstr ""
 "ActivationContextとして振る舞う (デフォルトでは ObjectDirectory としてのみ)"
 
-#: ../activation-server/activation-server-main.c:170
+#: ../activation-server/activation-server-main.c:181
 msgid "File descriptor to write IOR to"
 msgstr "IORを書き込むファイル・ディスクリプタ"
 
-#: ../activation-server/activation-server-main.c:170
-#: ../bonobo-activation/bonobo-activation-init.c:356
-#: ../bonobo-activation/bonobo-activation-init.c:392
+#: ../activation-server/activation-server-main.c:181
+#: ../bonobo-activation/bonobo-activation-init.c:352
+#: ../bonobo-activation/bonobo-activation-init.c:397
 msgid "FD"
 msgstr "FD"
 
-#: ../activation-server/activation-server-main.c:173
+#: ../activation-server/activation-server-main.c:184
 msgid ""
 "Register as the user's activation server without locking.  Warning: this "
 "option can have dangerous side effects on the stability of the user's "
@@ -58,20 +59,21 @@
 "行しているセッションの安定性の面から見るといくつか危険な側面を持っているの"
 "で、デバッグを行う時にのみ使用すること)"
 
-#: ../activation-server/activation-server-main.c:181
+#: ../activation-server/activation-server-main.c:192
 msgid "Query expression to evaluate"
 msgstr "評価する問い合わせの式"
 
-#: ../activation-server/activation-server-main.c:181
+#: ../activation-server/activation-server-main.c:192
 msgid "EXPRESSION"
 msgstr "EXPRESSION"
 
-#: ../activation-server/activation-server-main.c:430
-#: ../utils/bonobo-activation-sysconf.c:304
+#: ../activation-server/activation-server-main.c:541
+#: ../utils/bonobo-activation-sysconf.c:305
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"'%s --help' すると、利用可能な全てのコマンドライン引数の一覧が表示されます\n"
+"'%s --help' すると、利用可能なすべてのコマンドライン引数の一覧が表示されま"
+"す\n"
 
 #: ../activation-server/Bonobo_CosNaming_NamingContext.server.in.in.h:1
 msgid "CORBA CosNaming service."
@@ -101,38 +103,38 @@
 "check it is valid in: %s"
 msgstr ""
 "Bonobo Activatoin 設定ファイルの読み込みに失敗しました (妥当なものか確認して"
-"下さい : %s)"
+"ください : %s)"
 
-#: ../activation-server/object-directory-load.c:101
+#: ../activation-server/object-directory-load.c:102
 msgid "a NULL iid is not valid"
 msgstr "NULL の iid は有効ではありません"
 
-#: ../activation-server/object-directory-load.c:105
+#: ../activation-server/object-directory-load.c:106
 #, c-format
 msgid "iid %s has a NULL type"
 msgstr "iid %s の型が NULL です"
 
-#: ../activation-server/object-directory-load.c:109
+#: ../activation-server/object-directory-load.c:110
 #, c-format
 msgid "iid %s has a NULL location"
 msgstr "iid %s の場所が NULL です"
 
-#: ../activation-server/object-directory-load.c:118
+#: ../activation-server/object-directory-load.c:119
 #, c-format
 msgid "invalid character '%c' in iid '%s'"
 msgstr "不正な文字 '%c' が iid '%s' の中にあります"
 
-#: ../activation-server/object-directory-load.c:348
+#: ../activation-server/object-directory-load.c:349
 #, c-format
 msgid "Property '%s' has no value"
 msgstr "プロパティ '%s' には値がありません"
 
-#: ../activation-server/object-directory-load.c:580
+#: ../activation-server/object-directory-load.c:583
 #, c-format
 msgid "Could not parse badly formed XML document %s"
 msgstr "おかしな型式の XML ドキュメント %s を解析できませんでした"
 
-#: ../activation-server/object-directory-load.c:626
+#: ../activation-server/object-directory-load.c:629
 #, c-format
 msgid "Trying dir %s"
 msgstr "ディレクトリ %s の試行中"
@@ -148,37 +150,38 @@
 msgstr "子プロセスからの読み込みに失敗: %s\n"
 
 #: ../bonobo-activation/bonobo-activation-fork-server.c:247
+#, c-format
 msgid "EOF from child process\n"
 msgstr "子プロセスからの EOF\n"
 
-#: ../bonobo-activation/bonobo-activation-fork-server.c:435
+#: ../bonobo-activation/bonobo-activation-fork-server.c:438
 msgid "Couldn't spawn a new process"
 msgstr "新規プロセスを生成できませんでした"
 
-#: ../bonobo-activation/bonobo-activation-init.c:356
-#: ../bonobo-activation/bonobo-activation-init.c:392
+#: ../bonobo-activation/bonobo-activation-init.c:352
+#: ../bonobo-activation/bonobo-activation-init.c:397
 msgid "File descriptor to print IOR on"
 msgstr "IOR の出力先のファイル・ディスクリプタ"
 
-#: ../bonobo-activation/bonobo-activation-init.c:358
-#: ../bonobo-activation/bonobo-activation-init.c:394
+#: ../bonobo-activation/bonobo-activation-init.c:354
+#: ../bonobo-activation/bonobo-activation-init.c:399
 msgid "IID to activate"
 msgstr "IID の活性化"
 
-#: ../bonobo-activation/bonobo-activation-init.c:360
-#: ../bonobo-activation/bonobo-activation-init.c:396
+#: ../bonobo-activation/bonobo-activation-init.c:356
+#: ../bonobo-activation/bonobo-activation-init.c:401
 msgid "Prevent registering of server with OAF"
 msgstr "OAF でサーバ登録の禁止"
 
-#: ../bonobo-activation/bonobo-activation-init.c:404
+#: ../bonobo-activation/bonobo-activation-init.c:409
 msgid "Bonobo Activation options:"
 msgstr "Bonobo 活性化オプション:"
 
-#: ../bonobo-activation/bonobo-activation-init.c:405
+#: ../bonobo-activation/bonobo-activation-init.c:410
 msgid "Show Bonobo Activation options"
 msgstr "Bonobo 活性化オプションを表示する"
 
-#: ../bonobo-activation/bonobo-activation-init.c:513
+#: ../bonobo-activation/bonobo-activation-init.c:518
 msgid "Bonobo activation options"
 msgstr "Bonobo 活性化オプション"
 
@@ -203,19 +206,19 @@
 msgid "Shlib `%s' didn't contain `%s'"
 msgstr "Shlib '%s' は '%s' を含んでいませんでした"
 
-#: ../bonobo/bonobo-application.c:350
+#: ../bonobo/bonobo-application.c:352
 msgid "Name"
 msgstr "名称"
 
-#: ../bonobo/bonobo-application.c:350
+#: ../bonobo/bonobo-application.c:352
 msgid "Application unique name"
 msgstr "アプリケーション固有の名前"
 
-#: ../bonobo/bonobo-object.c:923
+#: ../bonobo/bonobo-object.c:929
 msgid "POA"
 msgstr "POA"
 
-#: ../bonobo/bonobo-object.c:923
+#: ../bonobo/bonobo-object.c:929
 msgid "Custom CORBA POA"
 msgstr "カスタム CORBA POA"
 
@@ -355,16 +358,12 @@
 msgid "General activation error with no description"
 msgstr "一般的な活性化エラー (説明なし)"
 
-#: ../bonobo/bonobo-generic-factory.h:79 ../bonobo/bonobo-generic-factory.h:83
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo を初期化できませんでした"
-
 #: ../bonobo/bonobo-moniker.c:342
 #, c-format
-msgid "Failed to resolve, or extend '%s"
+msgid "Failed to resolve, or extend '%s'"
 msgstr "'%s' の解決、あるいは拡張に失敗しました"
 
-#: ../bonobo/bonobo-moniker-util.c:246
+#: ../bonobo/bonobo-moniker-util.c:247
 msgid "Failed to activate object"
 msgstr "オブジェクトの活性化に失敗しました"
 
@@ -426,33 +425,35 @@
 msgid "Echo component factory"
 msgstr "Echo コンポーネント・ファクトリ"
 
-#: ../samples/echo/echo-client.c:22
+#: ../samples/echo/echo-client.c:24
 msgid "I could not initialize Bonobo"
 msgstr "Bonobo を初期化できません"
 
-#: ../samples/echo/echo-client.c:33
+#: ../samples/echo/echo-client.c:35
 msgid "Could not create an instance of the sample echo component"
 msgstr "サンプルの Echo コンポーネントのインスタンスを作成できませんでした"
 
-#: ../samples/echo/echo-client.c:45
+#: ../samples/echo/echo-client.c:47
 #, c-format
 msgid "An exception occurred '%s'"
 msgstr "例外が発生しました: '%s'"
 
-#: ../utils/bonobo-activation-sysconf.c:82
+#: ../utils/bonobo-activation-sysconf.c:83
+#, c-format
 msgid "Could not save configuration file.\n"
 msgstr "設定ファイルを保存できませんでした\n"
 
-#: ../utils/bonobo-activation-sysconf.c:83
+#: ../utils/bonobo-activation-sysconf.c:84
 #, c-format
 msgid "Please, make sure you have permissions to write to '%s'.\n"
-msgstr "'%s' への書き込み権限を持っているか確認して下さい\n"
+msgstr "'%s' への書き込み権限を持っているか確認してください\n"
 
-#: ../utils/bonobo-activation-sysconf.c:86
+#: ../utils/bonobo-activation-sysconf.c:87
+#, c-format
 msgid "Successfully wrote configuration file.\n"
 msgstr "設定ファイルの書き込みが完了しました\n"
 
-#: ../utils/bonobo-activation-sysconf.c:103
+#: ../utils/bonobo-activation-sysconf.c:104
 #, c-format
 msgid ""
 "configuration file is:\n"
@@ -461,36 +462,41 @@
 "設定ファイル:\n"
 "    %s\n"
 
-#: ../utils/bonobo-activation-sysconf.c:145
+#: ../utils/bonobo-activation-sysconf.c:146
 #, c-format
 msgid "%s already in configuration file\n"
 msgstr "%s は設定ファイルの中に既に存在しています\n"
 
-#: ../utils/bonobo-activation-sysconf.c:165
+#: ../utils/bonobo-activation-sysconf.c:166
+#, c-format
 msgid "there is not a properly structured configuration file\n"
 msgstr "正しく構造化された設定ファイルがありません\n"
 
-#: ../utils/bonobo-activation-sysconf.c:236
+#: ../utils/bonobo-activation-sysconf.c:237
+#, c-format
 msgid "Bonobo-activation configuration file contains:\n"
 msgstr "Bonobo activation 設定ファイルの内容:\n"
 
-#: ../utils/bonobo-activation-sysconf.c:266
+#: ../utils/bonobo-activation-sysconf.c:267
 msgid "Directory to remove from configuration file"
 msgstr "設定ファイルから削除するディレクトリ"
 
-#: ../utils/bonobo-activation-sysconf.c:266
-#: ../utils/bonobo-activation-sysconf.c:268
+#: ../utils/bonobo-activation-sysconf.c:267
+#: ../utils/bonobo-activation-sysconf.c:269
 msgid "PATH"
 msgstr "PATH"
 
-#: ../utils/bonobo-activation-sysconf.c:268
+#: ../utils/bonobo-activation-sysconf.c:269
 msgid "Directory to add to configuration file"
 msgstr "設定ファイルへ追加するディレクトリ"
 
-#: ../utils/bonobo-activation-sysconf.c:270
+#: ../utils/bonobo-activation-sysconf.c:271
 msgid "Display directories in configuration file"
 msgstr "設定ファイル中のディレクトリの表示"
 
-#: ../utils/bonobo-activation-sysconf.c:272
+#: ../utils/bonobo-activation-sysconf.c:273
 msgid "Display path to configuration file"
 msgstr "設定ファイルのパスを表示"
+
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "Bonobo を初期化できませんでした"