Vasco Almeida 8785c42532 i18n: advice: internationalize message for conflicts ... Mark message for translation telling the user she has conflicts to resolve. Expose each particular use case, in order to enable translating entire sentences which would facilitate translating into other languages. Change "Pull" to lowercase to match other instances. Update test t5520-pull.sh, that relied on the old error message, to use the new one. Although we loose in source code conciseness, we would gain better translations because translators can 1) translate the entire sentence, including those terms concerning Git (committing, merging, etc) 2) have leeway to adapt to their languages. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2016-06-17 15:45:48 -07:00
..
add.c
am.c	builtin/am.c: use error_errno()	2016-05-09 12:29:08 -07:00
annotate.c
apply.c	Merge branch 'cc/apply'	2016-04-13 14:12:34 -07:00
archive.c
bisect--helper.c
blame.c	Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'	2016-04-13 14:12:41 -07:00
branch.c	Merge branch 'nd/worktree-various-heads'	2016-05-23 14:54:29 -07:00
bundle.c
cat-file.c
check-attr.c
check-ignore.c
check-mailmap.c
check-ref-format.c
checkout-index.c
checkout.c	Merge branch 'nd/worktree-various-heads'	2016-05-23 14:54:29 -07:00
clean.c
clone.c	Merge branch 'sb/clone-shallow-passthru'	2016-05-06 14:45:43 -07:00
column.c
commit-tree.c	Merge branch 'jc/commit-tree-ignore-commit-gpgsign'	2016-05-13 13:18:27 -07:00
commit.c	Merge branch 'pb/commit-verbose-config'	2016-05-23 14:54:32 -07:00
config.c	Merge branch 'jk/config-get-urlmatch' into maint	2016-04-14 18:57:43 -07:00
count-objects.c
credential.c
describe.c
diff-files.c	diff: run arguments through precompose_argv	2016-05-13 14:35:49 -07:00
diff-index.c	diff: run arguments through precompose_argv	2016-05-13 14:35:49 -07:00
diff-tree.c	Merge branch 'ar/diff-args-osx-precompose'	2016-05-23 14:54:35 -07:00
diff.c	Merge branch 'ar/diff-args-osx-precompose'	2016-05-23 14:54:35 -07:00
fast-export.c
fetch-pack.c
fetch.c	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
fmt-merge-msg.c
for-each-ref.c
fsck.c	fsck_head_link(): remove unneeded flag variable	2016-04-10 11:35:33 -07:00
gc.c
get-tar-commit-id.c
grep.c	Merge branch 'bc/object-id'	2016-05-06 14:45:44 -07:00
hash-object.c
help.c	builtin/help.c: use warning_errno()	2016-05-09 12:29:08 -07:00
index-pack.c	Merge branch 'va/i18n-misc-updates'	2016-05-17 14:38:23 -07:00
init-db.c	Merge branch 'jk/check-repository-format'	2016-04-13 14:12:28 -07:00
interpret-trailers.c
log.c	Merge branch 'xy/format-patch-base'	2016-05-23 14:54:31 -07:00
ls-files.c
ls-remote.c
ls-tree.c
mailinfo.c
mailsplit.c	builtin/mailsplit.c: use error_errno()	2016-05-09 12:29:08 -07:00
merge-base.c
merge-file.c	builtin/merge-file.c: use error_errno()	2016-05-09 12:29:08 -07:00
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c	struct name_entry: use struct object_id instead of unsigned char sha1[20]	2016-04-25 14:23:42 -07:00
merge.c	Merge branch 'en/merge-trivial-fix'	2016-04-25 15:17:15 -07:00
mktag.c
mktree.c
mv.c	Merge branch 'sb/mv-submodule-fix'	2016-04-29 12:59:07 -07:00
name-rev.c	Merge branch 'js/name-rev-use-oldest-ref'	2016-05-03 14:08:13 -07:00
notes.c	worktree.c: make find_shared_symref() return struct worktree *	2016-04-22 14:09:37 -07:00
pack-objects.c	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c
pull.c	i18n: advice: internationalize message for conflicts	2016-06-17 15:45:48 -07:00
push.c
read-tree.c
receive-pack.c	Merge branch 'dt/pre-refs-backend'	2016-04-25 15:17:15 -07:00
reflog.c	struct name_entry: use struct object_id instead of unsigned char sha1[20]	2016-04-25 14:23:42 -07:00
remote-ext.c	typofix: assorted typofixes in comments, documentation and messages	2016-05-06 13:16:37 -07:00
remote-fd.c
remote.c	i18n: builtin/remote.c: fix mark for translation	2016-06-17 15:45:47 -07:00
repack.c
replace.c	Merge branch 'js/replace-edit-use-editor-configuration'	2016-04-29 12:59:07 -07:00
rerere.c
reset.c
rev-list.c
rev-parse.c	Merge branch 'jk/rev-parse-local-env-vars' into maint	2016-04-14 18:57:44 -07:00
revert.c
rm.c	Merge branch 'nd/error-errno'	2016-05-17 14:38:28 -07:00
send-pack.c	Merge branch 'sk/send-pack-all-fix'	2016-04-13 14:12:33 -07:00
shortlog.c
show-branch.c
show-ref.c
stripspace.c
submodule--helper.c	Merge branch 'jk/submodule-c-credential'	2016-05-17 14:38:25 -07:00
symbolic-ref.c
tag.c	Merge branch 'st/verify-tag'	2016-04-29 12:59:09 -07:00
unpack-file.c
unpack-objects.c
update-index.c	builtin/update-index.c: prefer "err" to "errno" in process_lstat_error	2016-05-09 12:29:08 -07:00
update-ref.c
update-server-info.c
upload-archive.c	builtin/upload-archive.c: use error_errno()	2016-05-09 12:29:08 -07:00
var.c
verify-commit.c
verify-pack.c
verify-tag.c	verify-tag: move tag verification code to tag.c	2016-04-22 14:06:46 -07:00
worktree.c	Merge branch 'nd/worktree-various-heads'	2016-05-23 14:54:29 -07:00
write-tree.c