Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
i18n: stash: mark messages for translation
author
Vasco Almeida
<vascomalmeida@sapo.pt>
Mon, 19 Sep 2016 13:08:21 +0000
(13:08 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 21 Sep 2016 17:20:43 +0000
(10:20 -0700)
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-stash.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
c041c6d
)
diff --git
a/git-stash.sh
b/git-stash.sh
index 826af183d489d06468f03ee8002e05da0d7ffd34..90d63f293e8359f63a3c2350850fcad17de2b455 100755
(executable)
--- a/
git-stash.sh
+++ b/
git-stash.sh
@@
-100,7
+100,7
@@
create_stash () {
u_tree=$(git write-tree) &&
printf 'untracked files on %s\n' "$msg" | git commit-tree $u_tree &&
rm -f "$TMPindex"
u_tree=$(git write-tree) &&
printf 'untracked files on %s\n' "$msg" | git commit-tree $u_tree &&
rm -f "$TMPindex"
- ) ) || die "
Cannot save the untracked files
"
+ ) ) || die "
$(gettext "Cannot save the untracked files")
"
untracked_commit_option="-p $u_commit";
else
untracked_commit_option="-p $u_commit";
else
@@
-248,7
+248,7
@@
save_stash () {
if test -n "$patch_mode" && test -n "$untracked"
then
if test -n "$patch_mode" && test -n "$untracked"
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
stash_msg="$*"
fi
stash_msg="$*"
@@
-494,7
+494,7
@@
apply_stash () {
GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" &&
GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
rm -f "$TMPindex" ||
GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" &&
GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
rm -f "$TMPindex" ||
- die
'Could not restore untracked files from stash'
+ die
"$(gettext "Could not restore untracked files from stash")"
fi
eval "
fi
eval "