git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Paul Mackerras <paulus@ozlabs.org>
To: Christian Stimming <christian@cstimming.de>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH 1/2] gitk: re-generate German po file from current source code
Date: Mon, 13 Apr 2020 17:34:56 +1000	[thread overview]
Message-ID: <20200413073456.GC14888@blackberry> (raw)
In-Reply-To: <2527491.s4PuAgMcOf@ckiste>

On Mon, Feb 10, 2020 at 10:57:05PM +0100, Christian Stimming wrote:
> So that subsequent translation updates have an up-to-date
> starting point.
> 
> Signed-off-by: Christian Stimming <christian@cstimming.de>

I tried to apply this and the following patch, but this patch had a
lot of rejects.  For example, in this hunk:

> @@ -21,11 +21,11 @@ msgstr ""
>  msgid "Couldn't get list of unmerged files:"
>  msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:"

the u with umlaut appears as a single 0xfc byte, but in the file
po/de.po, it appears as a sequence of two bytes: 0xc3 0xbc, and so
patch considers that the lines don't match.  I have my locale set to
en_AU.UTF8.  Any ideas why the context in your patch would be
different to what I see in the checked-out file?

Paul.

  parent reply	other threads:[~2020-04-13  7:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-10 21:57 Christian Stimming
2020-02-10 21:58 ` [PATCH 2/2] gitk: update German translation Christian Stimming
2020-04-13  7:34 ` Paul Mackerras [this message]
2020-04-13 15:45   ` [PATCH 1/2] gitk: re-generate German po file from current source code Christian Stimming
2020-08-03 20:28   ` Christian Stimming

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=20200413073456.GC14888@blackberry \
    --to=paulus@ozlabs.org \
    --cc=christian@cstimming.de \
    --cc=git@vger.kernel.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 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).