Mercurial > hg-stable
changeset 30256:819f96b82fa4 stable
shelve: add missing space in help text
The change is trivial and unlikely to have been translated so we update
translation files too.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Mon, 14 Nov 2016 22:43:25 +0100 |
parents | e0ff47999b13 |
children | b3b1ae98f6a0 64b55bffc1c0 |
files | hgext/shelve.py i18n/ja.po i18n/pt_BR.po tests/test-shelve.t |
diffstat | 4 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/shelve.py Sun Nov 13 06:12:22 2016 +0900 +++ b/hgext/shelve.py Mon Nov 14 22:43:25 2016 +0100 @@ -865,7 +865,7 @@ files. If specific files or directories are named, only changes to those files are shelved. - In bare shelve(when no files are specified, without interactive, + In bare shelve (when no files are specified, without interactive, include and exclude option), shelving remembers information if the working directory was on newly created branch, in other words working directory was on different branch than its first parent. In this
--- a/i18n/ja.po Sun Nov 13 06:12:22 2016 +0900 +++ b/i18n/ja.po Mon Nov 14 22:43:25 2016 +0100 @@ -10464,7 +10464,7 @@ " 指定対象の変更のみが退避されます。" msgid "" -" In bare shelve(when no files are specified, without interactive,\n" +" In bare shelve (when no files are specified, without interactive,\n" " include and exclude option), shelving remembers information if the\n" " working directory was on newly created branch, in other words working\n" " directory was on different branch than its first parent. In this\n"
--- a/i18n/pt_BR.po Sun Nov 13 06:12:22 2016 +0900 +++ b/i18n/pt_BR.po Mon Nov 14 22:43:25 2016 +0100 @@ -10582,7 +10582,7 @@ " engavetadas." msgid "" -" In bare shelve(when no files are specified, without interactive,\n" +" In bare shelve (when no files are specified, without interactive,\n" " include and exclude option), shelving remembers information if the\n" " working directory was on newly created branch, in other words working\n" " directory was on different branch than its first parent. In this\n"
--- a/tests/test-shelve.t Sun Nov 13 06:12:22 2016 +0900 +++ b/tests/test-shelve.t Mon Nov 14 22:43:25 2016 +0100 @@ -36,7 +36,7 @@ specific files or directories are named, only changes to those files are shelved. - In bare shelve(when no files are specified, without interactive, include + In bare shelve (when no files are specified, without interactive, include and exclude option), shelving remembers information if the working directory was on newly created branch, in other words working directory was on different branch than its first parent. In this situation