Tue Mar 19 19:32:19 UTC 2013

cli.py                          |    2 +-
 docs/sphinxdocs/rstgenerator.py |    2 +-
 output.py                       |    6 +++---
 po/bg.po                        |    2 +-
 po/bn_IN.po                     |    2 +-
 po/ca.po                        |    2 +-
 po/cs.po                        |    2 +-
 po/da.po                        |    2 +-
 po/de.po                        |    2 +-
 po/el.po                        |    2 +-
 po/en_GB.po                     |    2 +-
 po/es.po                        |    2 +-
 po/eu.po                        |    2 +-
 po/fi.po                        |    2 +-
 po/fr.po                        |    2 +-
 po/gu.po                        |    2 +-
 po/hi.po                        |    2 +-
 po/hu.po                        |    2 +-
 po/id.po                        |    2 +-
 po/id_ID.po                     |    2 +-
 po/it.po                        |    2 +-
 po/ja.po                        |    2 +-
 po/lt_LT.po                     |    2 +-
 po/mr.po                        |    2 +-
 po/ms.po                        |    2 +-
 po/nb.po                        |    2 +-
 po/nl.po                        |    2 +-
 po/nl_NL.po                     |    2 +-
 po/pa.po                        |    2 +-
 po/pl.po                        |    2 +-
 po/pt.po                        |    2 +-
 po/pt_BR.po                     |    2 +-
 po/pt_PT.po                     |    2 +-
 po/ru.po                        |    2 +-
 po/sk.po                        |    2 +-
 po/sr.po                        |    2 +-
 po/sr at latin.po                  |    2 +-
 po/sv.po                        |    2 +-
 po/tr.po                        |    2 +-
 po/uk.po                        |    2 +-
 po/ur.po                        |    2 +-
 po/zh_CN.po                     |    2 +-
 po/zh_TW.po                     |    2 +-
 test/skipbroken-tests.py        |    6 +++---
 test/yum-pylintrc               |    2 +-
 test/yum-release-test.sh        |    2 +-
 yum-cron/yum-cron.py            |    2 +-
 yum-updatesd.py                 |    2 +-
 yum/__init__.py                 |   14 +++++++-------
 yum/depsolve.py                 |    8 ++++----
 yum/history.py                  |    2 +-
 yum/logginglevels.py            |    2 +-
 yum/misc.py                     |    2 +-
 yum/packages.py                 |    2 +-
 yum/repos.py                    |    2 +-
 yum/rpmsack.py                  |    4 ++--
 yum/sqlutils.py                 |    2 +-
 yum/yumRepo.py                  |    2 +-
 58 files changed, 72 insertions(+), 72 deletions(-)

New commits:
commit e4f4dc24af4f0dd52b1d77ff33942df8c23bcb50
Author: Ville SkyttÃ¤ <ville.skytta at iki.fi>
Date:   Tue Mar 19 21:32:05 2013 +0200

    Spelling fixes.

diff --git a/cli.py b/cli.py
index 12817fc..0d6a83c 100755
--- a/cli.py
+++ b/cli.py
@@ -1963,7 +1963,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
         # prompt if:
         #  package was added to fill a dependency
         #  package is being removed
-        #  package wasn't explictly given on the command line
+        #  package wasn't explicitly given on the command line
         for txmbr in self.tsInfo.getMembers():
             if txmbr.isDep or \
                    txmbr.name not in self.extcmds:
diff --git a/docs/sphinxdocs/rstgenerator.py b/docs/sphinxdocs/rstgenerator.py
index d2a0ed1..ad24788 100755
--- a/docs/sphinxdocs/rstgenerator.py
+++ b/docs/sphinxdocs/rstgenerator.py
@@ -175,7 +175,7 @@ def generateAll(source_directory, output_directory):
         if '__init__.py' in filenames:
             packages.add(dirpath)
 
-        # Find the heirarchy of packages that we are currently in
+        # Find the hierarchy of packages that we are currently in
         package_heirarchy = []
         #Recurse up to the root
         dirpath_i = dirpath
diff --git a/output.py b/output.py
index 26e3928..020e2b6 100755
--- a/output.py
+++ b/output.py
@@ -1771,7 +1771,7 @@ Transaction Summary
             # For translators: This is output like:
 #  Current download cancelled, interrupt (ctrl-c) again within two seconds
 # to exit.
-            # Where "interupt (ctrl-c) again" and "two" are highlighted.
+            # Where "interrupt (ctrl-c) again" and "two" are highlighted.
             msg = _("""
  Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds
 to exit.
@@ -3036,7 +3036,7 @@ class CacheProgressCallback:
         if opc <= 1:
             output = True
         elif current <= 1:
-            output = True # output the begining
+            output = True # output the beginning
         elif current == total:
             output = True # output the end
         elif not (current % opc):
@@ -3205,7 +3205,7 @@ class YumCliRPMCallBack(RPMBaseCallback):
             pnl = utf8_width(pkgname)
 
         overhead  = (2 * l) + 2 # Length of done, above
-        overhead +=  2+ wid1 +2 # Length of begining ("  " action " :")
+        overhead +=  2+ wid1 +2 # Length of beginning ("  " action " :")
         overhead +=  1          # Space between pn and done
         overhead +=  2          # Ends for progress
         overhead +=  1          # Space for end
diff --git a/po/bg.po b/po/bg.po
index 63d00c7..7889293 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1053,7 +1053,7 @@ msgstr "Ð´Ð²Ðµ"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 66f749c..fbec035 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1052,7 +1052,7 @@ msgstr ""
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/ca.po b/po/ca.po
index 52f0094..6ab974e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1052,7 +1052,7 @@ msgstr "dos"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/cs.po b/po/cs.po
index 6da0bf3..f992f1a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1067,7 +1067,7 @@ msgstr "dvou"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/da.po b/po/da.po
index c0d5bf8..5c2d4fd 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1053,7 +1053,7 @@ msgstr "to"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/de.po b/po/de.po
index f9186ca..3f1e62e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1059,7 +1059,7 @@ msgstr "zwei"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/el.po b/po/el.po
index e0af061..11204f5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1054,7 +1054,7 @@ msgstr ""
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 3f37033..323c119 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1054,7 +1054,7 @@ msgstr "two"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/es.po b/po/es.po
index 4f98332..443556a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1058,7 +1058,7 @@ msgstr "dos"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/eu.po b/po/eu.po
index 99871fe..1bf107b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1054,7 +1054,7 @@ msgstr "bi"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/fi.po b/po/fi.po
index e4dfb5e..630253e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1053,7 +1053,7 @@ msgstr "kahden"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/fr.po b/po/fr.po
index b036953..29a20af 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1055,7 +1055,7 @@ msgstr "deux"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/gu.po b/po/gu.po
index ea00c75..8a97d66 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1053,7 +1053,7 @@ msgstr "àª¬à«‡"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/hi.po b/po/hi.po
index b35083e..8de5599 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1052,7 +1052,7 @@ msgstr ""
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/hu.po b/po/hu.po
index 800875a..68be45c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1054,7 +1054,7 @@ msgstr "kettÅ‘"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/id.po b/po/id.po
index 1feb897..bb0fb51 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1043,7 +1043,7 @@ msgstr "dua"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/id_ID.po b/po/id_ID.po
index bff0196..52ba317 100644
--- a/po/id_ID.po
+++ b/po/id_ID.po
@@ -1042,7 +1042,7 @@ msgstr "dua"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/it.po b/po/it.po
index 391f4ca..dd93a17 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1053,7 +1053,7 @@ msgstr "due"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/ja.po b/po/ja.po
index 7fefa70..f8ebfc7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1046,7 +1046,7 @@ msgstr "2"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/lt_LT.po b/po/lt_LT.po
index f0c9981..f9c3f43 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -1065,7 +1065,7 @@ msgstr "du"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/mr.po b/po/mr.po
index ac51b9e..7556e8f 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1052,7 +1052,7 @@ msgstr ""
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/ms.po b/po/ms.po
index f93023c..e4d6a73 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -1041,7 +1041,7 @@ msgstr ""
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/nb.po b/po/nb.po
index 656e27e..cf3cf41 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1052,7 +1052,7 @@ msgstr "to"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/nl.po b/po/nl.po
index 4d07fc4..47bc5e9 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1053,7 +1053,7 @@ msgstr "twee"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 5b4f752..43145ae 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1053,7 +1053,7 @@ msgstr "twee"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/pa.po b/po/pa.po
index ac83881..b96df92 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1053,7 +1053,7 @@ msgstr "à¨¦à©‹"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/pl.po b/po/pl.po
index 828ce58..e907814 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1064,7 +1064,7 @@ msgstr "dwÃ³ch"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/pt.po b/po/pt.po
index 6c2886c..e48ed87 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1052,7 +1052,7 @@ msgstr ""
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 74baf4d..bab71ba 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1054,7 +1054,7 @@ msgstr "dois"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index f633c93..7dcef70 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1053,7 +1053,7 @@ msgstr ""
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/ru.po b/po/ru.po
index daba5d6..c474606 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1066,7 +1066,7 @@ msgstr "Ð´Ð²ÑƒÑ…"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/sk.po b/po/sk.po
index 911b5de..ccee18e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1064,7 +1064,7 @@ msgstr "dva"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/sr.po b/po/sr.po
index 78fa7c8..81eecdc 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1063,7 +1063,7 @@ msgstr "Ð´Ð²Ð°"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/sr at latin.po b/po/sr at latin.po
index 1e2795d..f718e05 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -1063,7 +1063,7 @@ msgstr "dva"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/sv.po b/po/sv.po
index 57ce514..c45e7f1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1054,7 +1054,7 @@ msgstr "tvÃ¥"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/tr.po b/po/tr.po
index 5deb30d..57fee42 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1043,7 +1043,7 @@ msgstr "iki"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/uk.po b/po/uk.po
index 85da080..454d977 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1065,7 +1065,7 @@ msgstr "Ð´Ð²Ð°"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/ur.po b/po/ur.po
index 8b7c23c..562ed0a 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -1052,7 +1052,7 @@ msgstr ""
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 90bf81d..d0a0ab9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1048,7 +1048,7 @@ msgstr "äºŒ"
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c0daa52..2ab6a67 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1041,7 +1041,7 @@ msgstr ""
 #. For translators: This is output like:
 #. Current download cancelled, interrupt (ctrl-c) again within two seconds
 #. to exit.
-#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#. Where "interrupt (ctrl-c) again" and "two" are highlighted.
 #: ../output.py:1775
 #, python-format
 msgid ""
diff --git a/test/skipbroken-tests.py b/test/skipbroken-tests.py
index 4d7561c..68f5ef9 100644
--- a/test/skipbroken-tests.py
+++ b/test/skipbroken-tests.py
@@ -81,7 +81,7 @@ class SkipBrokenTests(DepsolveTests):
         self.assertResult([])
 
     def testDepWithMissingReqSkip(self):
-        ''' install is skipped, beacuse dep is missing req.  
+        ''' install is skipped, because dep is missing req.  
         foo + foobar is skipped because barfoo is not provided
         bar stays in the transaction
         '''
@@ -219,7 +219,7 @@ class SkipBrokenTests(DepsolveTests):
         self.assertResult([ipo, po1])
 
     def testConflictWithInstalledButUpdateExist(self):
-        ''' update fails, because conflict cant be fixed. (req. loop)
+        ''' update fails, because conflict can't be fixed. (req. loop)
         foo 1.0 -> 2.0 update fails, because foo-2.0 conflict with bar-1.0
         bar-1.0 is update to bar-2.0, to solve the conflict but bar-2.0 need foo-1.0
         so the foo & bar updates get skipped and the transaction is empty
@@ -240,7 +240,7 @@ class SkipBrokenTests(DepsolveTests):
         self.assertResult([po1,ipo])
 
     def testConflictWithInstalledButUpdateExist2(self):
-        '''update fails, because conflict cant be fixed. (missing req.)
+        '''update fails, because conflict can't be fixed. (missing req.)
         foo 1.0 -> 2.0 update fails, because foo-2.0 conflict with bar-1.0
         bar-1.0 is update to bar-2.0, to solve the conflict but bar-2.0 need poo-1.0
         there is not provided
diff --git a/test/yum-pylintrc b/test/yum-pylintrc
index ea4e683..d0cf2a6 100644
--- a/test/yum-pylintrc
+++ b/test/yum-pylintrc
@@ -33,7 +33,7 @@ load-plugins=
 # can either give multiple identifier separated by comma (,) or put this option
 # multiple time.
 
-# E1101: *%s %r has no %r member* (The init-hook for do sys.path manipulation don't, so we cant find the utils module)
+# E1101: *%s %r has no %r member* (The init-hook for do sys.path manipulation don't, so we can't find the utils module)
 # F0401: *Unable to import %r (%s)* (See above)
 # W0704: *Except doesn't do anything* ( Except xxxxxx,e : pass is ok)
 # W0612: *Unused variable %r* ( dont care if x,y,z = f() and y,z is not used) 
diff --git a/test/yum-release-test.sh b/test/yum-release-test.sh
index fba02c5..a9270e2 100755
--- a/test/yum-release-test.sh
+++ b/test/yum-release-test.sh
@@ -73,7 +73,7 @@ if [ ! -d $WORKDIR/usr/bin ]; then
   "${RPM[@]}" -q vim-minimal > /dev/null
   if [ "X$?" == "X0" ] ; then echo " OK"; else echo " FAILED"; fi
 else
-  echo Ommiting base install
+  echo Omitting base install
 fi
 
 #"${YUMUPDATES[@]}" list updates
diff --git a/yum-cron/yum-cron.py b/yum-cron/yum-cron.py
index 8f6286b..089cad4 100755
--- a/yum-cron/yum-cron.py
+++ b/yum-cron/yum-cron.py
@@ -75,7 +75,7 @@ class UpdateEmitter(object):
         """Append a message to the output list stating that updates
         have been installed successfully.
         """
-        self.output.append('The updates were sucessfully applied')
+        self.output.append('The updates were successfully applied')
 
     def setupFailed(self, errmsg):
         """Append a message to the output list stating that setup
diff --git a/yum-updatesd.py b/yum-updatesd.py
index 25e3022..2f3f7a3 100755
--- a/yum-updatesd.py
+++ b/yum-updatesd.py
@@ -23,7 +23,7 @@
 # - what to do if we're asked to exit while updates are being applied?
 # - what to do with the lock around downloads/updates
 
-# since it takes me time everytime to figure this out again, here's how to
+# since it takes me time every time to figure this out again, here's how to
 # queue a check with dbus-send.  adjust appropriately for other methods
 # $ dbus-send --system --print-reply --type=method_call \
 #   --dest=edu.duke.linux.yum /Updatesd edu.duke.linux.yum.CheckNow
diff --git a/yum/__init__.py b/yum/__init__.py
index 5f77a54..e067dd3 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1384,7 +1384,7 @@ much more problems).
                 self.verbose_logger.info(msg)
             self.skipped_packages.extend(skipped_list)   # make the skipped packages public
         else:
-            # If we cant solve the problems the show the original error messages.
+            # If we can't solve the problems the show the original error messages.
             self.verbose_logger.info("Skip-broken could not solve problems")
             return 1, orig_restring
         return rescode, restring
@@ -1426,7 +1426,7 @@ much more problems).
             for pkg in txmbr.obsoleted_by:
                 # check if the obsoleting txmbr is in the transaction
                 # else remove the obsoleted txmbr
-                # it clean out some really wierd cases
+                # it clean out some really weird cases
                 if not self.tsInfo.exists(pkg.pkgtup):
                     self.verbose_logger.debug('SKIPBROKEN: Remove extra obsoleted %s (%s)' % (txmbr.po,pkg) )
                     self.tsInfo.remove(txmbr.po.pkgtup)
@@ -1441,7 +1441,7 @@ much more problems).
             for pkg in txmbr.updated_by:
                 # check if the updating txmbr is in the transaction
                 # else remove the updated txmbr
-                # it clean out some really wierd cases with dupes installed on the system
+                # it clean out some really weird cases with dupes installed on the system
                 if not self.tsInfo.exists(pkg.pkgtup):
                     self.verbose_logger.debug('SKIPBROKEN: Remove extra updated %s (%s)' % (txmbr.po,pkg) )
                     self.tsInfo.remove(txmbr.po.pkgtup)
@@ -3068,7 +3068,7 @@ much more problems).
         # ...but without showdups we want to output _just_ #3, which requires
         # we find the newest EVR po for the best "matching value". Without keys
         # it's the same, except we just want the newest EVR.
-        #  If we screw it up it's probably not even noticable most of the time
+        #  If we screw it up it's probably not even noticeable most of the time
         # either, so it's pretty thankless. HTH. HAND.
         # By default just sort using package sorting
         sort_func = operator.itemgetter(0)
@@ -3142,7 +3142,7 @@ much more problems).
         """Deprecated.  Search the specified fields for packages that
         match the given criteria, and return a list of the results.
 
-        :param fields: the fields to seach
+        :param fields: the fields to search
         :param criteria: a list of strings specifying the criteria to
            search for
         :param callback: a function to print out the results as they
@@ -4409,7 +4409,7 @@ much more problems).
 
         if False and self._up is not None:
             #  This is the old code, not sure it's good to have two paths. And
-            # we don't wnat to create .up. (which requires init repos.) if we
+            # we don't want to create .up. (which requires init repos.) if we
             # don't have to.
             return po.pkgtup in self.up.updating_dict
 
@@ -6537,7 +6537,7 @@ much more problems).
             return (_("File is empty."), None)
 
         if data[0] == 'saved_tx:\n':
-            #  Old versions of yum would put "saved_tx:" at the begining and
+            #  Old versions of yum would put "saved_tx:" at the beginning and
             # two blank lines at the end when you used:
             # "yum -q history addon-info saved_tx".
             if data[-1] == 'history addon-info\n':
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 500a0b9..79600e6 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -69,7 +69,7 @@ class _wrap_ayum_getPkgSack:
     """ This is a wrapper for calling YumBase.pkgSack because
         otherwise we take a real reference through the bound method and
         that is d00m (this applies to YumBase and TransactionInfo, hence why
-        we have a seperate class). """
+        we have a separate class). """
     def __init__(self, ayum):
         self.ayum = weakref(ayum)
     def __call__(self):
@@ -79,7 +79,7 @@ class _wrap_ayum_install:
     """ This is a wrapper for calling YumBase.install because
         otherwise we take a real reference through the bound method and
         that is d00m (this applies to YumBase and TransactionInfo, hence why
-        we have a seperate class). """
+        we have a separate class). """
     def __init__(self, ayum):
         self.ayum = weakref(ayum)
     def __call__(self, *args, **kwargs):
@@ -88,7 +88,7 @@ class _wrap_ayum_remove:
     """ This is a wrapper for calling YumBase.remove because
         otherwise we take a real reference through the bound method and
         that is d00m (this applies to YumBase and TransactionInfo, hence why
-        we have a seperate class). """
+        we have a separate class). """
     def __init__(self, ayum):
         self.ayum = weakref(ayum)
     def __call__(self, *args, **kwargs):
@@ -97,7 +97,7 @@ class _wrap_ayum_update:
     """ This is a wrapper for calling YumBase.update because
         otherwise we take a real reference through the bound method and
         that is d00m (this applies to YumBase and TransactionInfo, hence why
-        we have a seperate class). """
+        we have a separate class). """
     def __init__(self, ayum):
         self.ayum = weakref(ayum)
     def __call__(self, *args, **kwargs):
diff --git a/yum/history.py b/yum/history.py
index cc06f0a..6f60f54 100644
--- a/yum/history.py
+++ b/yum/history.py
@@ -196,7 +196,7 @@ class YumHistoryPackage(PackageObject):
         """ This reports the repo the package is from, we integrate YUMDB info.
             for RPM packages so a package from "fedora" that is installed has a
             ui_from_repo of "@fedora". Note that, esp. with the --releasever
-            option, "fedora" or "rawhide" isn't authoritive.
+            option, "fedora" or "rawhide" isn't authoritative.
             So we also check against the current releasever and if it is
             different we also print the YUMDB releasever. This means that
             installing from F12 fedora, while running F12, would report as
diff --git a/yum/logginglevels.py b/yum/logginglevels.py
index 14c5e73..dfdd90c 100644
--- a/yum/logginglevels.py
+++ b/yum/logginglevels.py
@@ -42,7 +42,7 @@ logging.addLevelName(DEBUG_3, "DEBUG_3")
 logging.addLevelName(DEBUG_4, "DEBUG_4")
 
 # High level to effectively turn off logging.
-# For compatability with the old logging system.
+# For compatibility with the old logging system.
 __NO_LOGGING = 100
 logging.raiseExceptions = False
 
diff --git a/yum/misc.py b/yum/misc.py
index 0ae980b..8e21fe7 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -1122,7 +1122,7 @@ def decompress(filename, dest=None, fn_only=False, check_timestamps=False):
         fi = stat_f(filename)
         fo = stat_f(out)
         if fi and fo:
-            # Eliminate sub second precision in mtime before comparision,
+            # Eliminate sub second precision in mtime before comparison,
             # see http://bugs.python.org/issue14127
             if int(fo.st_mtime) == int(fi.st_mtime):
                 return out
diff --git a/yum/packages.py b/yum/packages.py
index 62f989f..deb44e4 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -797,7 +797,7 @@ class YumAvailablePackage(PackageObject, RpmBase):
         """ This reports the repo the package is from, we integrate YUMDB info.
             for RPM packages so a package from "fedora" that is installed has a
             ui_from_repo of "@fedora". Note that, esp. with the --releasever
-            option, "fedora" or "rawhide" isn't authoritive.
+            option, "fedora" or "rawhide" isn't authoritative.
             So we also check against the current releasever and if it is
             different we also print the YUMDB releasever. This means that
             installing from F12 fedora, while running F12, would report as
diff --git a/yum/repos.py b/yum/repos.py
index 3522512..e519bc1 100644
--- a/yum/repos.py
+++ b/yum/repos.py
@@ -31,7 +31,7 @@ class _wrap_ayum_getKeyForRepo:
     """ This is a wrapper for calling YumBase.getKeyForRepo() because
         otherwise we take a real reference through the bound method and
         that is d00m (this applies to YumBase and RepoStorage, hence why
-        we have a seperate class).
+        we have a separate class).
         A "better" fix might be to explicitly pass the YumBase instance to
         the callback ... API change! """
     def __init__(self, ayum, ca=False):
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index a4e5336..82aa29e 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -399,7 +399,7 @@ class RPMDBPackageSack(PackageSackBase):
         else:
             self._cachedir = '/' + cachedir
 
-        if hasattr(self, 'yumdb'): # Need to keep this upto date, after init.
+        if hasattr(self, 'yumdb'): # Need to keep this up to date, after init.
             version_path = os.path.normpath(self._cachedir + '/version')
             self.yumdb.conf.version_path = version_path
 
@@ -1493,7 +1493,7 @@ class RPMDBPackageSack(PackageSackBase):
                                               conflicts=res)
                 problems.append(prob)
 
-            # Note that obsoletes are checked seperately, and are name only.
+            # Note that obsoletes are checked separately, and are name only.
         return problems
 
     def _iter_two_pkgs(self, ignore_provides):
diff --git a/yum/sqlutils.py b/yum/sqlutils.py
index 4d7e36e..826ad62 100644
--- a/yum/sqlutils.py
+++ b/yum/sqlutils.py
@@ -50,7 +50,7 @@ def Tokenize(str, whitespace=" \t\r\n", quotes="\"", escapes="\\"):
 
     @param        str: string to tokenize
     @type         str: string
-    @param whitespace: whitespace characters seperating tokens
+    @param whitespace: whitespace characters separating tokens
     @type  whitespace: string
     @param     quotes: legal quoting characters
     @type      quotes: string
diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index ace49e3..b9bf1fe 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -67,7 +67,7 @@ except ImportError:
 # 1. We rarely want to be downloading MD/pkgs/etc.
 # 2. We want to check those files are valid (match checksums) when we do
 #    download them.
-# 3. We _really_ don't want to checksum all the files everytime we
+# 3. We _really_ don't want to checksum all the files every time we
 #    run (100s of MBs).
 # 4. We can continue to download files from bad mirrors, or retry files due to
 #    C-c etc.
