[[[
Fixed indentation of the translated merge conflict resolution menu.

* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_handler):
  The code didn't respect that translations of "Select: " could have another
  length than 8 (the English one). That's why further shortcuts were wrongly
  aligned.
]]]

Index: subversion/svn/conflict-callbacks.c
===================================================================
--- subversion/svn/conflict-callbacks.c	(Revision 31602)
+++ subversion/svn/conflict-callbacks.c	(Arbeitskopie)
@@ -427,8 +427,16 @@
         {
           svn_pool_clear(subpool);
 
-          prompt = apr_pstrdup(subpool, _("Select: (p) postpone"));
+          char *indentation = apr_pstrdup(subpool, "");
+          int i;
+          // FIXME: strlen() is too large for multi-byte streams! How to
+          // count characters (not bytes)?
+          for (i=0; i<strlen(_("Select: ")); ++i)
+            indentation = apr_pstrcat(subpool, indentation, " ", NULL);
 
+          prompt = apr_pstrdup(subpool, _("Select: "));
+          prompt = apr_pstrcat(subpool, prompt, _("(p) postpone"), NULL);
+
           if (diff_allowed)
             {
               prompt = apr_pstrcat(subpool, prompt,
@@ -441,23 +449,29 @@
 
               if (! desc->is_binary &&
                   desc->kind != svn_wc_conflict_kind_property)
-                prompt = apr_pstrcat(subpool, prompt,
-                                     _(",\n        (mc) mine-conflict, "
-                                       "(tc) theirs-conflict"),
-                                     NULL);
+                {
+                  prompt = apr_pstrcat(subpool, prompt, _(",\n"), NULL);
+                  prompt = apr_pstrcat(subpool, prompt, indentation, NULL);
+                  prompt = apr_pstrcat(subpool, prompt,
+                                       _("(mc) mine-conflict, "
+                                         "(tc) theirs-conflict"),
+                                       NULL);
+                }
             }
           else
             {
               if (knows_something)
                 prompt = apr_pstrcat(subpool, prompt, _(", (r) resolved"),
                                      NULL);
+              prompt = apr_pstrcat(subpool, prompt, _(",\n"), NULL);
+              prompt = apr_pstrcat(subpool, prompt, indentation, NULL);
               prompt = apr_pstrcat(subpool, prompt,
-                                   _(",\n        "
-                                     "(mf) mine-full, (tf) theirs-full"),
+                                   _("(mf) mine-full, (tf) theirs-full"),
                                    NULL);
             }
 
-          prompt = apr_pstrcat(subpool, prompt, ",\n        ", NULL);
+          prompt = apr_pstrcat(subpool, prompt, _(",\n"), NULL);
+          prompt = apr_pstrcat(subpool, prompt, indentation, NULL);
           prompt = apr_pstrcat(subpool, prompt,
                                _("(s) show all options: "),
                                NULL);