Mercurial > hg-stable
changeset 8668:aea3a23151bd
fixed typos found in translatable strings
This is from a spell-check of hg.pot.
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 31 May 2009 14:55:51 +0200 |
| parents | 594507755800 |
| children | 6f0f69da003e |
| files | hgext/color.py hgext/convert/__init__.py hgext/convert/gnuarch.py hgext/extdiff.py hgext/keyword.py hgext/win32mbcs.py mercurial/help.py tests/test-convert.out tests/test-keyword.out |
| diffstat | 9 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/color.py Sun May 31 14:53:46 2009 +0200 +++ b/hgext/color.py Sun May 31 14:55:51 2009 +0200 @@ -33,7 +33,7 @@ [extensions] color = -Default effects my be overriden from the .hgrc file: +Default effects my be overridden from the .hgrc file: [color] status.modified = blue bold underline red_background
--- a/hgext/convert/__init__.py Sun May 31 14:53:46 2009 +0200 +++ b/hgext/convert/__init__.py Sun May 31 14:55:51 2009 +0200 @@ -69,7 +69,7 @@ The 'include' directive causes a file, or all files under a directory, to be included in the destination repository, and the - exclusion of all other files and directories not explicitely included. + exclusion of all other files and directories not explicitly included. The 'exclude' directive causes files or directories to be omitted. The 'rename' directive renames a file or directory. To rename from a subdirectory into the root of the repository, use '.' as the @@ -120,7 +120,7 @@ in the sandbox to find the CVS repository, and then uses CVS rlog commands to find files to convert. This means that unless a filemap is given, all files under the starting directory will be - converted, and that any directory reorganisation in the CVS + converted, and that any directory reorganization in the CVS sandbox is ignored. Because CVS does not have changesets, it is necessary to collect @@ -171,9 +171,9 @@ its subdirectories are listed as possible branches. If "svn://repo/path/tags" exists, it is looked for tags referencing converted branches. Default "trunk", "branches" and "tags" values - can be overriden with following options. Set them to paths - relative to the source URL, or leave them blank to disable - autodetection. + can be overridden with following options. Set them to paths + relative to the source URL, or leave them blank to disable auto + detection. --config convert.svn.branches=branches (directory name) specify the directory containing branches
--- a/hgext/convert/gnuarch.py Sun May 31 14:53:46 2009 +0200 +++ b/hgext/convert/gnuarch.py Sun May 31 14:55:51 2009 +0200 @@ -257,7 +257,7 @@ self.ui.debug(_('obtaining revision %s...\n') % rev) output = self._execute('get', rev, self.tmppath) self.checkexit(output) - self.ui.debug(_('analysing revision %s...\n') % rev) + self.ui.debug(_('analyzing revision %s...\n') % rev) files = self._readcontents(self.tmppath) self.changes[rev].add_files += files
--- a/hgext/extdiff.py Sun May 31 14:53:46 2009 +0200 +++ b/hgext/extdiff.py Sun May 31 14:55:51 2009 +0200 @@ -35,7 +35,7 @@ # add new command called vimdiff, runs gvimdiff with DirDiff plugin # (see http://www.vim.org/scripts/script.php?script_id=102) - # Non english user, be sure to put "let g:DirDiffDynamicDiffText = 1" in + # Non English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in # your .vimrc vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)'
--- a/hgext/keyword.py Sun May 31 14:53:46 2009 +0200 +++ b/hgext/keyword.py Sun May 31 14:55:51 2009 +0200 @@ -64,7 +64,7 @@ kwdemo" to control the results of your config changes. Before changing/disabling active keywords, run "hg kwshrink" to avoid -the risk of inadvertedly storing expanded keywords in the change +the risk of inadvertently storing expanded keywords in the change history. To force expansion after enabling it, or a configuration change, run
--- a/hgext/win32mbcs.py Sun May 31 14:53:46 2009 +0200 +++ b/hgext/win32mbcs.py Sun May 31 14:55:51 2009 +0200 @@ -18,7 +18,7 @@ wrapping some functions to convert to Unicode string before path operation. -This extension is usefull for: +This extension is useful for: * Japanese Windows users using shift_jis encoding. * Chinese Windows users using big5 encoding. * All users who use a repository with one of problematic encodings on
--- a/mercurial/help.py Sun May 31 14:53:46 2009 +0200 +++ b/mercurial/help.py Sun May 31 14:55:51 2009 +0200 @@ -320,7 +320,7 @@ the given date/time and the current date/time. - basename: Any text. Treats the text as a path, and returns the last component of the path after splitting by the path - separator (ignoring trailing seprators). For example, + separator (ignoring trailing separators). For example, "foo/bar/baz" becomes "baz" and "foo/bar//" becomes "bar". - stripdir: Treat the text as path and strip a directory level, if possible. For example, "foo" and "foo/bar" becomes "foo".
--- a/tests/test-convert.out Sun May 31 14:53:46 2009 +0200 +++ b/tests/test-convert.out Sun May 31 14:55:51 2009 +0200 @@ -53,7 +53,7 @@ The 'include' directive causes a file, or all files under a directory, to be included in the destination repository, and the - exclusion of all other files and directories not explicitely included. + exclusion of all other files and directories not explicitly included. The 'exclude' directive causes files or directories to be omitted. The 'rename' directive renames a file or directory. To rename from a subdirectory into the root of the repository, use '.' as the @@ -104,7 +104,7 @@ in the sandbox to find the CVS repository, and then uses CVS rlog commands to find files to convert. This means that unless a filemap is given, all files under the starting directory will be - converted, and that any directory reorganisation in the CVS + converted, and that any directory reorganization in the CVS sandbox is ignored. Because CVS does not have changesets, it is necessary to collect @@ -155,9 +155,9 @@ its subdirectories are listed as possible branches. If "svn://repo/path/tags" exists, it is looked for tags referencing converted branches. Default "trunk", "branches" and "tags" values - can be overriden with following options. Set them to paths - relative to the source URL, or leave them blank to disable - autodetection. + can be overridden with following options. Set them to paths + relative to the source URL, or leave them blank to disable auto + detection. --config convert.svn.branches=branches (directory name) specify the directory containing branches
--- a/tests/test-keyword.out Sun May 31 14:53:46 2009 +0200 +++ b/tests/test-keyword.out Sun May 31 14:55:51 2009 +0200 @@ -31,7 +31,7 @@ kwdemo" to control the results of your config changes. Before changing/disabling active keywords, run "hg kwshrink" to avoid -the risk of inadvertedly storing expanded keywords in the change +the risk of inadvertently storing expanded keywords in the change history. To force expansion after enabling it, or a configuration change, run