From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 13/25] gettextize: git-merge remaining cmd_merge messages
Date: Thu, 2 Sep 2010 19:40:34 +0000 [thread overview]
Message-ID: <1283456446-22577-14-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <1283373845-2022-1-git-send-email-avarab@gmail.com>
Translate "Already up-to-date.", "Fast-forward", "no commit created"
and other cmd_merge() messages.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/merge.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 9121c7b..ce831bf 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1078,7 +1078,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* If head can reach all the merge then we are up to date.
* but first the most common case of merging one remote.
*/
- finish_up_to_date("Already up-to-date.");
+ finish_up_to_date(_("Already up-to-date."));
return 0;
} else if (allow_fast_forward && !remoteheads->next &&
!common->next &&
@@ -1095,10 +1095,10 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
hex,
find_unique_abbrev(remoteheads->item->object.sha1,
DEFAULT_ABBREV));
- strbuf_addstr(&msg, "Fast-forward");
+ strbuf_addstr(&msg, _("Fast-forward"));
if (have_message)
strbuf_addstr(&msg,
- " (no commit created; -m option ignored)");
+ _(" (no commit created; -m option ignored)"));
o = peel_to_type(sha1_to_hex(remoteheads->item->object.sha1),
0, NULL, OBJ_COMMIT);
if (!o)
@@ -1156,7 +1156,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
}
}
if (up_to_date) {
- finish_up_to_date("Already up-to-date. Yeeah!");
+ finish_up_to_date(_("Already up-to-date. Yeeah!"));
return 0;
}
}
--
1.7.2.2.614.g1dc9
next prev parent reply other threads:[~2010-09-02 19:42 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-01 20:43 [PATCH 00/13] gettextize the first 4 C mainporcelain common commands Ævar Arnfjörð Bjarmason
2010-09-01 20:43 ` [PATCH 01/13] git-clone: use builtin.h to get gettext.h Ævar Arnfjörð Bjarmason
2010-09-01 20:43 ` [PATCH 02/13] gettextize: git-clone basic messages Ævar Arnfjörð Bjarmason
2010-09-01 20:43 ` [PATCH 03/13] gettextize: git-clone "Cloning into" message Ævar Arnfjörð Bjarmason
2010-09-01 20:43 ` [PATCH 04/13] gettextize: git-add basic messages Ævar Arnfjörð Bjarmason
2010-09-01 20:43 ` [PATCH 05/13] gettextize: git-add refresh_index message Ævar Arnfjörð Bjarmason
2010-09-02 4:21 ` Jonathan Nieder
2010-09-01 20:43 ` [PATCH 06/13] gettextize: git-branch basic messages Ævar Arnfjörð Bjarmason
2010-09-01 20:43 ` [PATCH 07/13] gettextize: git-branch "remote branch '%s' not found" message Ævar Arnfjörð Bjarmason
2010-09-01 20:44 ` [PATCH 08/13] gettextize: git-branch "git branch -v" messages Ævar Arnfjörð Bjarmason
2010-09-01 20:44 ` [PATCH 09/13] gettextize: git-branch "(no branch)" message Ævar Arnfjörð Bjarmason
2010-09-01 20:44 ` [PATCH 10/13] gettextize: git-checkout: our/their version message Ævar Arnfjörð Bjarmason
2010-09-01 20:44 ` [PATCH 11/13] gettextize: git-checkout basic messages Ævar Arnfjörð Bjarmason
2010-09-01 20:44 ` [PATCH 12/13] gettextize: git-checkout describe_detached_head messages Ævar Arnfjörð Bjarmason
2010-09-01 20:44 ` [PATCH 13/13] gettextize: git-checkout "Switched to a .. branch" message Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 00/25] [CONTINUED] gettextize all C mainporcelain common commands Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 01/25] gettextize: git-commit basic messages Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 02/25] gettextize: git-commit formatting messages Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 03/25] gettextize: git-commit advice messages Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 04/25] gettextize: git-diff basic messages Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 05/25] gettextize: git-fetch " Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 06/25] gettextize: git-fetch formatting messages Ævar Arnfjörð Bjarmason
2010-09-02 19:59 ` Jonathan Nieder
2010-09-02 20:13 ` Ævar Arnfjörð Bjarmason
2010-09-02 20:28 ` Jeff King
2010-09-02 20:48 ` Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 07/25] gettextize: git-grep basic messages Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 08/25] gettextize: git-log " Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 09/25] gettextize: git-format-patch --cover-letter message Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 10/25] gettextize: git-merge basic messages Ævar Arnfjörð Bjarmason
2010-09-02 20:09 ` Jonathan Nieder
2010-09-02 20:30 ` Ævar Arnfjörð Bjarmason
2010-09-02 20:37 ` Jonathan Nieder
2010-09-02 20:54 ` Ævar Arnfjörð Bjarmason
2010-09-02 21:13 ` Jonathan Nieder
2010-09-02 22:45 ` Ævar Arnfjörð Bjarmason
2010-09-02 23:04 ` Jonathan Nieder
2010-09-03 12:13 ` Ævar Arnfjörð Bjarmason
2010-09-03 17:51 ` Jonathan Nieder
2010-09-03 18:06 ` Ævar Arnfjörð Bjarmason
2010-09-03 13:01 ` Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 11/25] gettextize: git-merge "In-index merge" message Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 12/25] gettextize: git-merge "Merge made by %s." message Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` Ævar Arnfjörð Bjarmason [this message]
2010-09-02 19:40 ` [PATCH 14/25] gettextize: git-mv basic messages Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 15/25] gettextize: git-mv "bad" messages Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 16/25] gettextize: git-rm basic messages Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 17/25] builtin: use builtin.h in git-reset Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 18/25] gettextize: git-reset basic messages Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 19/25] gettextize: git-reset reset_type_names messages Ævar Arnfjörð Bjarmason
2010-09-15 11:17 ` Peter Krefting
2010-09-15 15:50 ` Thomas Rast
2010-09-02 19:40 ` [PATCH 20/25] gettextize: git-tag basic messages Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 21/25] gettextize: git-tag tag_template message Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 22/25] gettextize: git-push basic messages Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 23/25] builtin: use builtin.h in git-status Ævar Arnfjörð Bjarmason
2010-09-02 19:40 ` [PATCH 24/25] gettextize: git-status basic messages Ævar Arnfjörð Bjarmason
2010-09-02 20:28 ` Jonathan Nieder
2010-09-02 20:41 ` Ævar Arnfjörð Bjarmason
2010-09-02 20:47 ` Jonathan Nieder
2010-09-02 19:40 ` [PATCH 25/25] gettextize: git-status shortstatus messages Ævar Arnfjörð Bjarmason
2010-09-02 20:25 ` Jonathan Nieder
2010-09-02 20:34 ` Ævar Arnfjörð Bjarmason
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=1283456446-22577-14-git-send-email-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).