Merge lp:~ursinha/launchpad/bug-545124-changed-in-lp-refactoring into lp:~launchpad/launchpad/recife

[Ursula Junque]

This branch changes all 'changed in LP' to 'changed in Ubuntu' idea, this is bug 545124, not really much to say here :)

[Brad Crittenden (bac)]

review: Approve (code)

=== modified file 'lib/lp/translations/browser/pofile.py'
--- lib/lp/translations/browser/pofile.py	2010-02-25 00:47:17 +0000
+++ lib/lp/translations/browser/pofile.py	2010-03-23 19:06:29 +0000
@@ -297,7 +297,7 @@
             'translated': self.context.translatedCount,
             'untranslated': self.context.untranslatedCount,
             'new_suggestions': self.context.unreviewedCount,
-            'changed_in_launchpad': self.context.updatesCount,
+            'changed_in_ubuntu': self.context.updatesCount,
             }
 
         if self.show not in count_functions:
@@ -346,8 +346,8 @@
             'translated': self.context.getPOTMsgSetTranslated,
             'untranslated': self.context.getPOTMsgSetUntranslated,
             'new_suggestions': self.context.getPOTMsgSetWithNewSuggestions,
-            'changed_in_launchpad':
-                self.context.getPOTMsgSetChangedInLaunchpad,
+            'changed_in_ubuntu':
+                self.context.getPOTMsgSetChangedInUbuntu,
             }
 
         if self.show not in get_functions:
@@ -877,7 +877,7 @@
             'translated': self.context.translatedCount,
             'untranslated': self.context.untranslatedCount,
             'new_suggestions': self.context.unreviewedCount,
-            'changed_in_launchpad': self.context.updatesCount,
+            'changed_in_ubuntu': self.context.updatesCount,
             }
 
         if self.show not in count_functions:
@@ -910,8 +910,8 @@
             'translated': self.context.getPOTMsgSetTranslated,
             'untranslated': self.context.getPOTMsgSetUntranslated,
             'new_suggestions': self.context.getPOTMsgSetWithNewSuggestions,
-            'changed_in_launchpad':
-                self.context.getPOTMsgSetChangedInLaunchpad,
+            'changed_in_ubuntu':
+                self.context.getPOTMsgSetChangedInUbuntu,
             }
 
         if self.show not in get_functions:

=== modified file 'lib/lp/translations/browser/tests/test_pofile_view.py'
--- lib/lp/translations/browser/tests/test_pofile_view.py	2009-09-09 18:03:44 +0000
+++ lib/lp/translations/browser/tests/test_pofile_view.py	2010-03-23 19:06:29 +0000
@@ -59,7 +59,7 @@
         self.factory.makeTranslationMessage(
             self.pofile, self.new_suggestion, suggestion=True,
             date_updated=self.now())
-        # An imported that was changed in Launchpad.
+        # An upstream that was changed in Ubuntu.
         self.changed = self.factory.makePOTMsgSet(
             self.potemplate, sequence=4)
         self.factory.makeTranslationMessage(
@@ -110,8 +110,8 @@
         self.assertEqual(1, view.shown_count)
         self._assertEqualPOTMsgSets([self.new_suggestion], view.messages)
 
-    def test_show_changed_in_launchpad(self):
-        form = {'show': 'changed_in_launchpad'}
+    def test_show_changed_in_ubuntu(self):
+        form = {'show': 'changed_in_ubuntu'}
         view = POFileBaseView(self.pofile, LaunchpadTestRequest(form=form))
         view.initialize()
         self.assertEqual(1, view.shown_count)

=== modified file 'lib/lp/translations/doc/pofile-verify-stats.txt'
--- lib/lp/translations/doc/pofile-verify-stats.txt	2009-08-10 16:52:41 +0000
+++ lib/lp/translations/doc/pofile-verify-stats.txt	2010-03-23 19:06:29 +0000
@@ -1,7 +1,7 @@
 = POFile statistics =
 
 We frequently display statistics about POFiles: how many of its messages
-remain untranslated, how many have been changed in Launchpad, how many have
+remain untranslated, how many have been changed in Ubuntu, how many have
 had suggested translations submitted that need to be reviewed?
 
 It takes too long to gather these statistics on demand, so we cache them in
@@ -64,7 +64,7 @@
     (0, 0, 3, 0)
 
 We have a POFile with zero current, updated, and unreviewed translations, and
-3 translations changed in Launchpad (compared to upstream).
+3 translations changed in Ubuntu (compared to upstream).
 
 A software bug incorrectly sets the number of changed translations to 999.
 

=== modified file 'lib/lp/translations/doc/pofile.txt'
--- lib/lp/translations/doc/pofile.txt	2010-02-01 15:06:20 +0000
+++ lib/lp/translations/doc/pofile.txt	2010-03-23 19:06:29 +0000
@@ -40,7 +40,7 @@
 
     >>> dummy_pofile.getPOTMsgSetTranslated().count()
     0
-    >>> dummy_pofile.getPOTMsgSetChangedInLaunchpad().count()
+    >>> dummy_pofile.getPOTMsgSetChangedInUbuntu().count()
     0
     >>> dummy_pofile.getPOTMsgSetWithNewSuggestions().count()
     0
@@ -789,10 +789,11 @@
     [None, None, None]
 
 
-== getPOTMsgSetChangedInLaunchpad ==
+== getPOTMsgSetChangedInUbuntu ==
 
 This method returns only those POTMsgSet's which contain translation
-submissions through Launchpad which change existing published translations.
+submissions through Launchpad for Ubuntu which change existing published 
+translations.
 
 Lets get Evolution Spanish translation in distribution Hoary.
 
@@ -808,9 +809,9 @@
     >>> pofile_changed = potemplate.getPOFileByLang('es')
 
 This translation file already contains one message which has been changed in
-Launchpad.
+Ubuntu.
 
-    >>> potmsgsets = list(pofile_changed.getPOTMsgSetChangedInLaunchpad())
+    >>> potmsgsets = list(pofile_changed.getPOTMsgSetChangedInUbuntu())
     >>> len(potmsgsets)
     1
     >>> stats = pofile_changed.updateStatistics()
@@ -819,8 +820,8 @@
 
 This message is also counted as translated message (number of translated
 messages is the number of imported/currentCount plus number of newly
-translated in Launchpad/rosettaCount plus number of changed in
-Launchpad/updatesCount):
+translated in Ubuntu/rosettaCount plus number of changed in
+Ubuntu/updatesCount):
 
     >>> print pofile_changed.currentCount()
     6
@@ -832,7 +833,7 @@
     0
 
 We make sure that submissions on untranslated strings are not considered
-'changed in Launchpad', since this method is mainly designed to help
+'changed in Ubuntu', since this method is mainly designed to help
 translators revert translations to published translations.
 
 Lets get a single untranslated POTMsgSet.
@@ -855,9 +856,9 @@
     ...     pofile_changed.owner, {0: u'sample translation'},
     ...     is_imported=False, lock_timestamp=datetime.datetime.now(UTC))
 
-And make sure that the count of changed in Launchpad hasn't changed.
+And make sure that the count of changed in Ubuntu hasn't changed.
 
-    >>> potmsgsets = list(pofile_changed.getPOTMsgSetChangedInLaunchpad())
+    >>> potmsgsets = list(pofile_changed.getPOTMsgSetChangedInUbuntu())
     >>> len(potmsgsets)
     1
     >>> stats = pofile_changed.updateStatistics()
@@ -885,9 +886,9 @@
     >>> from canonical.database.sqlbase import flush_database_caches
     >>> flush_database_caches()
 
-And make sure that the count of messages changed in Launchpad _has_ changed:
+And make sure that the count of messages changed in Ubuntu _has_ changed:
 
-    >>> potmsgsets = list(pofile_changed.getPOTMsgSetChangedInLaunchpad())
+    >>> potmsgsets = list(pofile_changed.getPOTMsgSetChangedInUbuntu())
     >>> len(potmsgsets)
     2
 

=== modified file 'lib/lp/translations/interfaces/pofile.py'
--- lib/lp/translations/interfaces/pofile.py	2010-01-08 12:39:51 +0000
+++ lib/lp/translations/interfaces/pofile.py	2010-03-23 19:06:29 +0000
@@ -172,11 +172,12 @@
         """Get pot message sets with suggestions submitted after last review.
         """
 
-    def getPOTMsgSetChangedInLaunchpad():
+    def getPOTMsgSetChangedInUbuntu():
         """Get pot message sets changed through Launchpad in this PO file.
 
-        'Changed in Launchpad' are only those which were translated when
-        initially imported, but then got overridden in Launchpad.
+        'Changed in Ubuntu' are only those which were translated when
+        initially imported, but then got overridden in Ubuntu translations
+        through Launchpad.
         """
 
     def getPOTMsgSetWithErrors():

=== modified file 'lib/lp/translations/model/pofile.py'
--- lib/lp/translations/model/pofile.py	2010-01-14 16:39:18 +0000
+++ lib/lp/translations/model/pofile.py	2010-03-23 19:06:29 +0000
@@ -804,13 +804,13 @@
         return self._getOrderedPOTMsgSets(
             [POTMsgSet, TranslationTemplateItem], query)
 
-    def getPOTMsgSetChangedInLaunchpad(self):
+    def getPOTMsgSetChangedInUbuntu(self):
         """See `IPOFile`."""
-        # POT set has been changed in Launchpad if it contains active
+        # POT set has been changed in Ubuntu if it contains active
         # translation which didn't come from a published package
         # (iow, it's different from a published translation: this only
-        # lists translations which have actually changed in LP, not
-        # translations which are 'new' and only exist in LP).
+        # lists translations which have actually changed in Ubuntu, not
+        # translations which are 'new' and only exist in Ubuntu).
 
         # TranslationMessage is changed if:
         # is_current IS TRUE, is_imported IS FALSE,
@@ -957,7 +957,7 @@
 
         # Get the number of translations that we have updated from what we got
         # from imports.
-        updates = self.getPOTMsgSetChangedInLaunchpad().count()
+        updates = self.getPOTMsgSetChangedInUbuntu().count()
 
         # Get total number of messages in a POTemplate.
         if self.potemplate.messageCount() > 0:
@@ -966,12 +966,12 @@
             total = self.potemplate.getPOTMsgSets().count()
             self.potemplate.messagecount = total
 
-        # Get number of translations done only in Launchpad.
+        # Get number of translations done only in Ubuntu.
         untranslated = self.getPOTMsgSetUntranslated().count()
         translated = total - untranslated
         rosetta = translated - current
 
-        # Get number of unreviewed translations in Launchpad.
+        # Get number of unreviewed translations in Ubuntu.
         unreviewed = self.getPOTMsgSetWithNewSuggestions().count()
 
         self.currentcount = current
@@ -1396,7 +1396,7 @@
         """See `IPOFile`."""
         return self.emptySelectResults()
 
-    def getPOTMsgSetChangedInLaunchpad(self):
+    def getPOTMsgSetChangedInUbuntu(self):
         """See `IPOFile`."""
         return self.emptySelectResults()
 

=== modified file 'lib/lp/translations/stories/standalone/xx-pofile-translate-alternative-language.txt'
--- lib/lp/translations/stories/standalone/xx-pofile-translate-alternative-language.txt	2009-09-15 18:53:26 +0000
+++ lib/lp/translations/stories/standalone/xx-pofile-translate-alternative-language.txt	2010-03-23 19:06:29 +0000
@@ -139,7 +139,7 @@
 
     >>> browser.getControl(name='show', index=1).displayOptions
     ['all items', 'untranslated items', 'translated items',
-     'items with new suggestions', 'items changed in Launchpad']
+     'items with new suggestions', 'items changed in Ubuntu']
 
 Carlos sets the filter to display only the untranslated strings.
 

=== modified file 'lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt'
--- lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt	2009-11-09 17:08:21 +0000
+++ lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt	2010-03-23 19:06:29 +0000
@@ -216,21 +216,21 @@
     <div lang="en-AU"...id="msgset_1_en_AU_suggestion_702_0"...>fnord</div>
 
 
-=== Messages changed in Launchpad ===
+=== Messages changed in Ubuntu ===
 
-No Privileges Person can see entries which have changed in Launchpad.
+No Privileges Person can see entries which have changed in Ubuntu.
 There is only one message in the batch.
 
     >>> user_browser.open(
     ...     'http://translations.launchpad.dev/ubuntu/hoary/'
     ...     '+source/evolution/+pots/evolution-2.2/es/+translate')
     >>> user_browser.getControl(name='show', index=1).displayValue = [
-    ...     'changed in Launchpad']
+    ...     'changed in Ubuntu']
     >>> user_browser.getControl('Change').click()
     >>> print extract_url_parameter(user_browser.url, 'batch')
     batch=10
     >>> print extract_url_parameter(user_browser.url, 'show')
-    show=changed_in_launchpad
+    show=changed_in_ubuntu
 
     >>> contents = find_main_content(user_browser.contents)
     >>> print_batch_header(contents)
@@ -247,7 +247,7 @@
     >>> print extract_url_parameter(user_browser.url, 'batch')
     batch=10
     >>> print extract_url_parameter(user_browser.url, 'show')
-    show=changed_in_launchpad
+    show=changed_in_ubuntu
 
     >>> print_shown_messages(user_browser)
     134: '<samp> </samp>caratas'

=== modified file 'lib/lp/translations/stories/translations/43-distrorelease-translations.txt'
--- lib/lp/translations/stories/translations/43-distrorelease-translations.txt	2009-09-09 12:41:48 +0000
+++ lib/lp/translations/stories/translations/43-distrorelease-translations.txt	2010-03-23 19:06:29 +0000
@@ -140,10 +140,10 @@
 The DistroRelease per-language overview page shows different statistics:
 a count of untranslated messages, messages with new, unreviewed suggestions,
 and a count of messages which had their imported translations changed in
-Launchpad.
+Ubuntu.
 
 Looking at the Spanish language overview page, we can see that there are
-15 untranslated, 1 unreviewed and 1 changed in LP Evolution translations
+15 untranslated, 1 unreviewed and 1 changed in Ubuntu Evolution translations
 (all numbers repeated as hidden 'sortkey' values).
 
     >>> browser.open('http://translations.launchpad.dev/ubuntu/hoary/+lang/es')
@@ -195,7 +195,7 @@
     ['new_suggestions']
 
 The number of updated entries points to the translation page with the
-'changed in Launchpad' filter selected.
+'changed in Ubuntu' filter selected.
 
     >>> updated = all_links[3]
     >>> print extract_text(updated)
@@ -203,6 +203,6 @@
     >>> updated_link = extract_link_from_tag(updated, base_href)
     >>> browser.open(updated_link.encode('UTF-8'))
     >>> browser.url
-    'http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/es/+translate?show=changed_in_launchpad'
+    'http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/es/+translate?show=changed_in_ubuntu'
     >>> print browser.getControl(name='show', index=1).value
-    ['changed_in_launchpad']
+    ['changed_in_ubuntu']

=== modified file 'lib/lp/translations/stories/translations/55-rosetta-potemplates.txt'
--- lib/lp/translations/stories/translations/55-rosetta-potemplates.txt	2009-12-21 17:27:17 +0000
+++ lib/lp/translations/stories/translations/55-rosetta-potemplates.txt	2010-03-23 19:06:29 +0000
@@ -101,10 +101,10 @@
 The POTemplate overview page shows different statistics: a count of
 untranslated messages, messages with new, unreviewed suggestions, and
 a count of messages which had their imported translations changed in
-Launchpad.
+Ubuntu.
 
 Looking at the POTemplate overview page, we can see that there are
-15 untranslated, 1 unreviewed and 1 changed in LP Spanish translations
+15 untranslated, 1 unreviewed and 1 changed in Ubuntu Spanish translations
 (all numbers repeated as hidden 'sortkey' values).
 
     >>> browser.open('http://translations.launchpad.dev/ubuntu/hoary/+source/'+
@@ -156,7 +156,7 @@
     new_suggestions
 
 The number of updated entries points to the translation page with the
-'changed in Launchpad' filter selected.
+'changed in Ubuntu' filter selected.
 
     >>> updated = all_links[3]
     >>> print extract_text(updated)
@@ -164,6 +164,6 @@
     >>> updated_link = extract_link_from_tag(updated, base_href)
     >>> browser.open(updated_link.encode('UTF-8'))
     >>> browser.url
-    'http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/es/+translate?show=changed_in_launchpad'
+    'http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/es/+translate?show=changed_in_ubuntu'
     >>> print browser.getControl(name='show', index=2).value
-    changed_in_launchpad
+    changed_in_ubuntu

=== modified file 'lib/lp/translations/templates/pofile-translate.pt'
--- lib/lp/translations/templates/pofile-translate.pt	2010-02-25 00:47:17 +0000
+++ lib/lp/translations/templates/pofile-translate.pt	2010-03-23 19:06:29 +0000
@@ -162,11 +162,11 @@
                   >
                   items with new suggestions
                 </option>
-                <option value="changed_in_launchpad"
+                <option value="changed_in_ubuntu"
                   tal:attributes="selected
-                  request/htmlform:show/selected/changed_in_launchpad"
+                  request/htmlform:show/selected/changed_in_ubuntu"
                   >
-                  items changed in Launchpad
+                  items changed in Ubuntu
                 </option>
               </select>
             </label>

=== modified file 'lib/lp/translations/templates/potemplate-chart.pt'
--- lib/lp/translations/templates/potemplate-chart.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/potemplate-chart.pt	2010-03-23 19:06:29 +0000
@@ -52,7 +52,7 @@
         </td>
         <td>
           <span class="sortkey" tal:content="pf/updatesCount">0</span>
-          <a tal:attributes="href string:${pf/fmt:url}/+translate?show=changed_in_launchpad"
+          <a tal:attributes="href string:${pf/fmt:url}/+translate?show=changed_in_ubuntu"
               tal:condition="pf/updatesCount"
               tal:content="pf/updatesCount"
               >0</a>

=== modified file 'lib/lp/translations/templates/rosetta-status-legend.pt'
--- lib/lp/translations/templates/rosetta-status-legend.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/rosetta-status-legend.pt	2010-03-23 19:06:29 +0000
@@ -19,7 +19,7 @@
       src="/@@/blue-bar"
       style="height: 1em; width: 2em;"
     />
-    Changed in Launchpad
+    Changed in Ubuntu
   </div>
   <div>
     <img

=== modified file 'lib/lp/translations/templates/serieslanguage-index.pt'
--- lib/lp/translations/templates/serieslanguage-index.pt	2009-12-11 20:11:06 +0000
+++ lib/lp/translations/templates/serieslanguage-index.pt	2010-03-23 19:06:29 +0000
@@ -128,7 +128,7 @@
               tal:content="entry/updatesCount">
               0
             </span>
-            <a tal:attributes="href string:${entry/fmt:url}/+translate?show=changed_in_launchpad"
+            <a tal:attributes="href string:${entry/fmt:url}/+translate?show=changed_in_ubuntu"
               tal:condition="entry/updatesCount"
               tal:content="entry/updatesCount"
               >

=== modified file 'lib/lp/translations/tests/test_pofile.py'
--- lib/lp/translations/tests/test_pofile.py	2010-01-12 21:29:03 +0000
+++ lib/lp/translations/tests/test_pofile.py	2010-03-23 19:06:29 +0000
@@ -594,12 +594,12 @@
             self.devel_sr_pofile.getPOTMsgSetWithNewSuggestions())
         self.assertEquals([], found_translations)
 
-    def test_getPOTMsgSetChangedInLaunchpad(self):
+    def test_getPOTMsgSetChangedInUbuntu(self):
         # Test listing of POTMsgSets which contain changes from imports.
 
-        # If there are no translations, nothing is listed.
+        # If there are no translations in Ubuntu, nothing is listed.
         found_translations = list(
-            self.devel_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(found_translations, [])
 
         # Adding a non-imported current translation doesn't change anything.
@@ -608,7 +608,7 @@
             translations=[u"Non-imported translation"])
         self.assertEquals(translation.is_imported, False)
         found_translations = list(
-            self.devel_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(found_translations, [])
 
         # Adding an imported translation which is also current indicates
@@ -619,18 +619,18 @@
         self.assertEquals(translation.is_imported, True)
         self.assertEquals(translation.is_current, True)
         found_translations = list(
-            self.devel_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(found_translations, [])
 
         # However, changing current translation to a non-imported one
-        # makes this a changed in LP translation.
+        # makes this a changed in Ubuntu translation.
         translation = self.factory.makeSharedTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u"Changed translation"], is_imported=False)
         self.assertEquals(translation.is_imported, False)
         self.assertEquals(translation.is_current, True)
         found_translations = list(
-            self.devel_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(found_translations, [self.potmsgset])
 
         # Adding a diverged, non-imported translation, still lists
@@ -641,7 +641,7 @@
         self.assertEquals(translation.is_imported, False)
         self.assertEquals(translation.is_current, True)
         found_translations = list(
-            self.devel_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(found_translations, [self.potmsgset])
 
         # But adding a diverged current and imported translation means
@@ -654,7 +654,7 @@
         self.assertEquals(translation.is_imported, True)
         self.assertEquals(translation.is_current, True)
         found_translations = list(
-            self.devel_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(found_translations, [])
 
         # Changing from a diverged, imported translation is correctly
@@ -665,10 +665,10 @@
         self.assertEquals(translation.is_imported, False)
         self.assertEquals(translation.is_current, True)
         found_translations = list(
-            self.devel_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(found_translations, [self.potmsgset])
 
-    def test_getPOTMsgSetChangedInLaunchpad_diverged_imported(self):
+    def test_getPOTMsgSetChangedInUbuntu_diverged_imported(self):
         # If there is a diverged imported (but non-current) message
         # and a shared current message, it should not be listed as changed.
         # Even though that is generally incorrect, this is a situation
@@ -698,11 +698,11 @@
 
         # Such POTMsgSet is not considered changed in this PO file.
         found_translations = list(
-            self.devel_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(found_translations, [])
 
-    def test_getPOTMsgSetChangedInLaunchpad_SharedDiverged(self):
-        # Test listing of changed in LP for shared/diverged messages.
+    def test_getPOTMsgSetChangedInUbuntu_SharedDiverged(self):
+        # Test listing of changed in Ubuntu for shared/diverged messages.
 
         # Adding an imported translation which is also current indicates
         # that there are no changes.
@@ -712,7 +712,7 @@
         self.assertEquals(translation.is_imported, True)
         self.assertEquals(translation.is_current, True)
         found_translations = list(
-            self.devel_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(found_translations, [])
 
         # Adding a diverged, non-imported translation makes it appear
@@ -723,7 +723,7 @@
         self.assertEquals(translation.is_imported, False)
         self.assertEquals(translation.is_current, True)
         found_translations = list(
-            self.devel_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(found_translations, [self.potmsgset])
 
     def test_getPOTMsgSetWithErrors(self):
@@ -743,7 +743,7 @@
         # We are constructing a POFile with:
         #  - 2 untranslated message
         #  - 2 unreviewed suggestions (for translated and untranslated each)
-        #  - 2 imported translations, out of which 1 is changed in LP
+        #  - 2 imported translations, out of which 1 is changed in Ubuntu
         #  - 1 LP-provided translation
         # For a total of 6 messages, 4 translated (1 from import,
         # 3 only in LP, where 1 is changed from imported).
@@ -775,7 +775,7 @@
             pofile=self.devel_sr_pofile, potmsgset=potmsgset,
             translations=[u"Imported translation"], is_imported=True)
 
-        # Fifth POTMsgSet is translated in import, but changed in LP.
+        # Fifth POTMsgSet is translated in import, but changed in Ubuntu.
         potmsgset = self.factory.makePOTMsgSet(self.devel_potemplate)
         potmsgset.setSequence(self.devel_potemplate, 5)
         translation = self.factory.makeTranslationMessage(
@@ -1070,7 +1070,7 @@
         self.assertEquals(untranslated_potmsgsets,
                           [self.potmsgset1, self.potmsgset2])
 
-    def test_getPOTMsgSetChangedInLaunchpad_ordering(self):
+    def test_getPOTMsgSetChangedInUbuntu_ordering(self):
         # Suggest a translation on both POTMsgSets in devel_sr_pofile,
         # so they are returned with getPOTMsgSetWithNewSuggestions() call.
         imported1 = self.factory.makeSharedTranslationMessage(
@@ -1095,7 +1095,7 @@
             is_imported=False)
 
         potmsgsets = list(
-            self.devel_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(potmsgsets,
                           [self.potmsgset1, self.potmsgset2])
 
@@ -1106,13 +1106,13 @@
 
         # And they are returned in the new order as desired.
         potmsgsets = list(
-            self.stable_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.stable_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(potmsgsets,
                           [self.potmsgset2, self.potmsgset1])
 
         # Order is unchanged for the previous template.
         potmsgsets = list(
-            self.devel_sr_pofile.getPOTMsgSetChangedInLaunchpad())
+            self.devel_sr_pofile.getPOTMsgSetChangedInUbuntu())
         self.assertEquals(potmsgsets,
                           [self.potmsgset1, self.potmsgset2])
 

=== modified file 'lib/lp/translations/tests/test_potmsgset.py'
--- lib/lp/translations/tests/test_potmsgset.py	2010-03-06 06:21:04 +0000
+++ lib/lp/translations/tests/test_potmsgset.py	2010-03-23 19:06:29 +0000
@@ -434,7 +434,7 @@
             [external_suggestion])
 
     def test_hasTranslationChangedInLaunchpad(self):
-        """Make sure checking whether a translation is changed in LP works."""
+        """Check whether a translation is changed in Ubuntu works."""
 
         sr_pofile = self.factory.makePOFile('sr', self.devel_potemplate)
         serbian = sr_pofile.language
@@ -446,7 +446,7 @@
             False)
 
         # If only a current, non-imported translation exists, it's not
-        # changed in LP.
+        # changed in Ubuntu.
         current_shared = self.factory.makeSharedTranslationMessage(
             pofile=sr_pofile, potmsgset=self.potmsgset,
             is_imported=False)
@@ -455,7 +455,7 @@
                 self.devel_potemplate, serbian),
             False)
 
-        # If imported translation is current, it's not changed in LP.
+        # If imported translation is current, it's not changed in Ubuntu.
         current_shared.is_current = False
         imported_shared = self.factory.makeSharedTranslationMessage(
             pofile=sr_pofile, potmsgset=self.potmsgset,
@@ -466,7 +466,7 @@
             False)
 
         # If there's a current, diverged translation, and an imported
-        # non-current one, it's changed in LP.
+        # non-current one, it's changed in Ubuntu.
         imported_shared.is_current = False
         current_diverged = self.factory.makeTranslationMessage(
             pofile=sr_pofile, potmsgset=self.potmsgset,
@@ -477,7 +477,7 @@
             True)
 
         # If imported one is shared and current, yet there is a diverged
-        # current translation as well, it is changed in LP.
+        # current translation as well, it is changed in Ubuntu.
         imported_shared.is_current = False
         self.assertEquals(
             self.potmsgset.hasTranslationChangedInLaunchpad(

=== modified file 'lib/lp/translations/utilities/tests/import-flags.txt'
--- lib/lp/translations/utilities/tests/import-flags.txt	2009-07-02 17:16:50 +0000
+++ lib/lp/translations/utilities/tests/import-flags.txt	2010-03-23 19:06:29 +0000
@@ -242,7 +242,7 @@
      6. sixth              None               None               *
 
 We can notice that we have 4 translations (fuzzy messages are not considered
-translated), with "second" imported one now considered 'changed in LP', and
+translated), with "second" imported one now considered 'changed in Ubuntu', and
 two new translations through Launchpad ("d-from-LP" and "e-from-LP"):
 
     >>> print_pofile_stats(firefox_serbian)
@@ -312,7 +312,7 @@
 With this latest import, we've got five non-fuzzy messages, which are all
 considered 'translated'. Since we are reverting to imported translations
 when there's only a Launchpad-done translation, only a single message is
-marked as 'changed in LP':
+marked as 'changed in Ubuntu':
 
     >>> print_pofile_stats(firefox_serbian)
     total: 6