Signed-off-by: NDimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>

Signed-off-by: NDimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>

Signed-off-by: NDimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>

Signed-off-by: NDimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>

Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: N0xAX <kuleshovmail@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

"succeeded" was misspelled in the code, which propagated throughout the
 translations.

Fixed all of them.

Signed-off-by: Benjamin Kerensa <bkerensa <at> ubuntu.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Improve the translation of warning given by mergetool when staging files with
conflict markers.
Suggested-by: NAlexey Shumkin <zapped@mail.ru>
Tipping-vote-by: NDmitry Potapov <dpotapov@gmail.com>
Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NSkip <bsvskip@rambler.ru>
Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NSerge Ziryukin <ftrvxmtrx@gmail.com>
Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NSkip <bsvskip@rambler.ru>
Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

The script file uses utf-8 encoding but when sourced it will be read
using the default system encoding which is never utf8 on windows.
This causes the copyright symbol to display incorrectly in the about
dialog.  Using the unicode escape sequence avoids incorrect decoding
but does require a double escape in the .po files.

Also adjusted the year range.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

Thanks go to Dmitry Potapov for proofreading and suggested translation
of the word 'merge'.
Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Also, the previous translations of the words 'tag' and 'merge' were
changed. Added translation of the 'Tool' submenu.

Thanks go to Alexander Gavrilov and Dmitry Potapov for proofreading
and suggestions.
Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

Properly spell "successful" and slightly rewrite a couple of strings
that actually say the same thing in order to reduce translation work.

Update .pot and .po files accordingly since no new translation is
required.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

Fixed some spelling mistakes.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

In particular many screw-ups after po regeneration were fixed.
Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

The most important changes are:
- Git version cannot be determined... (lost in 57364320)
- git-gui: fatal error

Some changes need the second opinion (search for TOVERIFY), some changes are just copies (search for "carbon copy").
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

The setup wizard looks better if we layout the progress bar as
two lines:  the first line holds the message text and our text
formatting of the progress while the second line holds the bar
itself.  Both extend the full width of the window and we try to
pad out the message text so the window doesn't expand when the
completed progress number jumps to the next order of magnitude.

This change required updating the progress meter format string
to allow the application to supply the precision.  So we also
are updating all of the translations at once to use the newer
formatting string.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

Signed-off-by: NAlex Riesen <raa.lkml@gmail.com>
Signed-off-by: NIrina Riesen <irina.riesen@gmail.com>
Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>

Simplified Chinese, in UTF-8 encoding.
Signed-off-by: NXudong Guan <xudong.guan@gmail.com>
Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>

Usually, generated files are not part of the tracked content in
a project.  However, translators may lack the tools to generate
git-gui.pot.  Besides, it is possible that a contributor does
not even check out the repository, but gets this file via gitweb.

Pointed out by Junio.
Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>