i18n: git-pull die messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
May 21, 2011 at 18:43 UTC
85af5f82a67f87c7c6054572729a48d2182c72d4
1 file changed
+9
-9
git-pull.sh
+9
-9
@@ -18,20 +18,20 @@ cd_to_toplevel
18
die_conflict () {
19
git diff-index --cached --name-status -r --ignore-submodules HEAD --
20
if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
21
- die "Pull is not possible because you have unmerged files.
21
+ die "$(gettext "Pull is not possible because you have unmerged files.
22
Please, fix them up in the work tree, and then use 'git add/rm <file>'
23
-as appropriate to mark resolution, or use 'git commit -a'."
23
+as appropriate to mark resolution, or use 'git commit -a'.")"
24
else
25
- die "Pull is not possible because you have unmerged files."
25
+ die "$(gettext "Pull is not possible because you have unmerged files.")"
26
fi
27
}
28
29
die_merge () {
30
if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
31
- die "You have not concluded your merge (MERGE_HEAD exists).
32
-Please, commit your changes before you can merge."
31
+ die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
32
+Please, commit your changes before you can merge.")"
33
else
34
- die "You have not concluded your merge (MERGE_HEAD exists)."
34
+ die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
35
fi
36
}
37
@@ -186,7 +186,7 @@ test true = "$rebase" && {
186
# On an unborn branch
187
if test -f "$GIT_DIR/index"
188
then
189
- die "updating an unborn branch with changes added to the index"
189
+ die "$(gettext "updating an unborn branch with changes added to the index")"
190
fi
191
else
192
require_clean_work_tree "pull with rebase" "Please commit or stash them."
@@ -242,11 +242,11 @@ case "$merge_head" in
242
?*' '?*)
243
if test -z "$orig_head"
244
then
245
- die "Cannot merge multiple branches into empty head"
245
+ die "$(gettext "Cannot merge multiple branches into empty head")"
246
fi
247
if test true = "$rebase"
248
then
249
- die "Cannot rebase onto multiple branches"
249
+ die "$(gettext "Cannot rebase onto multiple branches")"
250
fi
251
;;
252
esac