diff options
author | hut <hut@lepus.uberspace.de> | 2016-06-26 13:25:38 +0200 |
---|---|---|
committer | hut <hut@lepus.uberspace.de> | 2016-06-26 13:25:38 +0200 |
commit | e11d6984c54f1e5dae7d5bff1a61a84ad40511ca (patch) | |
tree | 9fb125551c6871d932adc4c70b3cc4bbff4807e2 | |
parent | c0b3ca592d32a76e1470a9e8c0313c8a889a6ff7 (diff) | |
parent | 239057096c7e5399aae9a30c0b88814099c55bcf (diff) | |
download | ranger-e11d6984c54f1e5dae7d5bff1a61a84ad40511ca.tar.gz |
Merge branch 'misspellings' of https://github.com/stepshal/ranger
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | doc/colorschemes.txt | 2 | ||||
-rw-r--r-- | examples/rc_emacs.conf | 2 | ||||
-rw-r--r-- | ranger/config/rc.conf | 2 | ||||
-rw-r--r-- | ranger/config/rifle.conf | 2 | ||||
-rw-r--r-- | ranger/core/main.py | 2 | ||||
-rw-r--r-- | ranger/ext/keybinding_parser.py | 2 | ||||
-rw-r--r-- | ranger/gui/curses_shortcuts.py | 2 | ||||
-rw-r--r-- | ranger/gui/displayable.py | 2 | ||||
-rw-r--r-- | tests/ranger/container/test_bookmarks.py | 2 | ||||
-rw-r--r-- | tests/ranger/container/test_fsobject.py | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a408d968..68a72746 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -114,7 +114,7 @@ This log documents changes between stable versions. * Added `dc` binding for getting the cumulative size of a directory * Added `autoupdate_cumulative_size` option * Added `pht` binding to Paste Hardlinked subTrees (like cp -l) -* Improved sorting speed of signals (noticable when caching many directories) +* Improved sorting speed of signals (noticeable when caching many directories) * Improved drawing speed * Fixed unexpected behavior when displaying nonprintable characters * Fixed :bulkrename to work with files starting with a minus sign @@ -122,7 +122,7 @@ This log documents changes between stable versions. * Fixed crash when opening images with sxiv/feh by running `ranger <image>` # 2011-10-23: Version 1.5.2 -* Fixed graphical bug that appears in certian cases when drawing +* Fixed graphical bug that appears in certain cases when drawing characters at the right edge. # 2011-10-23: Version 1.5.1 diff --git a/doc/colorschemes.txt b/doc/colorschemes.txt index e1fee2da..145cc94e 100644 --- a/doc/colorschemes.txt +++ b/doc/colorschemes.txt @@ -88,5 +88,5 @@ of the default scheme, set the initial colors to the result of the default use() method and modified the colors how I wanted. This has the obvious advantage that you need to write less, which -results in less maintainance work and a greater chance that your colorscheme +results in less maintenance work and a greater chance that your colorscheme will work with future versions of ranger. diff --git a/examples/rc_emacs.conf b/examples/rc_emacs.conf index f0752e62..39a6d654 100644 --- a/examples/rc_emacs.conf +++ b/examples/rc_emacs.conf @@ -137,7 +137,7 @@ set max_console_history_size 50 # Try to keep so much space between the top/bottom border when scrolling: set scroll_offset 8 -# Flush the input after each key hit? (Noticable when ranger lags) +# Flush the input after each key hit? (Noticeable when ranger lags) set flushinput true # Padding on the right when there's no preview? diff --git a/ranger/config/rc.conf b/ranger/config/rc.conf index 533013ff..560fbe4d 100644 --- a/ranger/config/rc.conf +++ b/ranger/config/rc.conf @@ -143,7 +143,7 @@ set max_console_history_size 50 # Try to keep so much space between the top/bottom border when scrolling: set scroll_offset 8 -# Flush the input after each key hit? (Noticable when ranger lags) +# Flush the input after each key hit? (Noticeable when ranger lags) set flushinput true # Padding on the right when there's no preview? diff --git a/ranger/config/rifle.conf b/ranger/config/rifle.conf index f95c94ff..d6165f21 100644 --- a/ranger/config/rifle.conf +++ b/ranger/config/rifle.conf @@ -204,5 +204,5 @@ label wallpaper, number 14, mime ^image, has feh, X = feh --bg-fill "$1" label editor, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = $EDITOR -- "$@" label pager, !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@" -# The very last action, so that it's never triggered accidently, is to execute a program: +# The very last action, so that it's never triggered accidentally, is to execute a program: mime application/x-executable = "$1" diff --git a/ranger/core/main.py b/ranger/core/main.py index 528d849c..000ded68 100644 --- a/ranger/core/main.py +++ b/ranger/core/main.py @@ -242,7 +242,7 @@ def parse_arguments(): if arg.fail_unless_cd: # COMPAT sys.stderr.write("Warning: The option --fail-unless-cd is deprecated.\n" - "It was used to faciliate using ranger as a file launcher.\n" + "It was used to facilitate using ranger as a file launcher.\n" "Now, please use the standalone file launcher 'rifle' instead.\n") return arg diff --git a/ranger/ext/keybinding_parser.py b/ranger/ext/keybinding_parser.py index b285237e..6a4cbde9 100644 --- a/ranger/ext/keybinding_parser.py +++ b/ranger/ext/keybinding_parser.py @@ -71,7 +71,7 @@ def parse_keybinding(obj): (108, 111, 108, 10) >>> out = tuple(parse_keybinding("x<A-Left>")) - >>> out # it's kind of dumb that you cant test for constants... + >>> out # it's kind of dumb that you can't test for constants... (120, 9003, 260) >>> out[0] == ord('x') True diff --git a/ranger/gui/curses_shortcuts.py b/ranger/gui/curses_shortcuts.py index 8937fcb7..ed762c9e 100644 --- a/ranger/gui/curses_shortcuts.py +++ b/ranger/gui/curses_shortcuts.py @@ -17,7 +17,7 @@ def _fix_surrogates(args): class CursesShortcuts(SettingsAware): - """This class defines shortcuts to faciliate operations with curses. + """This class defines shortcuts to facilitate operations with curses. color(*keys) -- sets the color associated with the keys from the current colorscheme. diff --git a/ranger/gui/displayable.py b/ranger/gui/displayable.py index 9f2dbf0d..7b5aa954 100644 --- a/ranger/gui/displayable.py +++ b/ranger/gui/displayable.py @@ -33,7 +33,7 @@ class Displayable(FileManagerAware, CursesShortcuts): be set at various places in the script and should eventually be handled (and unset) in the draw() method. - Read-Only: (i.e. reccomended not to change manually) + Read-Only: (i.e. recommended not to change manually) win -- the own curses window object parent -- the parent (DisplayableContainer) object or None x, y, wid, hei -- absolute coordinates and boundaries diff --git a/tests/ranger/container/test_bookmarks.py b/tests/ranger/container/test_bookmarks.py index 2c0f78bd..a2cd446f 100644 --- a/tests/ranger/container/test_bookmarks.py +++ b/tests/ranger/container/test_bookmarks.py @@ -35,7 +35,7 @@ def testbookmarks(tmpdir): assert "'" in secondstore assert secondstore["'"] == "the milk" - # We don't uneccesary update when the file on disk does not change + # We don't unnecessary update when the file on disk does not change origupdate = secondstore.update class OutOfDateException(Exception): diff --git a/tests/ranger/container/test_fsobject.py b/tests/ranger/container/test_fsobject.py index 3ea52d6f..73d2024a 100644 --- a/tests/ranger/container/test_fsobject.py +++ b/tests/ranger/container/test_fsobject.py @@ -5,7 +5,7 @@ from ranger.container.fsobject import FileSystemObject class MockFM(object): - """Used to fullfill the dependency by FileSystemObject.""" + """Used to fulfill the dependency by FileSystemObject.""" default_linemodes = [] |