#
#
# patch "po/POTFILES.in"
#  from [65400dacaefcd500e823fb1076dfa9eab4f518d2]
#    to [126bbd4a55738f70529a9bf7550a9bd2195f0c3d]
#
# patch "po/de.po"
#  from [9358c9532f1f10e2b2823b692a81d37cd090bf07]
#    to [95da9c499b0f3b23518489c50bde90f535c2a903]
#
# patch "roster.cc"
#  from [f62b03b41fa5286a94947a3bebc17ac9b83774cb]
#    to [576018dfc93b38ff8c7f66504318a0cfb47030fe]
#
============================================================
--- po/POTFILES.in	65400dacaefcd500e823fb1076dfa9eab4f518d2
+++ po/POTFILES.in	126bbd4a55738f70529a9bf7550a9bd2195f0c3d
@@ -69,6 +69,7 @@ revision.hh
 restrictions.cc
 revision.cc
 revision.hh
+roster.cc
 sanity.cc
 sanity.hh
 selectors.cc
============================================================
--- po/de.po	9358c9532f1f10e2b2823b692a81d37cd090bf07
+++ po/de.po	95da9c499b0f3b23518489c50bde90f535c2a903
@@ -33,7 +33,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-26 13:32+0200\n"
+"POT-Creation-Date: 2007-03-27 12:37+0200\n"
 "PO-Revision-Date: 2007-03-06 15:11+0100\n"
 "Last-Translator: Thomas Keller <address@hidden>\n"
 "Language-Team: Deutsch <address@hidden>\n"
@@ -1198,7 +1198,7 @@ msgid ""

 #: cmd_merging.cc:605
 msgid ""
-"Mere OTHER-REVISION into the current workspace's base revision, and update "
+"Merge OTHER-REVISION into the current workspace's base revision, and update "
 "the current workspace with the result.  There can be no pending changes in "
 "the current workspace.  Both OTHER-REVISION and the workspace's base "
 "revision will be recorded as parents on commit.  The workspace's selected "
@@ -3847,6 +3847,25 @@ msgstr ""
 "Eine neuere Version von monotone wird benötigt, um diese Operation "
 "durchzuführen."

+#: roster.cc:2235
+#, c-format
+msgid "restriction includes deletion of '%s' but excludes deletion of '%s'"
+msgstr ""
+"Die Beschränkung schließt das Löschen von '%s' ein, jedoch das Löschen von '%"
+"s' aus."
+
+#: roster.cc:2255
+#, c-format
+msgid "restriction excludes addition of '%s' but includes addition of '%s'"
+msgstr ""
+"Beschränkung schließt das Hinzufügen von '%s' ein, jedoch das Hinzufügen von "
+"'%s' aus."
+
+#: roster.cc:2283
+#, c-format
+msgid "invalid restriction"
+msgstr "ungültige Beschränkung"
+
 #: sanity.cc:145
 #, c-format
 msgid "fatal: formatter failed on %s:%d: %s"
============================================================
--- roster.cc	f62b03b41fa5286a94947a3bebc17ac9b83774cb
+++ roster.cc	576018dfc93b38ff8c7f66504318a0cfb47030fe
@@ -3138,8 +3138,8 @@ UNIT_TEST(roster, random_actions)
   for (int i = 0; i < 2000; )
     {
       int manychanges = 100 + rng.uniform(300);
-      P(F("random roster actions: outer step at %d, making %d changes")
-        % i % manychanges);
+      // P(F("random roster actions: outer step at %d, making %d changes")
+      //   % i % manychanges);

       for (int outer_limit = i + manychanges; i < outer_limit; )
         {