Browse Source

i18n: stash: mark messages for translation

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Vasco Almeida 8 years ago committed by Junio C Hamano
parent
commit
850251f33b
  1. 6
      git-stash.sh

6
git-stash.sh

@ -100,7 +100,7 @@ create_stash () {
u_tree=$(git write-tree) && u_tree=$(git write-tree) &&
printf 'untracked files on %s\n' "$msg" | git commit-tree $u_tree && printf 'untracked files on %s\n' "$msg" | git commit-tree $u_tree &&
rm -f "$TMPindex" rm -f "$TMPindex"
) ) || die "Cannot save the untracked files" ) ) || die "$(gettext "Cannot save the untracked files")"


untracked_commit_option="-p $u_commit"; untracked_commit_option="-p $u_commit";
else else
@ -248,7 +248,7 @@ save_stash () {


if test -n "$patch_mode" && test -n "$untracked" if test -n "$patch_mode" && test -n "$untracked"
then then
die "Can't use --patch and --include-untracked or --all at the same time" die "$(gettext "Can't use --patch and --include-untracked or --all at the same time")"
fi fi


stash_msg="$*" stash_msg="$*"
@ -494,7 +494,7 @@ apply_stash () {
GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" && GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" &&
GIT_INDEX_FILE="$TMPindex" git checkout-index --all && GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
rm -f "$TMPindex" || rm -f "$TMPindex" ||
die 'Could not restore untracked files from stash' die "$(gettext "Could not restore untracked files from stash")"
fi fi


eval " eval "

Loading…
Cancel
Save