summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lepus.uberspace.de>2016-06-26 13:25:38 +0200
committerhut <hut@lepus.uberspace.de>2016-06-26 13:25:38 +0200
commite11d6984c54f1e5dae7d5bff1a61a84ad40511ca (patch)
tree9fb125551c6871d932adc4c70b3cc4bbff4807e2 /ranger
parentc0b3ca592d32a76e1470a9e8c0313c8a889a6ff7 (diff)
parent239057096c7e5399aae9a30c0b88814099c55bcf (diff)
downloadranger-e11d6984c54f1e5dae7d5bff1a61a84ad40511ca.tar.gz
Merge branch 'misspellings' of https://github.com/stepshal/ranger
Diffstat (limited to 'ranger')
-rw-r--r--ranger/config/rc.conf2
-rw-r--r--ranger/config/rifle.conf2
-rw-r--r--ranger/core/main.py2
-rw-r--r--ranger/ext/keybinding_parser.py2
-rw-r--r--ranger/gui/curses_shortcuts.py2
-rw-r--r--ranger/gui/displayable.py2
6 files changed, 6 insertions, 6 deletions
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
d='n364' href='#n364'>364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658