svn commit: r13185 - in trunk/subversion: libsvn_fs_base libsvn_fs_fs

Author: dionisos
Date: Sun Feb 27 16:35:43 2005
New Revision: 13185

Modified:
   trunk/subversion/libsvn_fs_base/dag.c
   trunk/subversion/libsvn_fs_base/err.c
   trunk/subversion/libsvn_fs_base/fs.c
   trunk/subversion/libsvn_fs_base/reps-strings.c
   trunk/subversion/libsvn_fs_base/revs-txns.c
   trunk/subversion/libsvn_fs_base/tree.c
   trunk/subversion/libsvn_fs_fs/dag.c
   trunk/subversion/libsvn_fs_fs/fs.c
   trunk/subversion/libsvn_fs_fs/fs_fs.c
   trunk/subversion/libsvn_fs_fs/revs-txns.c
   trunk/subversion/libsvn_fs_fs/tree.c
Log:
Mark (error) messages for translation in libsvn_fs_base and libsvn_fs_fs.

Modified: trunk/subversion/libsvn_fs_base/dag.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_base/dag.c?view=diff&rev=13185&p1=trunk/subversion/libsvn_fs_base/dag.c&r1=13184&p2=trunk/subversion/libsvn_fs_base/dag.c&r2=13185
==============================================================================
--- trunk/subversion/libsvn_fs_base/dag.c       (original)
+++ trunk/subversion/libsvn_fs_base/dag.c       Sun Feb 27 16:35:43 2005
@@ -46,6 +46,8 @@
 
 #include "../libsvn_fs/fs-loader.h"
 
+#include "svn_private_config.h"
+
 
 /* Initializing a filesystem.  */
 
@@ -367,7 +369,7 @@
   if (strcmp (txn_id, "0"))
     return svn_error_createf
       (SVN_ERR_FS_CORRUPT, 0,
-       "Corrupt DB: initial transaction id not '0' in filesystem '%s'",
+       _("Corrupt DB: initial transaction id not '0' in filesystem '%s'"),
        fs->path);
 
   /* Create a default copy (better have an id of "0") */
@@ -375,7 +377,7 @@
   if (strcmp (copy_id, "0"))
     return svn_error_createf
       (SVN_ERR_FS_CORRUPT, 0,
-       "Corrupt DB: initial copy id not '0' in filesystem '%s'", fs->path);
+       _("Corrupt DB: initial copy id not '0' in filesystem '%s'"), fs->path);
   SVN_ERR (svn_fs_bdb__create_copy (fs, copy_id, NULL, NULL, root_id,
                                     copy_kind_real, trail));
 
@@ -384,8 +386,8 @@
   SVN_ERR (svn_fs_bdb__put_rev (&rev, fs, &revision, trail));
   if (rev != 0)
     return svn_error_createf (SVN_ERR_FS_CORRUPT, 0,
-                              "Corrupt DB: initial revision number is not '0'"
-                              " in filesystem '%s'", fs->path);
+                              _("Corrupt DB: initial revision number "
+                                "is not '0' in filesystem '%s'"), fs->path);
 
   /* Promote our transaction to a "committed" transaction. */
   SVN_ERR (svn_fs_base__txn_make_committed (fs, txn_id, rev, trail));
@@ -430,7 +432,7 @@
   if (noderev->kind != svn_node_dir)
     return svn_error_create
       (SVN_ERR_FS_NOT_DIRECTORY, NULL,
-       "Attempted to create entry in non-directory parent");
+       _("Attempted to create entry in non-directory parent"));
 
   /* If there's a DATA-KEY, there might be entries to fetch. */
   if (noderev->data_key)
@@ -596,26 +598,26 @@
   if (! svn_path_is_single_path_component (name))
     return svn_error_createf
       (SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL,
-       "Attempted to create a node with an illegal name '%s'", name);
+       _("Attempted to create a node with an illegal name '%s'"), name);
 
   /* Make sure that parent is a directory */
   if (parent->kind != svn_node_dir)
     return svn_error_create
       (SVN_ERR_FS_NOT_DIRECTORY, NULL,
-       "Attempted to create entry in non-directory parent");
+       _("Attempted to create entry in non-directory parent"));
 
   /* Check that the parent is mutable. */
   if (! svn_fs_base__dag_check_mutable (parent, txn_id))
     return svn_error_createf
       (SVN_ERR_FS_NOT_MUTABLE, NULL,
-       "Attempted to clone child of non-mutable node");
+       _("Attempted to clone child of non-mutable node"));
 
   /* Check that parent does not already have an entry named NAME. */
   SVN_ERR (dir_entry_id_from_node (&new_node_id, parent, name, trail));
   if (new_node_id)
     return svn_error_createf
       (SVN_ERR_FS_ALREADY_EXISTS, NULL,
-       "Attempted to create entry that already exists");
+       _("Attempted to create entry that already exists"));
 
   /* Create the new node's NODE-REVISION */
   memset (&new_noderev, 0, sizeof (new_noderev));
@@ -665,13 +667,13 @@
   if (node->kind != svn_node_dir)
     return svn_error_create
       (SVN_ERR_FS_NOT_DIRECTORY, NULL,
-       "Attempted to set entry in non-directory node");
+       _("Attempted to set entry in non-directory node"));
 
   /* Check it's mutable. */
   if (! svn_fs_base__dag_check_mutable (node, txn_id))
     return svn_error_create
       (SVN_ERR_FS_NOT_DIRECTORY, NULL,
-       "Attempted to set entry in immutable node");
+       _("Attempted to set entry in immutable node"));
 
   return set_entry (node, entry_name, id, txn_id, trail);
 }
@@ -732,7 +734,7 @@
       svn_string_t *idstr = svn_fs_base__id_unparse (node->id, node->pool);
       return svn_error_createf
         (SVN_ERR_FS_NOT_MUTABLE, NULL,
-         "Can't set proplist on *immutable* node-revision %s", idstr->data);
+         _("Can't set proplist on *immutable* node-revision %s"), idstr->data);
     }
 
   /* Go get a fresh NODE-REVISION for this node. */
@@ -832,13 +834,13 @@
   if (! svn_fs_base__dag_check_mutable (parent, txn_id))
     return svn_error_createf
       (SVN_ERR_FS_NOT_MUTABLE, NULL,
-       "Attempted to clone child of non-mutable node");
+       _("Attempted to clone child of non-mutable node"));
 
   /* Make sure that NAME is a single path component. */
   if (! svn_path_is_single_path_component (name))
     return svn_error_createf
       (SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL,
-       "Attempted to make a child clone with an illegal name '%s'", name);
+       _("Attempted to make a child clone with an illegal name '%s'"), name);
 
   /* Find the node named NAME in PARENT's entries list if it exists. */
   SVN_ERR (svn_fs_base__dag_open (&cur_entry, parent, name, trail));
@@ -962,19 +964,20 @@
   if (parent->kind != svn_node_dir)
     return svn_error_createf
       (SVN_ERR_FS_NOT_DIRECTORY, NULL,
-       "Attempted to delete entry '%s' from *non*-directory node", name);
+       _("Attempted to delete entry '%s' from *non*-directory node"), name);
 
   /* Make sure parent is mutable. */
   if (! svn_fs_base__dag_check_mutable (parent, txn_id))
     return svn_error_createf
       (SVN_ERR_FS_NOT_MUTABLE, NULL,
-       "Attempted to delete entry '%s' from immutable directory node", name);
+       _("Attempted to delete entry '%s' from immutable directory node"),
+       name);
 
   /* Make sure that NAME is a single path component. */
   if (! svn_path_is_single_path_component (name))
     return svn_error_createf
       (SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL,
-       "Attempted to delete a node with an illegal name '%s'", name);
+       _("Attempted to delete a node with an illegal name '%s'"), name);
 
   /* Get a fresh NODE-REVISION for the parent node. */
   SVN_ERR (get_node_revision (&parent_noderev, parent, trail));
@@ -988,7 +991,7 @@
   if (! rep_key)
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_ENTRY, NULL,
-       "Delete failed--directory has no entry '%s'", name);
+       _("Delete failed: directory has no entry '%s'"), name);
 
   /* Ensure we have a key to a mutable representation of the entries
      list.  We'll have to update the NODE-REVISION if it points to an
@@ -1023,7 +1026,7 @@
   if (! id)
     return svn_error_createf
       (SVN_ERR_FS_NO_SUCH_ENTRY, NULL,
-       "Delete failed--directory has no entry '%s'", name);
+       _("Delete failed: directory has no entry '%s'"), name);
 
   /* Use the ID of this ENTRY to get the entry's node.  */
   SVN_ERR (svn_fs_base__dag_get_node (&node, svn_fs_base__dag_get_fs (parent),
@@ -1071,7 +1074,7 @@
   /* If immutable, do nothing and return immediately. */
   if (! svn_fs_base__dag_check_mutable (node, txn_id))
     return svn_error_createf (SVN_ERR_FS_NOT_MUTABLE, NULL,
-                              "Attempted removal of immutable node");
+                              _("Attempted removal of immutable node"));
 
   /* Get a fresh node-revision. */
   SVN_ERR (svn_fs_bdb__get_node_revision (&noderev, fs, id, trail));
@@ -1185,7 +1188,7 @@
   if (file->kind != svn_node_file)
     return svn_error_createf
       (SVN_ERR_FS_NOT_FILE, NULL,
-       "Attempted to get textual contents of a *non*-file node");
+       _("Attempted to get textual contents of a *non*-file node"));
 
   /* Go get a fresh node-revision for FILE. */
   SVN_ERR (get_node_revision (&noderev, file, trail));
@@ -1218,7 +1221,7 @@
   if (file->kind != svn_node_file)
     return svn_error_createf
       (SVN_ERR_FS_NOT_FILE, NULL,
-       "Attempted to get length of a *non*-file node");
+       _("Attempted to get length of a *non*-file node"));
 
   /* Go get a fresh node-revision for FILE, and . */
   SVN_ERR (get_node_revision (&noderev, file, trail));
@@ -1242,7 +1245,7 @@
   if (file->kind != svn_node_file)
     return svn_error_createf
       (SVN_ERR_FS_NOT_FILE, NULL,
-       "Attempted to get checksum of a *non*-file node");
+       _("Attempted to get checksum of a *non*-file node"));
 
   SVN_ERR (get_node_revision (&noderev, file, trail));
   if (noderev->data_key)
@@ -1271,13 +1274,13 @@
   if (file->kind != svn_node_file)
     return svn_error_createf
       (SVN_ERR_FS_NOT_FILE, NULL,
-       "Attempted to set textual contents of a *non*-file node");
+       _("Attempted to set textual contents of a *non*-file node"));
 
   /* Make sure our node is mutable. */
   if (! svn_fs_base__dag_check_mutable (file, txn_id))
     return svn_error_createf
       (SVN_ERR_FS_NOT_MUTABLE, NULL,
-       "Attempted to set textual contents of an immutable node");
+       _("Attempted to set textual contents of an immutable node"));
 
   /* Get the node revision. */
   SVN_ERR (get_node_revision (&noderev, file, trail));
@@ -1322,13 +1325,13 @@
   if (file->kind != svn_node_file)
     return svn_error_createf
       (SVN_ERR_FS_NOT_FILE, NULL,
-       "Attempted to set textual contents of a *non*-file node");
+       _("Attempted to set textual contents of a *non*-file node"));
 
   /* Make sure our node is mutable. */
   if (! svn_fs_base__dag_check_mutable (file, txn_id))
     return svn_error_createf
       (SVN_ERR_FS_NOT_MUTABLE, NULL,
-       "Attempted to set textual contents of an immutable node");
+       _("Attempted to set textual contents of an immutable node"));
 
   /* Get the node revision. */
   SVN_ERR (get_node_revision (&noderev, file, trail));
@@ -1350,9 +1353,9 @@
         return svn_error_createf
           (SVN_ERR_CHECKSUM_MISMATCH,
            NULL,
-           "Checksum mismatch, rep '%s':\n"
-           "   expected:  %s\n"
-           "     actual:  %s\n",
+           _("Checksum mismatch, rep '%s':\n"
+             "   expected:  %s\n"
+             "     actual:  %s\n"),
            noderev->edit_key, checksum, hex);
     }
 
@@ -1409,13 +1412,13 @@
   if (! node_id)
     return svn_error_createf
       (SVN_ERR_FS_NOT_FOUND, NULL,
-       "Attempted to open non-existent child node '%s'", name);
+       _("Attempted to open non-existent child node '%s'"), name);
 
   /* Make sure that NAME is a single path component. */
   if (! svn_path_is_single_path_component (name))
     return svn_error_createf
       (SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL,
-       "Attempted to open node with an illegal name '%s'", name);
+       _("Attempted to open node with an illegal name '%s'"), name);
 
   /* Now get the node that was requested. */
   return svn_fs_base__dag_get_node (child_p, svn_fs_base__dag_get_fs (parent),

Modified: trunk/subversion/libsvn_fs_base/err.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_base/err.c?view=diff&rev=13185&p1=trunk/subversion/libsvn_fs_base/err.c&r1=13184&p2=trunk/subversion/libsvn_fs_base/err.c&r2=13185
==============================================================================
--- trunk/subversion/libsvn_fs_base/err.c       (original)
+++ trunk/subversion/libsvn_fs_base/err.c       Sun Feb 27 16:35:43 2005
@@ -34,7 +34,7 @@
     return SVN_NO_ERROR;
   else
     return svn_error_create (SVN_ERR_FS_NOT_OPEN, 0,
-                             "filesystem object has not been opened yet");
+                             _("Filesystem object has not been opened yet"));
 }
 
 
@@ -78,7 +78,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_CORRUPT, 0,
-     "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'",
+     _("Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"),
      base_path, svn_txn, fs->path);
 }
 
@@ -98,7 +98,7 @@
   svn_string_t *id_str = svn_fs_base__id_unparse (id, fs->pool);
   return svn_error_createf
     (SVN_ERR_FS_ID_NOT_FOUND, 0,
-     "Reference to non-existent node '%s' in filesystem '%s'",
+     _("Reference to non-existent node '%s' in filesystem '%s'"),
      id_str->data, fs->path);
 }
 
@@ -119,7 +119,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_CORRUPT, 0,
-     "Malformed ID as key in 'nodes' table of filesystem '%s'", fs->path);
+     _("Malformed ID as key in 'nodes' table of filesystem '%s'"), fs->path);
 }
 
 
@@ -129,7 +129,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_CORRUPT, 0,
-     "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'",
+     _("Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"),
      table, fs->path);
 }
 
@@ -141,8 +141,8 @@
   return
     svn_error_createf
     (SVN_ERR_FS_CORRUPT, 0,
-     "Corrupt entry in 'transactions' table for '%s'"
-     " in filesystem '%s'", txn, fs->path);
+     _("Corrupt entry in 'transactions' table for '%s'"
+       " in filesystem '%s'"), txn, fs->path);
 }
 
 
@@ -152,7 +152,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_CORRUPT, 0,
-     "Corrupt entry in 'copies' table for '%s' in filesystem '%s'",
+     _("Corrupt entry in 'copies' table for '%s' in filesystem '%s'"),
      copy_id, fs->path);
 }
 
@@ -174,7 +174,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_PATH_SYNTAX, 0,
-     "Search for malformed path '%s' in filesystem '%s'",
+     _("Search for malformed path '%s' in filesystem '%s'"),
      path, fs->path);
 }
 
@@ -185,7 +185,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_NO_SUCH_TRANSACTION, 0,
-     "No transaction named '%s' in filesystem '%s'",
+     _("No transaction named '%s' in filesystem '%s'"),
      txn, fs->path);
 }
 
@@ -196,7 +196,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_TRANSACTION_NOT_MUTABLE, 0,
-     "Cannot modify transaction named '%s' in filesystem '%s'",
+     _("Cannot modify transaction named '%s' in filesystem '%s'"),
      txn, fs->path);
 }
 
@@ -207,7 +207,7 @@
   return
     svn_error_createf
     (SVN_ERR_FS_NO_SUCH_COPY, 0,
-     "No copy with id '%s' in filesystem '%s'", copy_id, fs->path);
+     _("No copy with id '%s' in filesystem '%s'"), copy_id, fs->path);
 }
 
 
@@ -217,6 +217,6 @@
   return
     svn_error_createf
     (SVN_ERR_FS_NOT_DIRECTORY, 0,
-     "'%s' is not a directory in filesystem '%s'",
+     _("'%s' is not a directory in filesystem '%s'"),
      path, fs->path);
 }

Modified: trunk/subversion/libsvn_fs_base/fs.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_base/fs.c?view=diff&rev=13185&p1=trunk/subversion/libsvn_fs_base/fs.c&r1=13184&p2=trunk/subversion/libsvn_fs_base/fs.c&r2=13185
==============================================================================
--- trunk/subversion/libsvn_fs_base/fs.c        (original)
+++ trunk/subversion/libsvn_fs_base/fs.c        Sun Feb 27 16:35:43 2005
@@ -73,8 +73,8 @@
       || (major == SVN_FS_WANT_DB_MAJOR && minor == SVN_FS_WANT_DB_MINOR
           && patch < SVN_FS_WANT_DB_PATCH))
     return svn_error_createf (SVN_ERR_FS_GENERAL, 0,
-                              "Bad database version: got %d.%d.%d,"
-                              " should be at least %d.%d.%d",
+                              _("Bad database version: got %d.%d.%d,"
+                                " should be at least %d.%d.%d"),
                               major, minor, patch,
                               SVN_FS_WANT_DB_MAJOR,
                               SVN_FS_WANT_DB_MINOR,
@@ -84,9 +84,9 @@
      the one we compiled with. */
   if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR)
     return svn_error_createf (SVN_ERR_FS_GENERAL, 0,
-                              "Bad database version:"
-                              " compiled with %d.%d.%d,"
-                              " running against %d.%d.%d",
+                              _("Bad database version:"
+                                " compiled with %d.%d.%d,"
+                                " running against %d.%d.%d"),
                               DB_VERSION_MAJOR,
                               DB_VERSION_MINOR,
                               DB_VERSION_PATCH,
@@ -102,7 +102,7 @@
 {
   if (fs->fsap_data)
     return svn_error_create (SVN_ERR_FS_ALREADY_OPEN, 0,
-                             "Filesystem object already open");
+                             _("Filesystem object already open"));
   else
     return SVN_NO_ERROR;
 }
@@ -976,7 +976,7 @@
                           APR_OS_DEFAULT, pool);
   if (status)
     return svn_error_createf (status, NULL,
-                              "Can't open file '%s' for reading",
+                              _("Can't open file '%s' for reading"),
                               file_src_path);
 
   /* Open destination file. */
@@ -985,7 +985,7 @@
                           APR_OS_DEFAULT, pool);
   if (status)
     return svn_error_createf (status, NULL,
-                              "Can't open file '%s' for writing",
+                              _("Can't open file '%s' for writing"),
                               file_dst_path);
 
   /* Allocate our read/write buffer. */
@@ -1005,7 +1005,7 @@
           apr_file_close(s);  /* toss any error */
           apr_file_close(d);  /* toss any error */
           return svn_error_createf (status, NULL,
-                                    "Error reading file '%s'",
+                                    _("Error reading file '%s'"),
                                     file_src_path);
         }
     
@@ -1016,7 +1016,7 @@
           apr_file_close(s);  /* toss any error */
           apr_file_close(d);  /* toss any error */
           return svn_error_createf (status, NULL,
-                                    "Error writing file '%s'",
+                                    _("Error writing file '%s'"),
                                     file_dst_path);
         }
     
@@ -1024,11 +1024,11 @@
         {
           status = apr_file_close(s);
           if (status)
-            return svn_error_createf (status, NULL, "Can't close file '%s'",
+            return svn_error_createf (status, NULL, _("Can't close file '%s'"),
                                       file_src_path);
           status = apr_file_close(d);
           if (status)
-            return svn_error_createf (status, NULL, "Can't close file '%s'",
+            return svn_error_createf (status, NULL, _("Can't close file '%s'"),
                                       file_dst_path);
 
           break;  /* got EOF on read, all files closed, all done. */

Modified: trunk/subversion/libsvn_fs_base/reps-strings.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_base/reps-strings.c?view=diff&rev=13185&p1=trunk/subversion/libsvn_fs_base/reps-strings.c&r1=13184&p2=trunk/subversion/libsvn_fs_base/reps-strings.c&r2=13185
==============================================================================
--- trunk/subversion/libsvn_fs_base/reps-strings.c      (original)
+++ trunk/subversion/libsvn_fs_base/reps-strings.c      Sun Feb 27 16:35:43 2005
@@ -35,6 +35,7 @@
 
 #include "../libsvn_delta/delta.h"
 
+#include "svn_private_config.h"
 
 
 /*** Helper Functions ***/
@@ -99,7 +100,7 @@
   if (rep->kind != rep_kind_delta)
     return svn_error_create
       (SVN_ERR_FS_GENERAL, NULL,
-       "Representation is not of type 'delta'");
+       _("Representation is not of type 'delta'"));
 
   /* Set up a convenience variable. */
   chunks = rep->contents.delta.chunks;
@@ -483,7 +484,7 @@
               if (first_chunk->version != chunk->version)
                 return svn_error_createf
                   (SVN_ERR_FS_CORRUPT, NULL,
-                   "Diff version inconsistencies in representation '%s'",
+                   _("Diff version inconsistencies in representation '%s'"),
                    rep_key);
 
               rep_key = chunk->rep_key;
@@ -739,9 +740,10 @@
   if (contents_size > SVN_MAX_OBJECT_SIZE)
     return svn_error_createf
       (SVN_ERR_FS_GENERAL, NULL,
-       "Rep contents are too large "
-       "(got %" SVN_FILESIZE_T_FMT ", limit is %" APR_SIZE_T_FMT ")",
-       contents_size, SVN_MAX_OBJECT_SIZE);
+       _("Rep contents are too large: "
+         "got %s, limit is %s"),
+       apr_psprintf (trail->pool, "%" SVN_FILESIZE_T_FMT, contents_size),
+       apr_psprintf (trail->pool, "%" APR_SIZE_T_FMT, SVN_MAX_OBJECT_SIZE));
   else
     str->len = (apr_size_t) contents_size;
 
@@ -754,7 +756,7 @@
   if (len != str->len)
     return svn_error_createf
       (SVN_ERR_FS_CORRUPT, NULL,
-       "Failure reading rep '%s'", rep_key);
+       _("Failure reading rep '%s'"), rep_key);
 
   /* Just the standard paranoia. */
   {
@@ -770,9 +772,9 @@
     if (! svn_md5_digests_match (checksum, rep->checksum))
       return svn_error_createf
         (SVN_ERR_FS_CORRUPT, NULL,
-         "Checksum mismatch on rep '%s':\n"
-         "   expected:  %s\n"
-         "     actual:  %s\n", rep_key,
+         _("Checksum mismatch on rep '%s':\n"
+           "   expected:  %s\n"
+           "     actual:  %s\n"), rep_key,
          svn_md5_digest_to_cstring (rep->checksum, trail->pool),
          svn_md5_digest_to_cstring (checksum, trail->pool));
   }
@@ -854,9 +856,9 @@
               if (! svn_md5_digests_match (checksum, rep->checksum))
                 return svn_error_createf
                   (SVN_ERR_FS_CORRUPT, NULL,
-                   "Checksum mismatch on rep '%s':\n"
-                   "   expected:  %s\n"
-                   "     actual:  %s\n", args->rb->rep_key,
+                   _("Checksum mismatch on rep '%s':\n"
+                     "   expected:  %s\n"
+                     "     actual:  %s\n"), args->rb->rep_key,
                    svn_md5_digest_to_cstring (rep->checksum, trail->pool),
                    svn_md5_digest_to_cstring (checksum, trail->pool));
             }
@@ -867,7 +869,7 @@
       return
         svn_error_create
         (SVN_ERR_FS_REP_CHANGED, NULL,
-         "Null rep, but offset past zero already");
+         _("Null rep, but offset past zero already"));
     }
   else
     *(args->len) = 0;
@@ -979,7 +981,7 @@
   if (! rep_is_mutable (rep, txn_id))
     return svn_error_createf
       (SVN_ERR_FS_REP_NOT_MUTABLE, NULL,
-       "Rep '%s' is not mutable", rep_key);
+       _("Rep '%s' is not mutable"), rep_key);
 
   if (rep->kind == rep_kind_fulltext)
     {
@@ -993,7 +995,7 @@
          in this file, and it creates them fulltext. */
       return svn_error_createf
         (SVN_ERR_FS_CORRUPT, NULL,
-         "Rep '%s' both mutable and non-fulltext", rep_key);
+         _("Rep '%s' both mutable and non-fulltext"), rep_key);
     }
   else /* unknown kind */
     abort ();
@@ -1170,7 +1172,7 @@
   if (! rep_is_mutable (rep, txn_id))
     return svn_error_createf
       (SVN_ERR_FS_REP_NOT_MUTABLE, NULL,
-       "Rep '%s' is not mutable", rep_key);
+       _("Rep '%s' is not mutable"), rep_key);
 
   assert (rep->kind == rep_kind_fulltext);
 
@@ -1289,7 +1291,7 @@
   /* Make sure we (still) have a key. */
   if (wb->key == NULL)
     return svn_error_create (SVN_ERR_FS_GENERAL, NULL,
-                             "Failed to get new string key");
+                             _("Failed to get new string key"));
 
   /* Restore *LEN to the value it *would* have been were it not for
      header stripping. */
@@ -1364,7 +1366,7 @@
   if (strcmp (target, source) == 0)
     return svn_error_createf
       (SVN_ERR_FS_CORRUPT, NULL,
-       "Attempt to deltify '%s' against itself",
+       _("Attempt to deltify '%s' against itself"),
        target);
 
   /* Set up a handler for the svndiff data, which will write each
@@ -1430,7 +1432,7 @@
   if (! digest)
     return svn_error_createf
       (SVN_ERR_DELTA_MD5_CHECKSUM_ABSENT, NULL,
-       "Failed to calculate MD5 digest for '%s'",
+       _("Failed to calculate MD5 digest for '%s'"),
        source);
 
   /* Construct a list of the strings used by the old representation so

Modified: trunk/subversion/libsvn_fs_base/revs-txns.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_base/revs-txns.c?view=diff&rev=13185&p1=trunk/subversion/libsvn_fs_base/revs-txns.c&r1=13184&p2=trunk/subversion/libsvn_fs_base/revs-txns.c&r2=13185
==============================================================================
--- trunk/subversion/libsvn_fs_base/revs-txns.c (original)
+++ trunk/subversion/libsvn_fs_base/revs-txns.c Sun Feb 27 16:35:43 2005
@@ -40,6 +40,7 @@
 #include "bdb/changes-table.h"
 #include "../libsvn_fs/fs-loader.h"
 
+#include "svn_private_config.h"
 
 
 /*** Helpers ***/
@@ -60,10 +61,10 @@
   SVN_ERR (svn_fs_bdb__get_txn (&txn, fs, txn_id, trail));
   if (expect_dead && (txn->kind != transaction_kind_dead))
     return svn_error_createf (SVN_ERR_FS_TRANSACTION_NOT_DEAD, 0,
-                              "Transaction is not dead: '%s'", txn_id);
+                              _("Transaction is not dead: '%s'"), txn_id);
   if ((! expect_dead) && (txn->kind == transaction_kind_dead))
     return svn_error_createf (SVN_ERR_FS_TRANSACTION_DEAD, 0,
-                              "Transaction is dead: '%s'", txn_id);
+                              _("Transaction is dead: '%s'"), txn_id);
   *txn_p = txn;
   return SVN_NO_ERROR;
 }
@@ -918,7 +919,7 @@
 
   /* Now, purge it. */
   SVN_ERR_W (svn_fs_base__purge_txn (txn->fs, txn->id, pool),
-             "Transaction aborted, but cleanup failed");
+             _("Transaction aborted, but cleanup failed"));
 
   return SVN_NO_ERROR;
 }

Modified: trunk/subversion/libsvn_fs_base/tree.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_base/tree.c?view=diff&rev=13185&p1=trunk/subversion/libsvn_fs_base/tree.c&r1=13184&p2=trunk/subversion/libsvn_fs_base/tree.c&r2=13185
==============================================================================
--- trunk/subversion/libsvn_fs_base/tree.c      (original)
+++ trunk/subversion/libsvn_fs_base/tree.c      Sun Feb 27 16:35:43 2005
@@ -370,7 +370,7 @@
     return
       svn_error_createf
       (SVN_ERR_FS_NOT_FOUND, 0,
-       "File not found: transaction '%s', path '%s'",
+       _("File not found: transaction '%s', path '%s'"),
        root->txn, path);
   else
     return
@@ -391,7 +391,7 @@
     return
       svn_error_createf
       (SVN_ERR_FS_ALREADY_EXISTS, 0,
-       "File already exists: filesystem '%s', transaction '%s', path '%s'",
+       _("File already exists: filesystem '%s', transaction '%s', path '%s'"),
        fs->path, root->txn, path);
   else
     return
@@ -407,7 +407,7 @@
 {
   return svn_error_create
     (SVN_ERR_FS_NOT_TXN_ROOT, NULL,
-     "Root object must be a transaction root");
+     _("Root object must be a transaction root"));
 }
 
 
@@ -811,7 +811,7 @@
       /* The path isn't finished yet; we'd better be in a directory.  */
       if (svn_fs_base__dag_node_kind (child) != svn_node_dir)
         SVN_ERR_W (svn_fs_base__err_not_directory (fs, path_so_far),
-                   apr_pstrcat (pool, "Failure opening '", path, "'", NULL));
+                   apr_psprintf (pool, _("Failure opening '%s'"), path));
 
       rest = next;
       here = child;
@@ -1364,7 +1364,7 @@
   if (root1->fs != root2->fs)
     return svn_error_create
       (SVN_ERR_FS_GENERAL, NULL,
-       "Asking props changed in two different filesystems");
+       _("Asking props changed in two different filesystems"));
 
   args.root1      = root1;
   args.root2      = root2;
@@ -1695,8 +1695,9 @@
             pred_id = tpi_args.pred_id;
 
             if (pred_id == NULL)
-              return svn_error_create (SVN_ERR_FS_CORRUPT, 0,
-                                       "Corrupt DB: faulty predecessor count");
+              return svn_error_create
+                (SVN_ERR_FS_CORRUPT, 0,
+                 _("Corrupt DB: faulty predecessor count"));
 
             count++;
           }
@@ -1770,7 +1771,7 @@
   if (strcmp (svn_fs_base__id_txn_id (target_id), txn_id))
     return svn_error_createf
       (SVN_ERR_FS_NOT_MUTABLE, NULL,
-       "Unexpected immutable node at '%s'", target_path);
+       _("Unexpected immutable node at '%s'"), target_path);
   SVN_ERR (svn_fs_bdb__get_node_revision (&noderev, fs, target_id, trail));
   noderev->predecessor_id = source_id;
   noderev->predecessor_count = source_pred_count;
@@ -1819,8 +1820,8 @@
          as we expected it to be in the changes table. */
       return svn_error_createf
         (SVN_ERR_FS_CORRUPT, NULL,
-         "No deletion changes for path '%s' "
-         "in transaction '%s' of filesystem '%s'",
+         _("No deletion changes for path '%s' "
+           "in transaction '%s' of filesystem '%s'"),
          path, txn_id, fs->path);
     }
 
@@ -1838,7 +1839,7 @@
 {
   svn_stringbuf_set (conflict_path, path);
   return svn_error_createf (SVN_ERR_FS_CONFLICT, NULL,
-                            "Conflict at '%s'", path);
+                            _("Conflict at '%s'"), path);
 }
 
 
@@ -1885,7 +1886,7 @@
     {
       return svn_error_create
         (SVN_ERR_FS_CORRUPT, NULL,
-         "Bad merge; ancestor, source, and target not all in same fs");
+         _("Bad merge; ancestor, source, and target not all in same fs"));
     }
 
   /* We have the same fs, now check it. */
@@ -1901,7 +1902,7 @@
       svn_string_t *id_str = svn_fs_base__id_unparse (target_id, trail->pool);
       return svn_error_createf
         (SVN_ERR_FS_GENERAL, NULL,
-         "Bad merge; target '%s' has id '%s', same as ancestor",
+         _("Bad merge; target '%s' has id '%s', same as ancestor"),
          target_path, id_str->data);
     }
 
@@ -2150,7 +2151,7 @@
                   if (! svn_fs_base__dag_check_mutable (target, txn_id))
                     return svn_error_createf
                       (SVN_ERR_FS_NOT_MUTABLE, NULL,
-                       "Unexpected immutable node at '%s'", target_path);
+                       _("Unexpected immutable node at '%s'"), target_path);
 
                   SVN_ERR (svn_fs_base__dag_set_entry
                            (target, t_entry->name, s_entry->id,
@@ -2240,7 +2241,7 @@
               if (! svn_fs_base__dag_check_mutable (target, txn_id))
                 return svn_error_createf
                   (SVN_ERR_FS_NOT_MUTABLE, NULL,
-                   "Unexpected immutable node at '%s'", target_path);
+                   _("Unexpected immutable node at '%s'"), target_path);
 
               SVN_ERR (svn_fs_base__dag_delete (target, t_entry->name,
                                                 txn_id, trail));
@@ -2334,7 +2335,7 @@
           if (! svn_fs_base__dag_check_mutable (target, txn_id))
             return svn_error_createf
               (SVN_ERR_FS_NOT_MUTABLE, NULL,
-               "Unexpected immutable node at '%s'", target_path);
+               _("Unexpected immutable node at '%s'"), target_path);
 
           SVN_ERR (svn_fs_base__dag_set_entry
                    (target, s_entry->name, s_entry->id, txn_id, trail));
@@ -2505,7 +2506,7 @@
                                                       trail->pool);
       return svn_error_createf
         (SVN_ERR_FS_TXN_OUT_OF_DATE, NULL,
-         "Transaction '%s' out of date with respect to revision '%s'",
+         _("Transaction '%s' out of date with respect to revision '%s'"),
          txn_name, id_str->data);
     }
 
@@ -2681,7 +2682,7 @@
     {
       return svn_error_create
         (SVN_ERR_FS_CORRUPT, NULL,
-         "Bad merge; ancestor, source, and target not all in same fs");
+         _("Bad merge; ancestor, source, and target not all in same fs"));
     }
 
   /* ### kff todo: is there any compelling reason to get the nodes in
@@ -2853,7 +2854,7 @@
   /* We can't remove the root of the filesystem.  */
   if (! parent_path->parent)
     return svn_error_create (SVN_ERR_FS_ROOT_DIR, NULL,
-                             "The root directory cannot be deleted");
+                             _("The root directory cannot be deleted"));
 
   /* Make the parent directory mutable, and do the deletion.  */
   SVN_ERR (make_path_mutable (root, parent_path->parent, path, trail));
@@ -2992,8 +2993,9 @@
     return not_txn (to_root);
 
   if (from_root->is_txn_root)
-    return svn_error_create (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
-                             "Copy from mutable tree not currently supported");
+    return svn_error_create
+      (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
+       _("Copy from mutable tree not currently supported"));
 
   args.from_root         = from_root;
   args.from_path         = from_path;
@@ -3467,9 +3469,9 @@
         return svn_error_createf
           (SVN_ERR_CHECKSUM_MISMATCH,
            NULL,
-           "Base checksum mismatch on '%s':\n"
-           "   expected:  %s\n"
-           "     actual:  %s\n",
+           _("Base checksum mismatch on '%s':\n"
+             "   expected:  %s\n"
+             "     actual:  %s\n"),
            tb->path, tb->base_checksum, hex);
     }
 
@@ -3713,7 +3715,7 @@
   if (root1->fs != root2->fs)
     return svn_error_create
       (SVN_ERR_FS_GENERAL, NULL,
-       "Asking contents changed in two different filesystems");
+       _("Asking contents changed in two different filesystems"));
 
   /* Check that both paths are files. */
   {
@@ -3722,12 +3724,12 @@
     SVN_ERR (base_check_path (&kind, root1, path1, pool));
     if (kind != svn_node_file)
       return svn_error_createf
-        (SVN_ERR_FS_GENERAL, NULL, "'%s' is not a file", path1);
+        (SVN_ERR_FS_GENERAL, NULL, _("'%s' is not a file"), path1);
 
     SVN_ERR (base_check_path (&kind, root2, path2, pool));
     if (kind != svn_node_file)
       return svn_error_createf
-        (SVN_ERR_FS_GENERAL, NULL, "'%s' is not a file", path2);
+        (SVN_ERR_FS_GENERAL, NULL, _("'%s' is not a file"), path2);
   }
 
   args.root1      = root1;

Modified: trunk/subversion/libsvn_fs_fs/dag.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_fs/dag.c?view=diff&rev=13185&p1=trunk/subversion/libsvn_fs_fs/dag.c&r1=13184&p2=trunk/subversion/libsvn_fs_fs/dag.c&r2=13185
==============================================================================
--- trunk/subversion/libsvn_fs_fs/dag.c (original)
+++ trunk/subversion/libsvn_fs_fs/dag.c Sun Feb 27 16:35:43 2005
@@ -34,6 +34,8 @@
 
 #include "../libsvn_fs/fs-loader.h"
 
+#include "svn_private_config.h"
+
 
 /* Initializing a filesystem.  */
 
@@ -360,19 +362,19 @@
   if (! svn_path_is_single_path_component (name))
     return svn_error_createf
       (SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT, NULL,
-       "Attempted to create a node with an illegal name '%s'", name);
+       _("Attempted to create a node with an illegal name '%s'"), name);
 
   /* Make sure that parent is a directory */
   if (parent->kind != svn_node_dir)
     return svn_error_create
       (SVN_ERR_FS_NOT_DIRECTORY, NULL,
-       "Attempted to create entry in non-directory parent");
+       _("Attempted to create entry in non-directory parent"));
 
   /* Check that the parent is mutable. */
   if (! svn_fs_fs__dag_check_mutable (parent, txn_id))
     return svn_error_createf
       (SVN_ERR_FS_NOT_MUTABLE, NULL,
-       "Attempted to clone child of non-mutable node");
+       _("Attempted to clone child of non-mutable node"));
 
   /* Create the new node's NODE-REVISION */
   memset (&new_noderev, 0, sizeof (new_noderev));
@@ -416,7 +418,7 @@
 
   if (noderev->kind != svn_node_dir)
     return svn_error_create (SVN_ERR_FS_NOT_DIRECTORY, NULL,
-                             "Can't get entries of non-directory");
+                             _("Can't get entries of non-directory"));
 
   return svn_fs_fs__rep_contents_dir (entries, node->fs, noderev, pool);
 }
@@ -434,13 +436,13 @@
   if (node->kind != svn_node_dir)
     return svn_error_create
       (SVN_ERR_FS_NOT_DIRECTORY, NULL,
-       "Attempted to set entry in non-directory node");
+       _("Attempted to set entry in non-directory node"));
   
   /* Check it's mutable. */
   if (! svn_fs_fs__dag_check_mutable (node, txn_id))
     return svn_error_create
       (SVN_ERR_FS_NOT_DIRECTORY, NULL,
-       "Attempted to set entry in immutable node");
+       _("Attempted to set entry in immutable node"));
 
   return set_entry (node, entry_name, id, kind, txn_id, pool);
 }

Modified: trunk/subversion/libsvn_fs_fs/fs.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_fs/fs.c?view=diff&rev=13185&p1=trunk/subversion/libsvn_fs_fs/fs.c&r1=13184&p2=trunk/subversion/libsvn_fs_fs/fs.c&r2=13185
==============================================================================
--- trunk/subversion/libsvn_fs_fs/fs.c  (original)
+++ trunk/subversion/libsvn_fs_fs/fs.c  Sun Feb 27 16:35:43 2005
@@ -46,7 +46,7 @@
 {
   if (fs->fsap_data)
     return svn_error_create (SVN_ERR_FS_ALREADY_OPEN, 0,
-                             "Filesystem object already open");
+                             _("Filesystem object already open"));
   else
     return SVN_NO_ERROR;
 }

Modified: trunk/subversion/libsvn_fs_fs/fs_fs.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_fs/fs_fs.c?view=diff&rev=13185&p1=trunk/subversion/libsvn_fs_fs/fs_fs.c&r1=13184&p2=trunk/subversion/libsvn_fs_fs/fs_fs.c&r2=13185
==============================================================================
--- trunk/subversion/libsvn_fs_fs/fs_fs.c       (original)
+++ trunk/subversion/libsvn_fs_fs/fs_fs.c       Sun Feb 27 16:35:43 2005
@@ -1541,9 +1541,9 @@
           apr_md5_final (checksum, &rb->md5_context);
           if (! svn_md5_digests_match (checksum, rb->checksum))
             return svn_error_createf (SVN_ERR_FS_CORRUPT, NULL,
-               "Checksum mismatch while reading representation:\n"
-               "   expected:  %s\n"
-               "     actual:  %s\n",
+               _("Checksum mismatch while reading representation:\n"
+                 "   expected:  %s\n"
+                 "     actual:  %s\n"),
                svn_md5_digest_to_cstring (rb->checksum, rb->pool),
                svn_md5_digest_to_cstring (checksum, rb->pool));
         }
@@ -2341,8 +2341,8 @@
 
   return svn_error_createf (SVN_ERR_IO_UNIQUE_NAMES_EXHAUSTED,
                             NULL,
-                            "Unable to create transaction directory "
-                            "in '%s' for revision %ld",
+                            _("Unable to create transaction directory "
+                              "in '%s' for revision %ld"),
                             fs->path, rev);
 }
 

Modified: trunk/subversion/libsvn_fs_fs/revs-txns.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_fs/revs-txns.c?view=diff&rev=13185&p1=trunk/subversion/libsvn_fs_fs/revs-txns.c&r1=13184&p2=trunk/subversion/libsvn_fs_fs/revs-txns.c&r2=13185
==============================================================================
--- trunk/subversion/libsvn_fs_fs/revs-txns.c   (original)
+++ trunk/subversion/libsvn_fs_fs/revs-txns.c   Sun Feb 27 16:35:43 2005
@@ -34,6 +34,8 @@
 
 #include "../libsvn_fs/fs-loader.h"
 
+#include "svn_private_config.h"
+
 
 /*** Helpers ***/
 
@@ -53,10 +55,10 @@
   SVN_ERR (svn_fs_fs__get_txn (&txn, fs, txn_id, pool));
   if (expect_dead && (txn->kind != transaction_kind_dead))
     return svn_error_createf (SVN_ERR_FS_TRANSACTION_NOT_DEAD, 0,
-                              "Transaction is not dead: '%s'", txn_id);
+                              _("Transaction is not dead: '%s'"), txn_id);
   if ((! expect_dead) && (txn->kind == transaction_kind_dead))
     return svn_error_createf (SVN_ERR_FS_TRANSACTION_NOT_DEAD, 0,
-                              "Transaction is dead: '%s'", txn_id);
+                              _("Transaction is dead: '%s'"), txn_id);
   *txn_p = txn;
   return SVN_NO_ERROR;
 }
@@ -197,7 +199,7 @@
 
   /* Now, purge it. */
   SVN_ERR_W (svn_fs_fs__purge_txn (txn->fs, txn->id, pool),
-             "Transaction cleanup failed");
+             _("Transaction cleanup failed"));
 
   return SVN_NO_ERROR;
 }

Modified: trunk/subversion/libsvn_fs_fs/tree.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_fs_fs/tree.c?view=diff&rev=13185&p1=trunk/subversion/libsvn_fs_fs/tree.c&r1=13184&p2=trunk/subversion/libsvn_fs_fs/tree.c&r2=13185
==============================================================================
--- trunk/subversion/libsvn_fs_fs/tree.c        (original)
+++ trunk/subversion/libsvn_fs_fs/tree.c        Sun Feb 27 16:35:43 2005
@@ -290,7 +290,7 @@
     return
       svn_error_createf
       (SVN_ERR_FS_NOT_FOUND, 0,
-       "File not found: transaction '%s', path '%s'",
+       _("File not found: transaction '%s', path '%s'"),
        root->txn, path);
   else
     return
@@ -311,7 +311,7 @@
     return
       svn_error_createf
       (SVN_ERR_FS_ALREADY_EXISTS, 0,
-       "File already exists: filesystem '%s', transaction '%s', path '%s'",
+       _("File already exists: filesystem '%s', transaction '%s', path '%s'"),
        fs->path, root->txn, path);
   else
     return
@@ -327,7 +327,7 @@
 {
   return svn_error_create
     (SVN_ERR_FS_NOT_TXN_ROOT, NULL,
-     "Root object must be a transaction root");
+     _("Root object must be a transaction root"));
 }
 
 
@@ -736,7 +736,7 @@
       /* The path isn't finished yet; we'd better be in a directory.  */
       if (svn_fs_fs__dag_node_kind (child) != svn_node_dir)
         SVN_ERR_W (svn_fs_fs__err_not_directory (fs, path_so_far),
-                   apr_pstrcat (pool, "Failure opening '", path, "'", NULL));
+                   apr_psprintf (pool, _("Failure opening '%s'"), path));
       
       rest = next;
       here = child;
@@ -1131,7 +1131,7 @@
   if (root1->fs != root2->fs)
     return svn_error_create
       (SVN_ERR_FS_GENERAL, NULL,
-       "Asking props changed in two different filesystems");
+       _("Asking props changed in two different filesystems"));
   
   SVN_ERR (get_dag (&node1, root1, path1, pool));
   SVN_ERR (get_dag (&node2, root2, path2, pool));
@@ -1189,7 +1189,7 @@
   if (svn_fs_fs__id_txn_id (target_id) == NULL)
     return svn_error_createf
       (SVN_ERR_FS_NOT_MUTABLE, NULL,
-       "Unexpected immutable node at '%s'", target_path);
+       _("Unexpected immutable node at '%s'"), target_path);
 
   SVN_ERR (svn_fs_fs__get_node_revision (&noderev, fs, target_id, pool));
   noderev->predecessor_id = source_id;
@@ -1242,8 +1242,8 @@
          as we expected it to be in the changes table. */
       return svn_error_createf
         (SVN_ERR_FS_CORRUPT, NULL,
-         "No deletion changes for path '%s' "
-         "in transaction '%s' of filesystem '%s'",
+         _("No deletion changes for path '%s' "
+           "in transaction '%s' of filesystem '%s'"),
          path, txn_id, fs->path);
     }
   
@@ -1261,7 +1261,7 @@
 {
   svn_stringbuf_set (conflict_path, path);
   return svn_error_createf (SVN_ERR_FS_CONFLICT, NULL,
-                            "Conflict at '%s'", path);
+                            _("Conflict at '%s'"), path);
 }
 
 
@@ -1308,7 +1308,7 @@
     {
       return svn_error_create
         (SVN_ERR_FS_CORRUPT, NULL,
-         "Bad merge; ancestor, source, and target not all in same fs");
+         _("Bad merge; ancestor, source, and target not all in same fs"));
     }
 
   /* We have the same fs, now check it. */
@@ -1324,7 +1324,7 @@
       svn_string_t *id_str = svn_fs_fs__id_unparse (target_id, pool);
       return svn_error_createf
         (SVN_ERR_FS_GENERAL, NULL,
-         "Bad merge; target '%s' has id '%s', same as ancestor",
+         _("Bad merge; target '%s' has id '%s', same as ancestor"),
          target_path, id_str->data);
     }
 
@@ -1571,7 +1571,7 @@
                   if (! svn_fs_fs__dag_check_mutable (target, txn_id))
                     return svn_error_createf
                       (SVN_ERR_FS_NOT_MUTABLE, NULL,
-                       "Unexpected immutable node at '%s'", target_path);
+                       _("Unexpected immutable node at '%s'"), target_path);
 
                   SVN_ERR (svn_fs_fs__dag_set_entry
                            (target, t_entry->name, s_entry->id, s_entry->kind,
@@ -1663,7 +1663,7 @@
               if (! svn_fs_fs__dag_check_mutable (target, txn_id))
                 return svn_error_createf
                   (SVN_ERR_FS_NOT_MUTABLE, NULL,
-                   "Unexpected immutable node at '%s'", target_path);
+                   _("Unexpected immutable node at '%s'"), target_path);
               
               SVN_ERR (svn_fs_fs__dag_delete (target, t_entry->name, 
                                               txn_id, pool));
@@ -1757,7 +1757,7 @@
           if (! svn_fs_fs__dag_check_mutable (target, txn_id))
             return svn_error_createf
               (SVN_ERR_FS_NOT_MUTABLE, NULL,
-               "Unexpected immutable node at '%s'", target_path);
+               _("Unexpected immutable node at '%s'"), target_path);
               
           SVN_ERR (svn_fs_fs__dag_set_entry
                    (target, s_entry->name, s_entry->id, s_entry->kind,
@@ -2012,7 +2012,7 @@
     {
       return svn_error_create
         (SVN_ERR_FS_CORRUPT, NULL,
-         "Bad merge; ancestor, source, and target not all in same fs");
+         _("Bad merge; ancestor, source, and target not all in same fs"));
     }
 
   /* ### kff todo: is there any compelling reason to get the nodes in
@@ -2144,7 +2144,7 @@
   /* We can't remove the root of the filesystem.  */
   if (! parent_path->parent)
     return svn_error_create (SVN_ERR_FS_ROOT_DIR, NULL,
-                             "The root directory cannot be deleted");
+                             _("The root directory cannot be deleted"));
 
   /* Make the parent directory mutable, and do the deletion.  */
   SVN_ERR (make_path_mutable (root, parent_path->parent, path, pool));
@@ -2183,8 +2183,9 @@
   assert (from_root->fs == to_root->fs);
 
   if (from_root->is_txn_root)
-    return svn_error_create (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
-                             "Copy from mutable tree not currently supported");
+    return svn_error_create
+      (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
+       _("Copy from mutable tree not currently supported"));
 
   /* Get the NODE for FROM_PATH in FROM_ROOT.*/
   SVN_ERR (get_dag (&from_node, from_root, from_path, pool));
@@ -2586,9 +2587,9 @@
         return svn_error_createf
           (SVN_ERR_CHECKSUM_MISMATCH, 
            NULL,
-           "Base checksum mismatch on '%s':\n"
-           "   expected:  %s\n"
-           "     actual:  %s\n",
+           _("Base checksum mismatch on '%s':\n"
+             "   expected:  %s\n"
+             "     actual:  %s\n"),
            tb->path, tb->base_checksum, hex);
     }
 
@@ -2816,7 +2817,7 @@
   if (root1->fs != root2->fs)
     return svn_error_create
       (SVN_ERR_FS_GENERAL, NULL,
-       "Asking contents changed in two different filesystems");
+       _("Asking contents changed in two different filesystems"));
   
   /* Check that both paths are files. */
   {
@@ -2825,12 +2826,12 @@
     SVN_ERR (fs_check_path (&kind, root1, path1, pool));
     if (kind != svn_node_file)
       return svn_error_createf
-        (SVN_ERR_FS_GENERAL, NULL, "'%s' is not a file", path1);
+        (SVN_ERR_FS_GENERAL, NULL, _("'%s' is not a file"), path1);
       
     SVN_ERR (fs_check_path (&kind, root2, path2, pool));
     if (kind != svn_node_file)
       return svn_error_createf
-        (SVN_ERR_FS_GENERAL, NULL, "'%s' is not a file", path2);
+        (SVN_ERR_FS_GENERAL, NULL, _("'%s' is not a file"), path2);
   }
 
   SVN_ERR (get_dag (&node1, root1, path1, pool));