#
#
# patch "cmd_merging.cc"
#  from [af981750479259f111b482b9a156f2a62365eae0]
#    to [548b56485cc5265c04f713f16fadb16f7d8e96ee]
#
# patch "po/de.po"
#  from [4f9e553e1de52cfe229fcecfab7254845d9f2daa]
#    to [2bcc2419844611c80b7086caea5c8fb34242dd3c]
#
============================================================
--- cmd_merging.cc	af981750479259f111b482b9a156f2a62365eae0
+++ cmd_merging.cc	548b56485cc5265c04f713f16fadb16f7d8e96ee
@@ -576,7 +576,7 @@
     throw usage(name);
   revision_id l_id, r_id;
   complete(app, idx(args,0)(), l_id);
-  complete(app, idx(args,1)(), r_id);
+  complete(app, idx(args,1)(), r_id);                                   
   N(!is_ancestor(l_id, r_id, app),
     F("%s is an ancestor of %s; no merge is needed.") % l_id % r_id);
   N(!is_ancestor(r_id, l_id, app),
@@ -606,9 +606,9 @@
     % result.rename_target_conflicts.size());
   P(F("There are %s directory_loop_conflicts.")
     % result.directory_loop_conflicts.size());
-}
+}

-CMD(pluck, N_("workspace"), "[-r FROM] -r TO",
+CMD(pluck, N_("workspace"), N_("[-r FROM] -r TO"),
     N_("Apply changes made at arbitrary places in history to current workspace.\n"
        "This command takes changes made at any point in history, and\n"
        "edits your current workspace to include those changes.  The end result\n"
@@ -617,17 +617,17 @@
        "renames, conflicts, and so on.\n"
        "\n"
        "If one revision is given, applies the changes made in that revision\n"
-       "compared to its parent.\n"
+       "compared to its parent.\n"                                      
        "\n"
-       "If two revisions are given, applies the changes made to get from the\n"
-       "first revision to the second."),
+       "If two revisions are given, applies the changes made to get from the\n"
+       "first revision to the second."),                                
     OPT_REVISION)
 {
   if (args.size() > 0)
-    throw usage(name);
+    throw usage(name);                                                  

   revision_id from_rid, to_rid;
-
+
   if (app.revision_selectors.size() == 1)
     {
       complete(app, idx(app.revision_selectors, 0)(), to_rid);
============================================================
--- po/de.po	4f9e553e1de52cfe229fcecfab7254845d9f2daa
+++ po/de.po	2bcc2419844611c80b7086caea5c8fb34242dd3c
@@ -24,8 +24,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-06 13:27+0200\n"
-"PO-Revision-Date: 2006-07-06 14:43+0100\n"
+"POT-Creation-Date: 2006-07-06 15:30+0200\n"
+"PO-Revision-Date: 2006-07-06 15:31+0100\n"
 "Last-Translator: Thomas Keller <address@hidden>\n"
 "Language-Team: Deutsch <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -1008,6 +1008,10 @@
 msgid "There are %s directory_loop_conflicts."
 msgstr "Es gibt %s directory_loop_conflicts."

+#: cmd_merging.cc:611
+msgid "[-r FROM] -r TO"
+msgstr "[-r VON] -r BIS"
+
 #: cmd_merging.cc:612
 msgid ""
 "Apply changes made at arbitrary places in history to current workspace.\n"
@@ -1025,7 +1029,9 @@
 msgstr ""
 "Wende Änderungen, die an beliebigen Punkten in der Historie vollzogen\n"
 "wurden, auf das derzeitige Arbeitsverzeichnis an.\n"
-"Das Ergebnis dieses Kommandos ist identisch zur Ausführung von  mtn diff -r VON -r NACH | patch -p0außer, dass bei diesem Kommando monotones Vereinigungs-Algorithmus\n"
+"Das Ergebnis dieses Kommandos ist identisch zur Ausführung von\n"
+" mtn diff -r VON -r BIS | patch -p0\n"
+"außer, dass bei diesem Kommando monotones Vereinigungs-Algorithmus\n"
 "zur Anwendung kommt, welcher Umbenennungen, Konflikte u.a.\n"
 "intelligent handhabt.\n"
 "\n"