Join strings marked for translation since that would facilitate and
improve translations result.
Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt>
---
git-submodule.sh | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 5b9674a..f72b237 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -239,14 +239,15 @@ Use -f if you really want to add it." >&2
then
if test -z "$force"
then
- echo >&2 "$(eval_gettext "A git directory for
'\$sm_name' is found locally with remote(s):")"
+ eval_gettextln >&2 "A git directory for
'\$sm_name' is found locally with remote(s):"
GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=.
git remote -v | grep '(fetch)' | sed -e s,^," ", -e s,' (fetch)',, >&2
- echo >&2 "$(eval_gettext "If you want to reuse
this local git directory instead of cloning again from")"
- echo >&2 " $realrepo"
- echo >&2 "$(eval_gettext "use the '--force'
option. If the local git directory is not the correct repo")"
- die "$(eval_gettext "or you are unsure what
this means choose another name with the '--name' option.")"
+ die "$(eval_gettextln "\
+If you want to reuse this local git directory instead of cloning again from
+ \$realrepo
+use the '--force' option. If the local git directory is not the correct repo
+or you are unsure what this means choose another name with the '--name'
option.")"
else
- echo "$(eval_gettext "Reactivating local git
directory for submodule '\$sm_name'.")"
+ eval_gettextln "Reactivating local git
directory for submodule '\$sm_name'."
fi
fi
git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix
"$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo"
${reference:+"$reference"} ${depth:+"$depth"} || exit
@@ -437,8 +438,9 @@ cmd_deinit()
# Protect submodules containing a .git directory
if test -d "$sm_path/.git"
then
- echo >&2 "$(eval_gettext "Submodule work tree
'\$displaypath' contains a .git directory")"
- die "$(eval_gettext "(use 'rm -rf' if you
really want to remove it including all of its history)")"
+ die "$(eval_gettext "\
+Submodule work tree '\$displaypath' contains a .git directory
+(use 'rm -rf' if you really want to remove it including all of its history)")"
fi
if test -z "$force"
--
2.6.6
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
