From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH 04/13] gettextize: git-add basic messages Date: Wed, 1 Sep 2010 20:43:56 +0000 Message-ID: <1283373845-2022-5-git-send-email-avarab@gmail.com> References: <1283373845-2022-1-git-send-email-avarab@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Sep 01 22:45:30 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OquBR-000790-N3 for gcvg-git-2@lo.gmane.org; Wed, 01 Sep 2010 22:45:26 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754505Ab0IAUoi convert rfc822-to-quoted-printable (ORCPT ); Wed, 1 Sep 2010 16:44:38 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:48595 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753964Ab0IAUog (ORCPT ); Wed, 1 Sep 2010 16:44:36 -0400 Received: by ewy23 with SMTP id 23so4641990ewy.19 for ; Wed, 01 Sep 2010 13:44:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=rt1n414S8sQN6X5F52xRgEHHgusJ0UM3tPb6M+sDNqU=; b=sHm6qDtZ69Bfr0Zn838M2sWfpUqWV4LW5pm+2NDFmh/ir4eGQEGiB9HQrvGxsfSj6z xw32fQJre3bWRQu2RkhtRHwV3UTWaVskNfAA3cL/hPxiltPhl1EFahhx2uK4uFz5iAG3 /KS1p9AzzqIFktxTRtYHl5wjUrLsRKLqrDyBk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=poKOv9TcwGDG1XP2GkXrBfMC+CCcXa59rHtRT918NKcX/xsdeU43n3No1iS+oqONI7 xPm6MaAZ2aSNFApotAWxWM3wm/FSiSpaOr7ArcT8TVRk+RB9LHfGQuJhFIFZMdx87x0K 7S1nnz+cjt1Jf1Vt4RoKbNlq1blunb4pJpqpA= Received: by 10.216.35.74 with SMTP id t52mr8406735wea.41.1283373874363; Wed, 01 Sep 2010 13:44:34 -0700 (PDT) Received: from v.nix.is (v.nix.is [109.74.193.250]) by mx.google.com with ESMTPS id v11sm6461150weq.16.2010.09.01.13.44.33 (version=SSLv3 cipher=RC4-MD5); Wed, 01 Sep 2010 13:44:33 -0700 (PDT) X-Mailer: git-send-email 1.7.2.2.579.g2183d In-Reply-To: <1283373845-2022-1-git-send-email-avarab@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason --- builtin/add.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index 56a4e0a..6578cdd 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -38,7 +38,7 @@ static void update_callback(struct diff_queue_struct = *q, const char *path =3D p->one->path; switch (p->status) { default: - die("unexpected diff status %c", p->status); + die(_("unexpected diff status %c"), p->status); case DIFF_STATUS_UNMERGED: /* * ADD_CACHE_IGNORE_REMOVAL is unset if "git @@ -64,7 +64,7 @@ static void update_callback(struct diff_queue_struct = *q, case DIFF_STATUS_TYPE_CHANGED: if (add_file_to_index(&the_index, path, data->flags)) { if (!(data->flags & ADD_CACHE_IGNORE_ERRORS)) - die("updating files failed"); + die(_("updating files failed")); data->add_errors++; } break; @@ -74,7 +74,7 @@ static void update_callback(struct diff_queue_struct = *q, if (!(data->flags & ADD_CACHE_PRETEND)) remove_file_from_index(&the_index, path); if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE)) - printf("remove '%s'\n", path); + printf(_("remove '%s'\n"), path); break; } } @@ -172,7 +172,7 @@ static void treat_gitlinks(const char **pathspec) /* strip trailing slash */ pathspec[j] =3D xstrndup(ce->name, len); else - die ("Path '%s' is in submodule '%.*s'", + die (_("Path '%s' is in submodule '%.*s'"), pathspec[j], len, ce->name); } } @@ -191,7 +191,7 @@ static void refresh(int verbose, const char **paths= pec) pathspec, seen, "Unstaged changes after refreshing the index:"= ); for (i =3D 0; i < specs; i++) { if (!seen[i]) - die("pathspec '%s' did not match any files", pathspec[i]); + die(_("pathspec '%s' did not match any files"), pathspec[i]); } free(seen); } @@ -205,7 +205,7 @@ static const char **validate_pathspec(int argc, con= st char **argv, const char *p for (p =3D pathspec; *p; p++) { if (has_symlink_leading_path(*p, strlen(*p))) { int len =3D prefix ? strlen(prefix) : 0; - die("'%s' is beyond a symbolic link", *p + len); + die(_("'%s' is beyond a symbolic link"), *p + len); } } } @@ -272,7 +272,7 @@ static int edit_patch(int argc, const char **argv, = const char *prefix) git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ =20 if (read_cache() < 0) - die ("Could not read the index"); + die (_("Could not read the index")); =20 init_revisions(&rev, prefix); rev.diffopt.context =3D 7; @@ -281,24 +281,24 @@ static int edit_patch(int argc, const char **argv= , const char *prefix) rev.diffopt.output_format =3D DIFF_FORMAT_PATCH; out =3D open(file, O_CREAT | O_WRONLY, 0644); if (out < 0) - die ("Could not open '%s' for writing.", file); + die (_("Could not open '%s' for writing."), file); rev.diffopt.file =3D xfdopen(out, "w"); rev.diffopt.close_file =3D 1; if (run_diff_files(&rev, 0)) - die ("Could not write patch"); + die (_("Could not write patch")); =20 launch_editor(file, NULL, NULL); =20 if (stat(file, &st)) - die_errno("Could not stat '%s'", file); + die_errno(_("Could not stat '%s'"), file); if (!st.st_size) - die("Empty patch. Aborted."); + die(_("Empty patch. Aborted.")); =20 memset(&child, 0, sizeof(child)); child.git_cmd =3D 1; child.argv =3D apply_argv; if (run_command(&child)) - die ("Could not apply '%s'", file); + die (_("Could not apply '%s'"), file); =20 unlink(file); return 0; @@ -346,14 +346,14 @@ static int add_files(struct dir_struct *dir, int = flags) fprintf(stderr, ignore_error); for (i =3D 0; i < dir->ignored_nr; i++) fprintf(stderr, "%s\n", dir->ignored[i]->name); - fprintf(stderr, "Use -f if you really want to add them.\n"); - die("no files added"); + fprintf(stderr, _("Use -f if you really want to add them.\n")); + die(_("no files added")); } =20 for (i =3D 0; i < dir->nr; i++) if (add_file_to_cache(dir->entries[i]->name, flags)) { if (!ignore_add_errors) - die("adding files failed"); + die(_("adding files failed")); exit_status =3D 1; } return exit_status; @@ -385,9 +385,9 @@ int cmd_add(int argc, const char **argv, const char= *prefix) argv++; =20 if (addremove && take_worktree_changes) - die("-A and -u are mutually incompatible"); + die(_("-A and -u are mutually incompatible")); if (!show_only && ignore_missing) - die("Option --ignore-missing can only be used together with --dry-ru= n"); + die(_("Option --ignore-missing can only be used together with --dry-= run")); if ((addremove || take_worktree_changes) && !argc) { static const char *here[2] =3D { ".", NULL }; argc =3D 1; @@ -407,14 +407,14 @@ int cmd_add(int argc, const char **argv, const ch= ar *prefix) ? ADD_CACHE_IGNORE_REMOVAL : 0)); =20 if (require_pathspec && argc =3D=3D 0) { - fprintf(stderr, "Nothing specified, nothing added.\n"); - fprintf(stderr, "Maybe you wanted to say 'git add .'?\n"); + fprintf(stderr, _("Nothing specified, nothing added.\n")); + fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n")); return 0; } pathspec =3D validate_pathspec(argc, argv, prefix); =20 if (read_cache() < 0) - die("index file corrupt"); + die(_("index file corrupt")); treat_gitlinks(pathspec); =20 if (add_new_files) { @@ -449,7 +449,7 @@ int cmd_add(int argc, const char **argv, const char= *prefix) if (excluded(&dir, pathspec[i], DT_UNKNOWN)) dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i])); } else - die("pathspec '%s' did not match any files", + die(_("pathspec '%s' did not match any files"), pathspec[i]); } } @@ -465,7 +465,7 @@ int cmd_add(int argc, const char **argv, const char= *prefix) if (active_cache_changed) { if (write_cache(newfd, active_cache, active_nr) || commit_locked_index(&lock_file)) - die("Unable to write new index file"); + die(_("Unable to write new index file")); } =20 return exit_status; --=20 1.7.2.2.579.g2183d