summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 75e88a5)
raw | patch | inline | side by side (parent: 75e88a5)
author | Alex Riesen <raa.lkml@gmail.com> | |
Wed, 19 Jan 2011 21:01:32 +0000 (22:01 +0100) | ||
committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
Mon, 24 Jan 2011 23:46:38 +0000 (23:46 +0000) |
Improve the translation of warning given by mergetool when staging files with
conflict markers.
Suggested-by: Alexey Shumkin <zapped@mail.ru>
Tipping-vote-by: Dmitry Potapov <dpotapov@gmail.com>
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
conflict markers.
Suggested-by: Alexey Shumkin <zapped@mail.ru>
Tipping-vote-by: Dmitry Potapov <dpotapov@gmail.com>
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
po/ru.po | patch | blob | history |
diff --git a/po/ru.po b/po/ru.po
index 7071a8cadf0a0d298f78e712cc6e87d0209d3c80..30f4b77dac08d9c69ea3d0009ec97d30b9349be8 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
#, tcl-format
msgid "File %s seems to have unresolved conflicts, still stage?"
msgstr ""
-"Файл %s кажется содержит необработанные конфликты. Продолжить подготовку к "
+"Файл %s, похоже, содержит необработанные конфликты. Продолжить подготовку к "
"сохранению?"
#: lib/mergetool.tcl:60