From: Alex Riesen <raa.lkml@gmail.com>
To: git@vger.kernel.org
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
Pat Thoyts <patthoyts@users.sourceforge.net>,
Serge Ziryukin <ftrvxmtrx@gmail.com>,
Dmitry Potapov <dpotapov@gmail.com>,
Alexander Gavrilov <angavrilov@gmail.com>
Subject: [PATCH] git-gui: update russian translation
Date: Wed, 19 Jan 2011 22:01:32 +0100 [thread overview]
Message-ID: <20110119210131.GA8184@blimp.localdomain> (raw)
In-Reply-To: <20110119104856.GA5473@dpotapov.dyndns.org>
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>
---
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
next prev parent reply other threads:[~2011-01-19 21:01 UTC|newest]
Thread overview: 34+ 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
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 ` Alex Riesen [this message]
2011-01-24 23:57 ` [PATCH] git-gui: update " 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
2020-11-06 18:49 [PATCH] git-gui: update Russian translation Dimitriy Ryazantcev
2020-11-18 11:02 ` Dimitriy
2020-11-18 12:28 ` Pratyush Yadav
2020-11-18 15:27 ` Dimitriy
2020-11-18 17:43 ` Pratyush Yadav
2020-12-01 19:24 ` Pratyush Yadav
[not found] <1444730020-12292-1-git-send-email-dimitriy.ryazantcev@gmail.com>
[not found] ` <1444730020-12292-2-git-send-email-dimitriy.ryazantcev@gmail.com>
2015-10-14 10:44 ` [PATCH] git-gui: Update " Pat Thoyts
-- strict thread matches above, loose matches on Subject: below --
2015-10-12 11:41 Dimitriy Ryazantcev
2015-10-12 11:41 ` Dimitriy Ryazantcev
2009-06-30 20:37 [PATCH] Limited git-gui to displaying 5000 new files Dan Zwell
2009-08-10 15:38 ` Shawn O. Pearce
2009-08-11 18:23 ` [PATCH] Limit git-gui to display a maximum number of files Dan Zwell
2009-08-11 20:29 ` Shawn O. Pearce
2009-08-11 18:50 ` Dan Zwell
2009-08-12 14:43 ` Shawn O. Pearce
2009-08-12 15:24 ` [PATCH] git-gui: Update russian translation Alex Riesen
2009-08-12 15:40 ` Shawn O. Pearce
2009-08-12 15:51 ` Dan Zwell
2008-03-14 13:03 [PATCH] Update Japanese translation しらいしななこ
2008-03-14 22:25 ` [PATCH] git-gui: update russian translation 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110119210131.GA8184@blimp.localdomain \
--to=raa.lkml@gmail.com \
--cc=angavrilov@gmail.com \
--cc=dpotapov@gmail.com \
--cc=ftrvxmtrx@gmail.com \
--cc=git@vger.kernel.org \
--cc=patthoyts@users.sourceforge.net \
--cc=spearce@spearce.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).