i18n: submodule: join strings marked for translation
Join strings marked for translation since that would facilitate and improve translations result. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vasco Almeida committed
Jun 17, 2016 at 21:54 UTC
0d71dbfd507305f47660bed912a5e52cbf8afc16
1 file changed
+10
-8
git-submodule.sh
+10
-8
@@ -274,14 +274,15 @@ Use -f if you really want to add it." >&2
274
then
275
if test -z "$force"
276
then
277
- echo >&2 "$(eval_gettext "A git directory for '\$sm_name' is found locally with remote(s):")"
277
+ eval_gettextln >&2 "A git directory for '\$sm_name' is found locally with remote(s):"
278
GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^," ", -e s,' (fetch)',, >&2
279
- echo >&2 "$(eval_gettext "If you want to reuse this local git directory instead of cloning again from")"
280
- echo >&2 " $realrepo"
281
- echo >&2 "$(eval_gettext "use the '--force' option. If the local git directory is not the correct repo")"
282
- die "$(eval_gettext "or you are unsure what this means choose another name with the '--name' option.")"
279
+ die "$(eval_gettextln "\
280
+If you want to reuse this local git directory instead of cloning again from
281
+ \$realrepo
282
+use the '--force' option. If the local git directory is not the correct repo
283
+or you are unsure what this means choose another name with the '--name' option.")"
284
else
284
- echo "$(eval_gettext "Reactivating local git directory for submodule '\$sm_name'.")"
285
+ eval_gettextln "Reactivating local git directory for submodule '\$sm_name'."
286
fi
287
fi
288
git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${depth:+"$depth"} || exit
@@ -466,8 +467,9 @@ cmd_deinit()
467
# Protect submodules containing a .git directory
468
if test -d "$sm_path/.git"
469
then
469
- echo >&2 "$(eval_gettext "Submodule work tree '\$displaypath' contains a .git directory")"
470
- die "$(eval_gettext "(use 'rm -rf' if you really want to remove it including all of its history)")"
470
+ die "$(eval_gettext "\
471
+Submodule work tree '\$displaypath' contains a .git directory
472
+(use 'rm -rf' if you really want to remove it including all of its history)")"
473
fi
474
475
if test -z "$force"