Dmitry Potapov <dpotapov <at> gmail.com> writes: > > On Tue, Jan 18, 2011 at 07:40:05AM +0000, Alexey Shumkin wrote: > > change this > > > #, tcl-format > > > msgid "File %s seems to have unresolved conflicts, still stage?" > > > msgstr "" > > +"ÐÐÐÐ %s ÐÐÐÐÑÑÑ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÐÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ. > > ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐÐÐÑ Ð " > > "ÑÐÑÑÐÐÐÐÐÑ?" > > to > > +"ÐÐÐÐ %s, ÐÐÐÐÑÑÑ, ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÐÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ. > > ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐÐÐÑ Ð " > > "ÑÐÑÑÐÐÐÐÐÑ?" > > > > "ÐÐÐÐÑÑÑ" - ÐÐÐÐÐÐÐ ÑÐÐÐÐ, ÐÐÐÑÐÐÐÑÐÑÑÑ ÐÐÐÑÑÑÐÐ > > In the above sentence, 'ÐÐÐÐÑÑÑ' is not an introductory word, and thus > no comma is required. For details, see #2 at > http://ru.wiktionary.org/wiki/%D0%BA%D0%B0%D0%B6%D0%B5%D1%82%D1%81%D1%8F > > However, such use of 'ÐÐÐÐÑÑÑ' is more appropriate for colloquial speech > than for documentation or even computer messages. Also, I have never seen > 'unresolved conflicts' being translated as 'ÐÐÐÐÑÐÐÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ'. > IMHO, the standard term is 'ÐÐÑÐÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ'. So my suggestion is: > > ÐÐÐÐ %s ÐÐÐÐÑ ÑÐÐÐÑÐÐÑÑ ÐÐÑÐÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ. > > Dmitry > As I understand exact meaning of phrase "File %s seems to have unresolved conflicts" (note *seems* word here) is a supposition. It is not an equivalent of "may have" (but "may not have"). So, I agree sentence must rephrased but supposition must be retained. Something like "ÐÐÐÐ %s, ÐÐÑÐÐÐ, ÑÐÐÐÑÐÐÑ ÐÐÑÐÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ" or "ÐÐÐÐ %s, ÐÐÐÐÐÐ, ÑÐÐÐÑÐÐÑ ÐÐÑÐÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ" or better "ÐÑÐÐÐÐÐÐÐÐÑÐÐÑÐÐ ÑÐÐÐ %s ÑÐÐÐÑÐÐÑ ÐÐÑÐÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ" (stay official but supposing) -- 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