From: David Aguilar <davvid@gmail.com>
To: Paul Mackerras <paulus@ozlabs.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH] gitk: remove translated message from comments
Date: Tue, 17 Jan 2017 19:52:45 -0800 [thread overview]
Message-ID: <20170118035245.1757-1-davvid@gmail.com> (raw)
In-Reply-To: <xmqq4m0xpmbz.fsf@gitster.mtv.corp.google.com>
"make update-po" fails because a previously untranslated string
has now been translated:
Updating po/sv.po
po/sv.po:1388: duplicate message definition...
po/sv.po:380: ...this is the location of the first definition
Remove the duplicate message definition.
Reported-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
---
po/sv.po | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/po/sv.po b/po/sv.po
index 32fc752..2a06fe5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1385,21 +1385,6 @@ msgstr "Felaktiga argument till gitk:"
#~ msgid "mc"
#~ msgstr "mc"
-#~ msgid ""
-#~ "\n"
-#~ "Gitk - a commit viewer for git\n"
-#~ "\n"
-#~ "Copyright © 2005-2016 Paul Mackerras\n"
-#~ "\n"
-#~ "Use and redistribute under the terms of the GNU General Public License"
-#~ msgstr ""
-#~ "\n"
-#~ "Gitk - en incheckningsvisare för git\n"
-#~ "\n"
-#~ "Copyright © 2005-2016 Paul Mackerras\n"
-#~ "\n"
-#~ "Använd och vidareförmedla enligt villkoren i GNU General Public License"
-
#~ msgid "next"
#~ msgstr "nästa"
--
2.11.0.536.gaf746e49c2
next prev parent reply other threads:[~2017-01-18 3:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-01 17:03 gitk: "lime" color incompatible with older Tk versions Andrew Janke
2016-05-02 16:20 ` Stefan Beller
2017-01-13 11:20 ` David Aguilar
2017-01-14 8:48 ` gitk pull request // was: " David Aguilar
2017-01-15 2:35 ` Junio C Hamano
2017-01-16 3:17 ` Paul Mackerras
2017-01-16 7:48 ` Junio C Hamano
2017-01-17 18:34 ` Junio C Hamano
2017-01-18 3:52 ` David Aguilar [this message]
2017-01-18 10:15 ` [PATCH] gitk: remove translated message from comments Paul Mackerras
2017-01-18 18:27 ` Junio C Hamano
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=20170118035245.1757-1-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=paulus@ozlabs.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.
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 NNTP newsgroup(s).