Merge lp:~xnox/ubiquity/UntitledSeries into lp:ubiquity

[Dimitri John Ledkov]

for u merge window

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-22 11:28:17 +0000
+++ debian/changelog	2014-04-22 13:34:25 +0000
@@ -4,6 +4,11 @@
   * LP: #1309458 KDE: ubiquity installer crashes when clicking release
     notes
 
+  [ Dimitri John Ledkov ]
+  * Remove setting translated placeholder text in the usersetup
+    plugin. (LP: #1283047)
+  * Drop translation messages from ubiquity.templates.
+
  -- Jonathan Riddell <[e-mail]>  Tue, 22 Apr 2014 12:25:19 +0100
 
 ubiquity (2.18.7) trusty; urgency=medium

=== modified file 'debian/ubiquity.templates'
--- debian/ubiquity.templates	2014-04-09 21:34:01 +0000
+++ debian/ubiquity.templates	2014-04-22 13:34:25 +0000
@@ -120,26 +120,10 @@
 Type: text
 _Description: Your name:
 
-Template: ubiquity/text/fullname_inactive_label
-Type: text
-_Description: Your name
-
-Template: ubiquity/text/password_new_inactive_label
-Type: text
-_Description: At least 8 characters password
-
-Template: ubiquity/text/password_new_again_inactive_label
-Type: text
-_Description: Retype password
-
 Template: ubiquity/text/username_label
 Type: text
 _Description: Pick a username:
 
-Template: ubiquity/text/username_inactive_label
-Type: text
-_Description: Username
-
 Template: ubiquity/text/username_extra_label
 Type: text
 _Description: &lt;small&gt;If more than one person will use this computer, you can set up multiple accounts after installation.&lt;/small&gt;

=== modified file 'ubiquity/plugins/ubi-usersetup.py'
--- ubiquity/plugins/ubi-usersetup.py	2013-03-21 16:45:35 +0000
+++ ubiquity/plugins/ubi-usersetup.py	2014-04-22 13:34:25 +0000
@@ -235,20 +235,6 @@
         self.resolver_ok = True
         self.plugin_widgets = self.page
 
-    def plugin_translate(self, lang):
-        # TODO Move back into the frontend as we can check
-        # isinstance(LabelledEntry and just call set_label.  We'll need to
-        # properly name the debconf keys though (s/inactive_label//)
-        user = self.controller.get_string('username_inactive_label', lang)
-        full = self.controller.get_string('fullname_inactive_label', lang)
-        pasw = self.controller.get_string('password_inactive_label', lang)
-        vpas = self.controller.get_string('password_again_inactive_label',
-                                          lang)
-        self.username.set_placeholder_text(user)
-        self.fullname.set_placeholder_text(full)
-        self.password.set_placeholder_text(pasw)
-        self.verified_password.set_placeholder_text(vpas)
-
     # Functions called by the Page.
 
     def set_fullname(self, value):