Merge lp:~litianzhi-1/ubiquity/lp1762097 into lp:ubiquity

[litianzhi]

In Autopilot/ubiquity_autopilot_tests/tests/__init__.py, Gui/gtk/stepPrepare.ui, Tests/test_gtkui.py, the unification of the prepare_foss_disclaimer id in the three files is used, because debian/ubiquity.templates and ubiquity/plugins/ubi-prepare.py use prepare_foss_disclaimer.

In gui/gtk/stepPrepare.ui and debian/ubiquity.templates, the deletion of the last extra space of the string 'This software is subject to license'.

In debian/real-po/zh_CN.po, delete the line that caused the translation to fail

fix bug lp1762097

[Mathieu Trudel-Lapierre (cyphermox)]

Thanks!

review: Approve

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/__init__.py'
--- autopilot/ubiquity_autopilot_tests/tests/__init__.py	2018-04-04 06:36:01 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/__init__.py	2018-04-11 06:32:28 +0000
@@ -269,7 +269,7 @@
             GtkAlignment, BuilderName='stepPrepare')
 
         objList = [
-            'prepare_foss_disclaimer_license',
+            'prepare_foss_disclaimer',
             'prepare_minimal_install',
             'prepare_download_updates',
             'prepare_nonfree_software'

=== modified file 'debian/real-po/zh_CN.po'
--- debian/real-po/zh_CN.po	2018-03-28 12:52:26 +0000
+++ debian/real-po/zh_CN.po	2018-04-11 06:32:28 +0000
@@ -1493,14 +1493,10 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:228001
-#, fuzzy
-#| msgid ""
-#| "Install third-party software for graphics and Wi-Fi hardware, Flash, MP3 "
-#| "and other media"
 msgid ""
 "Install third-party software for graphics and Wi-Fi hardware and additional "
 "media formats"
-msgstr "为图形或无线硬件，以及MP3和其它媒体安装第三方软件"
+msgstr "为图形或无线硬件，以及其它媒体格式安装第三方软件"
 
 #. Type: text
 #. Description

=== modified file 'debian/ubiquity.templates'
--- debian/ubiquity.templates	2018-03-28 12:52:10 +0000
+++ debian/ubiquity.templates	2018-04-11 06:32:28 +0000
@@ -1161,7 +1161,7 @@
 Template: ubiquity/text/prepare_foss_disclaimer
 Type: text
 _Description:
- This software is subject to license terms included with its documentation. Some is proprietary. 
+ This software is subject to license terms included with its documentation. Some is proprietary.
 
 Template: ubiquity/text/prepare_nonfree_software
 Type: text

=== modified file 'gui/gtk/stepPrepare.ui'
--- gui/gtk/stepPrepare.ui	2018-03-28 12:49:42 +0000
+++ gui/gtk/stepPrepare.ui	2018-04-11 06:32:28 +0000
@@ -289,12 +289,11 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkLabel" id="prepare_foss_disclaimer_license">
+                          <object class="GtkLabel" id="prepare_foss_disclaimer">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">3</property>
-                            <property name="label" translatable="yes">This software is subject to license terms included with its documentation. Some is proprietary. 
-</property>
+                            <property name="label" translatable="yes">This software is subject to license terms included with its documentation. Some is proprietary.</property>
                             <property name="wrap">True</property>
                             <property name="ellipsize">middle</property>
                             <property name="xalign">0</property>

=== modified file 'tests/test_gtkui.py'
--- tests/test_gtkui.py	2016-10-06 23:30:02 +0000
+++ tests/test_gtkui.py	2018-04-11 06:32:28 +0000
@@ -135,7 +135,7 @@
                 'label_global_error',
                 'warning_password_label', 'label1', 'secureboot_label',
                 # secure boot
-                'disable_secureboot', 'prepare_foss_disclaimer_license',
+                'disable_secureboot', 'prepare_foss_disclaimer',
                 'label_free_space', 'label_required_space',
                 'label_download_updates',
             ]