diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2011-01-19 22:01:32 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-01-24 23:46:38 +0000 |
| commit | 073291c476b4edb4d10bbada1e64b471ba153b6b (patch) | |
| tree | 7da77243ab8f484dbe776f5f115f23d99662ba06 | |
| parent | 75e88a592f018904dab4498344b8f0579a0a2cd5 (diff) | |
| download | git-073291c476b4edb4d10bbada1e64b471ba153b6b.tar.gz git-073291c476b4edb4d10bbada1e64b471ba153b6b.tar.xz | |
git-gui: update russian translation
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>
| -rw-r--r-- | po/ru.po | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1926,7 +1926,7 @@ msgstr "" #, tcl-format msgid "File %s seems to have unresolved conflicts, still stage?" msgstr "" -"Файл %s кажется содержит необработанные конфликты. Продолжить подготовку к " +"Файл %s, похоже, содержит необработанные конфликты. Продолжить подготовку к " "сохранению?" #: lib/mergetool.tcl:60 |