Improve the translation of warning given by mergetool when staging files with conflict markers. Suggested-by: Alexey Shumkin <zapped@xxxxxxx> Tipping-vote-by: Dmitry Potapov <dpotapov@xxxxxxxxx> Signed-off-by: Alex Riesen <raa.lkml@xxxxxxxxx> --- On Wed, 19 Jan 2011 13:48:56 +0300, Dmitry Potapov wrote: > On Wed, Jan 19, 2011 at 08:36:32AM +0000, Alexey Shumkin wrote: >> So, I agree sentence must rephrased but supposition must be retained. >> Something like "ÐÐÐÐ %s, ÐÐÑÐÐÐ, ÑÐÐÐÑÐÐÑ ÐÐÑÐÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ" > > I like this one. So be it. Please, apply on top of the previously sent patches. po/ru.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ru.po b/po/ru.po index 7071a8c..30f4b77 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1926,7 +1926,7 @@ msgstr "" #, tcl-format msgid "File %s seems to have unresolved conflicts, still stage?" msgstr "" -"ÐÐÐÐ %s ÐÐÐÐÑÑÑ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÐÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ. ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐÐÐÑ Ð " +"ÐÐÐÐ %s, ÐÐÑÐÐÐ, ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÐÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ. ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐÐÐÑ Ð " "ÑÐÑÑÐÐÐÐÐÑ?" #: lib/mergetool.tcl:60 -- 1.7.4.rc2.25.g62eb -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html