From: Dmitry Potapov <dpotapov@gmail.com>
To: Alexey Shumkin <zapped@mail.ru>
Cc: git@vger.kernel.org, Alex Riesen <raa.lkml@gmail.com>
Subject: Re: [PATCH 2/3] git-gui: spelling fixes in russian translation
Date: Wed, 19 Jan 2011 03:07:36 +0300 [thread overview]
Message-ID: <20110119000735.GA29212@dpotapov.dyndns.org> (raw)
In-Reply-To: <loom.20110118T083048-91@post.gmane.org>
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
next prev parent reply other threads:[~2011-01-19 0:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1295295897.git.raa.lkml@gmail.com>
2011-01-17 21:08 ` [PATCH 1/3] fix git-gui russian translation typos Alex Riesen
[not found] ` <1c96343bbf6fb30e7453c3df7b49ea31667e0469.1295295897.git.raa.lkml@gmail.com>
2011-01-17 21:08 ` [PATCH 2/3] git-gui: spelling fixes in russian translation Alex Riesen
2011-01-18 7:40 ` Alexey Shumkin
2011-01-18 7:48 ` Alex Riesen
2011-01-19 0:07 ` Dmitry Potapov [this message]
2011-01-19 8:36 ` Alexey Shumkin
2011-01-19 10:04 ` Alex Riesen
2011-01-19 10:48 ` Dmitry Potapov
2011-01-19 21:01 ` [PATCH] git-gui: update " Alex Riesen
2011-01-24 23:57 ` Pat Thoyts
2011-01-25 0:34 ` Junio C Hamano
2011-01-27 11:39 ` Pat Thoyts
2011-01-24 20:06 ` [PATCH 2/3] git-gui: spelling fixes in " Alex Riesen
2011-01-24 23:31 ` Pat Thoyts
2011-01-25 0:24 ` Junio C Hamano
2011-01-25 7:57 ` Alex Riesen
2011-01-27 11:47 ` Pat Thoyts
2011-01-27 12:58 ` Alex Riesen
[not found] ` <eeaaba6d48de958b374cb06f1b12db3b8e0550ea.1295295897.git.raa.lkml@gmail.com>
2011-01-17 21:08 ` [PATCH 3/3] git-gui: update " Alex Riesen
2011-01-19 0:16 ` Dmitry Potapov
2011-01-19 9:55 ` Alex Riesen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110119000735.GA29212@dpotapov.dyndns.org \
--to=dpotapov@gmail.com \
--cc=git@vger.kernel.org \
--cc=raa.lkml@gmail.com \
--cc=zapped@mail.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.