Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-25 12:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into documentation-update

Browse source
This commit is contained in:
Mark Griffiths 2014-09-07 16:37:31 +01:00
parent f1bd2b823d
commit aed92b9a2c
5 changed files with 14432 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored
View file

@ -1,5 +1,6 @@
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
/build_tools/make_svn_completions.fish export-ignore
/build_tools/description-pak export-ignore
/build_tools/make_hg_completions.fish export-ignore

2
build_tools/make_tarball.sh
View file

@ -30,7 +30,7 @@ path=~/fish_built/$prefix.tar
rm -f "$path" "$path".gz
# git starts the archive
git archive --format=tar --prefix="$prefix"/ master > "$path"
git archive --format=tar --prefix="$prefix"/ HEAD > "$path"
# tarball out the documentation, generate a configure script and version file
# Don't use autoreconf since it invokes commands that may not be installed, like aclocal

8
pager.cpp
View file

@ -606,21 +606,21 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co
if (rendering->remaining_to_disclose == 1)
{
/* I don't expect this case to ever happen */
progress_text = format_string(L"%lsand 1 more row", ellipsis_string);
progress_text = format_string(_(L"%lsand 1 more row"), ellipsis_string);
}
else if (rendering->remaining_to_disclose > 1)
{
progress_text = format_string(L"%lsand %lu more rows", ellipsis_string, (unsigned long)rendering->remaining_to_disclose);
progress_text = format_string(_(L"%lsand %lu more rows"), ellipsis_string, (unsigned long)rendering->remaining_to_disclose);
}
else if (start_row > 0 || stop_row < row_count)
{
/* We have a scrollable interface. The +1 here is because we are zero indexed, but want to present things as 1-indexed. We do not add 1 to stop_row or row_count because these are the "past the last value" */
progress_text = format_string(L"rows %lu to %lu of %lu", start_row + 1, stop_row, row_count);
progress_text = format_string(_(L"rows %lu to %lu of %lu"), start_row + 1, stop_row, row_count);
}
else if (completion_infos.empty() && ! unfiltered_completion_infos.empty())
{
/* Everything is filtered */
progress_text = L"(no matches)";
progress_text = _(L"(no matches)");
}
if (! progress_text.empty())

14425
po/pt_BR.po Normal file
View file

File diff suppressed because it is too large Load diff

2
share/functions/__fish_complete_subcommand_root.fish
View file

@ -1,6 +1,6 @@
function __fish_complete_subcommand_root -d "Run the __fish_complete_subcommand function using a PATH containing /sbin and /usr/sbin"
set -lx PATH /sbin /usr/sbin $PATH
set -lx PATH /sbin /usr/sbin $PATH ^/dev/null
__fish_complete_subcommand $argv
end