launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/typos into lp:launchpad.

Commit message:
Fix a few miscellaneous typos.

Requested reviews:
  Colin Watson (cjwatson): code

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/typos/+merge/246750

Fix a few miscellaneous typos.
-- 
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.

=== modified file 'lib/lp/registry/templates/nameblacklists-index.pt'
--- lib/lp/registry/templates/nameblacklists-index.pt	2011-01-07 18:26:31 +0000
+++ lib/lp/registry/templates/nameblacklists-index.pt	2015-01-16 17:33:51 +0000
@@ -21,12 +21,12 @@
       </p>
       <ul class="bulleted">
         <li>
-          Organisational blackisted names have an administering team
+          Organisational blacklisted names have an administering team
           that is permitted to use the name for projects and teams.
          </li>
         <li>
-          Application blackisted names cannot have an administering team.
-          No one can to override them.
+          Application blacklisted names cannot have an administering team.
+          No one can override them.
          </li>
       </ul>
       <table id="blacklist" class="listing sortable">

=== modified file 'lib/lp/services/librarianserver/librariangc.py'
--- lib/lp/services/librarianserver/librariangc.py	2015-01-14 04:57:59 +0000
+++ lib/lp/services/librarianserver/librariangc.py	2015-01-16 17:33:51 +0000
@@ -707,9 +707,8 @@
             next_wanted_content_id = get_next_wanted_content_id()
 
     log.info(
-            "Deleted %d files from disk that where no longer referenced "
-            "in the db" % removed_count
-            )
+        "Deleted %d files from disk that were no longer referenced "
+        "in the db." % removed_count)
 
 
 def swift_files(max_lfc_id):
@@ -828,8 +827,8 @@
         next_wanted_content_id = get_next_wanted_content_id()
 
     log.info(
-        "Deleted {0} files from Swift that where no longer referenced"
-        "in the db".format(removed_count))
+        "Deleted {0} files from Swift that were no longer referenced "
+        "in the db.".format(removed_count))
 
 
 def get_file_path(content_id):

=== modified file 'lib/lp/translations/doc/poexport-language-pack.txt'
--- lib/lp/translations/doc/poexport-language-pack.txt	2014-01-30 09:58:18 +0000
+++ lib/lp/translations/doc/poexport-language-pack.txt	2015-01-16 17:33:51 +0000
@@ -413,7 +413,7 @@
 Then, export with a date limit: we should only get the second PO file.
 The way to set date limits is setting when the base language pack was
 exported, thus, we set it and request an update export, which means we
-should get only files that where updated after 2000-01-02.
+should get only files that were updated after 2000-01-02.
 
     >>> series.language_pack_base.date_exported = d2000_01_02
     >>> transaction.commit()

=== modified file 'lib/lp/translations/utilities/tests/test_file_importer.py'
--- lib/lp/translations/utilities/tests/test_file_importer.py	2012-01-04 03:23:19 +0000
+++ lib/lp/translations/utilities/tests/test_file_importer.py	2015-01-16 17:33:51 +0000
@@ -156,13 +156,13 @@
         return POFileImporter(translation_entry, GettextPOImporter(), None)
 
     def _createImporterForExportedEntries(self):
-        """Set up entries that where exported from LP, i.e. that contain the
+        """Set up entries that were exported from LP, i.e. that contain the
         'X-Launchpad-Export-Date:' header."""
         return self._createFileImporters(
             TEST_TEMPLATE_EXPORTED, TEST_TRANSLATION_EXPORTED, False)
 
     def _createImporterForUpstreamEntries(self):
-        """Set up entries that where not exported from LP, i.e. that do not
+        """Set up entries that were not exported from LP, i.e. that do not
         contain the 'X-Launchpad-Export-Date:' header."""
         return self._createFileImporters(
             TEST_TEMPLATE_UPSTREAM, TEST_TRANSLATION_UPSTREAM, True)