#
#
# patch "cmd_conflicts.cc"
#  from [9aa0ed528a8ce15ffe0aa7399df492c106f55365]
#    to [62e726c9c01eafe340621f7932bd894b28a3c63f]
#
============================================================
--- cmd_conflicts.cc	9aa0ed528a8ce15ffe0aa7399df492c106f55365
+++ cmd_conflicts.cc	62e726c9c01eafe340621f7932bd894b28a3c63f
@@ -16,7 +16,7 @@ CMD_GROUP(conflicts, "conflicts", "", CM
 #include "roster_merge.hh"
 
 CMD_GROUP(conflicts, "conflicts", "", CMD_REF(tree),
-          N_("Commands for conflict resolutions."),
+          N_("Commands for conflict resolutions"),
           "");
 
 struct conflicts_t
@@ -344,7 +344,7 @@ CMD(show_first, "show_first", "", CMD_RE
 
 CMD(show_first, "show_first", "", CMD_REF(conflicts),
     "",
-    N_("Show the first unresolved conflict in the conflicts file, and possible resolutions."),
+    N_("Show the first unresolved conflict in the conflicts file, and possible resolutions"),
     "",
     options::opts::conflicts_opts)
 {
@@ -357,7 +357,7 @@ CMD(show_remaining, "show_remaining", ""
 
 CMD(show_remaining, "show_remaining", "", CMD_REF(conflicts),
     "",
-    N_("Show the remaining unresolved conflicts in the conflicts file."),
+    N_("Show the remaining unresolved conflicts in the conflicts file"),
     "",
     options::opts::conflicts_opts)
 {
@@ -370,7 +370,7 @@ CMD(resolve_first, "resolve_first", "", 
 
 CMD(resolve_first, "resolve_first", "", CMD_REF(conflicts),
     N_("RESOLUTION"),
-    N_("Set the resolution for the first unresolved single-file conflict."),
+    N_("Set the resolution for the first unresolved single-file conflict"),
     "",
     options::opts::conflicts_opts)
 {
@@ -384,7 +384,7 @@ CMD(resolve_first_left, "resolve_first_l
 
 CMD(resolve_first_left, "resolve_first_left", "", CMD_REF(conflicts),
     N_("RESOLUTION"),
-    N_("Set the left resolution for the first unresolved two-file conflict."),
+    N_("Set the left resolution for the first unresolved two-file conflict"),
     "",
     options::opts::conflicts_opts)
 {
@@ -398,7 +398,7 @@ CMD(resolve_first_right, "resolve_first_
 
 CMD(resolve_first_right, "resolve_first_right", "", CMD_REF(conflicts),
     N_("RESOLUTION"),
-    N_("Set the right resolution for the first unresolved two-file conflict."),
+    N_("Set the right resolution for the first unresolved two-file conflict"),
     "",
     options::opts::conflicts_opts)
 {
@@ -412,7 +412,7 @@ CMD(clean, "clean", "", CMD_REF(conflict
 
 CMD(clean, "clean", "", CMD_REF(conflicts),
     N_(""),
-    N_("Delete any bookkeeping files related to conflict resolution."),
+    N_("Delete any bookkeeping files related to conflict resolution"),
     "",
     options::opts::none)
 {