Merge lp:~jbicha/ubiquity/update-updates-page into lp:ubiquity

[Jeremy Bícha]

[Rik Mills (rikmills)]

Please see my comment and screenshots in the related bug.

With respect to Kubuntu, and testing the packages from Jeremy's PPA, this MP in it's current state represents a regression in the KDE front end, without any on the benefits seen in the GTK one.

[Jean-Baptiste Lallement (jibel)]

Agreed, a change in a frontend cannot introduce a regression in another frontend. Please update the KDE frontend to match the design too.

review: Needs Fixing

[lp:~jbicha/ubiquity/update-updates-page]

6598. By Rik Mills on 2018-03-26

[ Rik Mills ]
Mark the sddm.conf file for OEM so that it can be removed by oem-config
if unchanged.

6599. By Jean-Baptiste Lallement on 2018-03-27

* ubiquity/frontend/{gtk,kde}_ui.py:
  - Set a marker when user is done to know how long the last screen took or if
    the user delayed the whole install process. Thanks didrocks.

6600. By Jeremy Bícha on 2018-03-28

Update "Updates and Other Software" page to match the spec (LP: #1758082)

6601. By Rik Mills on 2018-03-28

Update KDE/Qt "Updates and Other Software" page in line with GTK changes,
with some tweaks appropriate for Kubuntu usage in Bionic

6602. By Jeremy Bícha on 2018-03-28

update ubiquity.templates for previous changes

6603. By Jeremy Bícha on 2018-03-28

Run debconf-updatepo for previous changes

[Jean-Baptiste Lallement (jibel)]

Thanks Jeremy and Rik for your work.

It all looks goo to me. I tested on Ubuntu, Kubuntu and Kylin and didn't find any issue.

Although the telemetry file generated for Kubuntu is not fully useful due to the name of the stages. Several steps are called "Form" or "page" without any indication of which form or page.

{
  "Media": "Kubuntu 18.04 LTS \"Bionic Beaver\" - Alpha amd64 (20180328)",
  "Type": "KDE",
  "PartitionMethod": "use_device",
  "DownloadUpdates": false,
  "Language": "en",
  "Minimal": true,
  "RestrictedAddons": true,
  "Stages": {
    "0": "language",
    "1": "language",
    "6": "page",
    "9": "Form",
    "44": "Form",
    "58": "start_install",
    "60": "page",
    "62": "Form",
    "73": "user_done",
    "785": "done"
  }
}

Approved! Thanks again!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-03-26 18:05:27 +0000
+++ debian/changelog	2018-03-28 12:52:58 +0000
@@ -16,7 +16,12 @@
   * Collect and dump telemetry info as a log file: (LP: #1755456)
     Those installation telemetry info are for optional upload later on.
 
+  [ Jeremy Bicha ]
+  * Update "Updates and Other Software" page to match the spec (LP: #1758082)
+
   [ Rik Mills ]
+  * Update KDE/Qt "Updates and Other Software" page in line with GTK changes,
+    with some tweaks appropriate for Kubuntu usage in Bionic
   * Mark the sddm.conf file for OEM so that it can be removed by oem-config
     if unchanged.
 
 
=== modified file 'debian/real-po/aa.po'
--- debian/real-po/aa.po	2018-03-08 16:50:33 +0000
+++ debian/real-po/aa.po	2018-03-28 12:52:58 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2018-03-08 17:50+0100\n"
+"POT-Creation-Date: 2018-03-28 08:52-0400\n"
 "PO-Revision-Date: 2016-09-02 01:13+0000\n"
 "Last-Translator: Charif AYFARAH <[e-mail]>\n"
 "Language-Team: Afar <[e-mail]>\n"
@@ -549,7 +549,7 @@
 #. An action, displayed on a button or as a menu item.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:84001 ../ubiquity.templates:281001
+#: ../ubiquity.templates:84001 ../ubiquity.templates:288001
 msgid "Revert"
 msgstr "Wadir-gacis"
 
@@ -1150,7 +1150,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:174001 ../ubiquity.templates:245001
+#: ../ubiquity.templates:174001 ../ubiquity.templates:252001
 msgid "Welcome"
 msgstr "Arcib"
 
@@ -1183,8 +1183,10 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:179001
-msgid "Prepare"
-msgstr ""
+#, fuzzy
+#| msgid "Software selection"
+msgid "Software"
+msgstr "Fantaaso dooro"
 
 #. Type: text
 #. Description
@@ -1466,7 +1468,8 @@
 #. Description
 #: ../ubiquity.templates:228001
 msgid ""
-"Install software for graphics, Wi-Fi hardware, and additional media playback"
+"Install third-party software for graphics and Wi-Fi hardware and additional "
+"media formats"
 msgstr ""
 
 #. Type: text
@@ -1490,22 +1493,66 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:232001
-#, fuzzy
-#| msgid "Cancel the installation."
-msgid "Minimal installation"
-msgstr "Daabisso baxqis."
+msgid "What apps would you like to install to start with?"
+msgstr ""
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:233001
-msgid ""
-"This will only install a minimal desktop environment with a browser and "
-"utilities."
+msgid "Which applications would you like to start with?"
 msgstr ""
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:234001
+#, fuzzy
+#| msgid "Cancel the installation."
+msgid "Minimal installation"
+msgstr "Daabisso baxqis."
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:235001
+msgid "Web browser and basic utilities."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:236001
+msgid "Web browser plus basic utilities and applications."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:237001
+#, fuzzy
+#| msgid "Cancel the installation."
+msgid "Normal installation"
+msgstr "Daabisso baxqis."
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:238001
+msgid "Web browser, utilities, office software, games, and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:239001
+msgid ""
+"Web browser, utilities, office software, KDE PIM suite plus additional "
+"internet applications and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:240001
+msgid "Other options"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:241001
 msgid ""
 "Installing third-party drivers requires turning off Secure Boot. To do this, "
 "you need to choose a security key now, and enter it when the system restarts."
@@ -1513,25 +1560,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:238001
+#: ../ubiquity.templates:245001
 msgid "Layout:"
 msgstr "Raku:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:239001
+#: ../ubiquity.templates:246001
 msgid "Variant:"
 msgstr "Qaynatak teyna:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:240001
+#: ../ubiquity.templates:247001
 msgid "Below is an image of your current layout:"
 msgstr "Ahak gubal tanim, away lito rakih muuci:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:241001
+#: ../ubiquity.templates:248001
 msgid ""
 "Select your location, so that the system can use appropriate display "
 "conventions for your country, fetch updates from sites close to you, and set "
@@ -1542,19 +1589,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:242001
+#: ../ubiquity.templates:249001
 msgid "Time Zone:"
 msgstr "Waqlâ Dabba:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:243001
+#: ../ubiquity.templates:250001
 msgid "Region:"
 msgstr "Rakaakaya:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:244001
+#: ../ubiquity.templates:251001
 msgid "[type here to change]"
 msgstr ""
 
@@ -1562,14 +1609,14 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid "Replace ${OS} with ${DISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
 "${OS} programs, documents, photos, music, and any other files."
@@ -1579,7 +1626,7 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:248001
+#: ../ubiquity.templates:255001
 msgid "Install ${DISTRO} alongside ${OS}"
 msgstr ""
 
@@ -1591,8 +1638,8 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:248001 ../ubiquity.templates:249001
-#: ../ubiquity.templates:253001 ../ubiquity.templates:258001
+#: ../ubiquity.templates:255001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:260001 ../ubiquity.templates:265001
 msgid ""
 "Documents, music, and other personal files will be kept. You can choose "
 "which operating system you want each time the computer starts up."
@@ -1602,20 +1649,20 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:249001
+#: ../ubiquity.templates:256001
 msgid "Install ${DISTRO} inside ${OS}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid "Something else"
 msgstr ""
 
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid ""
 "You can create or resize partitions yourself, or choose multiple partitions "
 "for ${DISTRO}."
@@ -1624,14 +1671,14 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid "Erase ${CURDISTRO} and reinstall"
 msgstr ""
 
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "${CURDISTRO} programs, documents, photos, music, and any other files."
@@ -1641,7 +1688,7 @@
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
 #. VER is a variable substituted into this string, and may be '11.04'
-#: ../ubiquity.templates:252001
+#: ../ubiquity.templates:259001
 msgid "Upgrade ${CURDISTRO} to ${VER}"
 msgstr ""
 
@@ -1649,7 +1696,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:252001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:259001 ../ubiquity.templates:263001
 msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "will be kept where possible. System-wide settings will be cleared."
@@ -1660,7 +1707,7 @@
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. VER is a variable substituted into this string, and may be '11.04'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:253001
+#: ../ubiquity.templates:260001
 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
 msgstr ""
 
@@ -1670,13 +1717,13 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:254001 ../ubiquity.templates:257001
+#: ../ubiquity.templates:261001 ../ubiquity.templates:264001
 msgid "Erase disk and install ${DISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:254001
+#: ../ubiquity.templates:261001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
 "the disk."
@@ -1684,7 +1731,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid "Erase everything and reinstall"
 msgstr ""
 
@@ -1692,7 +1739,7 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and other files in both ${OS} and "
@@ -1702,13 +1749,13 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:256001
+#: ../ubiquity.templates:263001
 msgid "Reinstall ${CURDISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:257001
+#: ../ubiquity.templates:264001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and any other files in all operating "
@@ -1718,14 +1765,14 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:258001
+#: ../ubiquity.templates:265001
 msgid "Install ${DISTRO} alongside them"
 msgstr ""
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:259001
+#: ../ubiquity.templates:266001
 msgid "This computer currently has ${OS} on it. What would you like to do?"
 msgstr ""
 
@@ -1733,7 +1780,7 @@
 #. Description
 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
-#: ../ubiquity.templates:260001
+#: ../ubiquity.templates:267001
 msgid ""
 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
 "do?"
@@ -1741,7 +1788,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:261001
+#: ../ubiquity.templates:268001
 msgid ""
 "This computer currently has multiple operating systems on it. What would you "
 "like to do?"
@@ -1749,7 +1796,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:262001
+#: ../ubiquity.templates:269001
 msgid ""
 "This computer currently has no detected operating systems. What would you "
 "like to do?"
@@ -1757,37 +1804,37 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:263001
+#: ../ubiquity.templates:270001
 msgid "Before:"
 msgstr "Duma:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:264001
+#: ../ubiquity.templates:271001
 msgid "After:"
 msgstr "Sarra:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:265001
+#: ../ubiquity.templates:272001
 msgid "Encrypt the new ${RELEASE} installation for security"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:266001
+#: ../ubiquity.templates:273001
 msgid "You will choose a security key in the next step."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:267001
+#: ../ubiquity.templates:274001
 msgid "Use LVM with the new ${RELEASE} installation"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:268001
+#: ../ubiquity.templates:275001
 msgid ""
 "This will set up Logical Volume Management. It allows taking snapshots and "
 "easier partition resizing."
@@ -1795,19 +1842,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:269001
+#: ../ubiquity.templates:276001
 msgid "Confirm the security key:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:270001
+#: ../ubiquity.templates:277001
 msgid "Choose a security key:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:271001
+#: ../ubiquity.templates:278001
 msgid ""
 "Disk encryption protects your files in case you lose your computer. It "
 "requires you to enter a security key each time the computer starts up."
@@ -1815,13 +1862,13 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:272001
+#: ../ubiquity.templates:279001
 msgid "Any files outside of ${RELEASE} will not be encrypted."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:273001
+#: ../ubiquity.templates:280001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
 "all data will be lost. If you need to, write down your key and keep it in a "
@@ -1830,61 +1877,61 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:274001
+#: ../ubiquity.templates:281001
 msgid "For more security:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:275001
+#: ../ubiquity.templates:282001
 msgid "Overwrite empty disk space"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:276001
+#: ../ubiquity.templates:283001
 msgid "The installation may take much longer."
 msgstr ""
 
 #. Type: text
 #. description
-#: ../ubiquity.templates:277001
+#: ../ubiquity.templates:284001
 msgid "LVM..."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:278001
+#: ../ubiquity.templates:285001
 msgid "Volume groups:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:279001
+#: ../ubiquity.templates:286001
 msgid "Encryption Options"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:280001
+#: ../ubiquity.templates:287001
 msgid "Physical volumes:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:282001
+#: ../ubiquity.templates:289001
 msgid "Encrypt this partition (LUKS)"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:283001
+#: ../ubiquity.templates:290001
 msgid "MB"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:284001
+#: ../ubiquity.templates:291001
 msgid ""
 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
 "volumes as a single volume."
@@ -1892,25 +1939,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:285001
+#: ../ubiquity.templates:292001
 msgid "Logical Volume Management"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:286001
+#: ../ubiquity.templates:293001
 msgid "Encryption options..."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:287001
+#: ../ubiquity.templates:294001
 msgid "UEFI Secure Boot"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "You have chosen to enable third-party software as part of your install, "
 "which for this system includes hardware drivers for graphics and/or wi-fi "
@@ -1920,7 +1967,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "After installation completes, Ubuntu will assist you in disabling UEFI "
 "Secure Boot. To ensure that this change is being made by you as an "
@@ -1930,7 +1977,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
 "these drivers, or if you proceed but do not confirm the password upon "
@@ -1940,7 +1987,7 @@
 
 #. Type: password
 #. Description
-#: ../ubiquity.templates:289001
+#: ../ubiquity.templates:296001
 msgid "SecureBoot key for MokPW"
 msgstr ""
 
 
=== modified file 'debian/real-po/ace.po'
--- debian/real-po/ace.po	2018-03-08 16:50:33 +0000
+++ debian/real-po/ace.po	2018-03-28 12:52:58 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2018-03-08 17:50+0100\n"
+"POT-Creation-Date: 2018-03-28 08:52-0400\n"
 "PO-Revision-Date: 2012-06-02 13:15+0000\n"
 "Last-Translator: machroezar <Unknown>\n"
 "Language-Team: Acehnese <[e-mail]>\n"
@@ -549,7 +549,7 @@
 #. An action, displayed on a button or as a menu item.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:84001 ../ubiquity.templates:281001
+#: ../ubiquity.templates:84001 ../ubiquity.templates:288001
 msgid "Revert"
 msgstr ""
 
@@ -1143,7 +1143,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:174001 ../ubiquity.templates:245001
+#: ../ubiquity.templates:174001 ../ubiquity.templates:252001
 msgid "Welcome"
 msgstr "Seulamat troh teuka"
 
@@ -1176,7 +1176,7 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:179001
-msgid "Prepare"
+msgid "Software"
 msgstr ""
 
 #. Type: text
@@ -1457,7 +1457,8 @@
 #. Description
 #: ../ubiquity.templates:228001
 msgid ""
-"Install software for graphics, Wi-Fi hardware, and additional media playback"
+"Install third-party software for graphics and Wi-Fi hardware and additional "
+"media formats"
 msgstr ""
 
 #. Type: text
@@ -1481,20 +1482,62 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:232001
-msgid "Minimal installation"
+msgid "What apps would you like to install to start with?"
 msgstr ""
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:233001
-msgid ""
-"This will only install a minimal desktop environment with a browser and "
-"utilities."
+msgid "Which applications would you like to start with?"
 msgstr ""
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:234001
+msgid "Minimal installation"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:235001
+msgid "Web browser and basic utilities."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:236001
+msgid "Web browser plus basic utilities and applications."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:237001
+msgid "Normal installation"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:238001
+msgid "Web browser, utilities, office software, games, and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:239001
+msgid ""
+"Web browser, utilities, office software, KDE PIM suite plus additional "
+"internet applications and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:240001
+msgid "Other options"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:241001
 msgid ""
 "Installing third-party drivers requires turning off Secure Boot. To do this, "
 "you need to choose a security key now, and enter it when the system restarts."
@@ -1502,25 +1545,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:238001
+#: ../ubiquity.templates:245001
 msgid "Layout:"
 msgstr "Susunan:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:239001
+#: ../ubiquity.templates:246001
 msgid "Variant:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:240001
+#: ../ubiquity.templates:247001
 msgid "Below is an image of your current layout:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:241001
+#: ../ubiquity.templates:248001
 msgid ""
 "Select your location, so that the system can use appropriate display "
 "conventions for your country, fetch updates from sites close to you, and set "
@@ -1529,19 +1572,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:242001
+#: ../ubiquity.templates:249001
 msgid "Time Zone:"
 msgstr "Zona Wate:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:243001
+#: ../ubiquity.templates:250001
 msgid "Region:"
 msgstr "Wilayah:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:244001
+#: ../ubiquity.templates:251001
 msgid "[type here to change]"
 msgstr ""
 
@@ -1549,14 +1592,14 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid "Replace ${OS} with ${DISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
 "${OS} programs, documents, photos, music, and any other files."
@@ -1566,7 +1609,7 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:248001
+#: ../ubiquity.templates:255001
 msgid "Install ${DISTRO} alongside ${OS}"
 msgstr ""
 
@@ -1578,8 +1621,8 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:248001 ../ubiquity.templates:249001
-#: ../ubiquity.templates:253001 ../ubiquity.templates:258001
+#: ../ubiquity.templates:255001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:260001 ../ubiquity.templates:265001
 msgid ""
 "Documents, music, and other personal files will be kept. You can choose "
 "which operating system you want each time the computer starts up."
@@ -1589,20 +1632,20 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:249001
+#: ../ubiquity.templates:256001
 msgid "Install ${DISTRO} inside ${OS}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid "Something else"
 msgstr ""
 
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid ""
 "You can create or resize partitions yourself, or choose multiple partitions "
 "for ${DISTRO}."
@@ -1611,14 +1654,14 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid "Erase ${CURDISTRO} and reinstall"
 msgstr ""
 
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "${CURDISTRO} programs, documents, photos, music, and any other files."
@@ -1628,7 +1671,7 @@
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
 #. VER is a variable substituted into this string, and may be '11.04'
-#: ../ubiquity.templates:252001
+#: ../ubiquity.templates:259001
 msgid "Upgrade ${CURDISTRO} to ${VER}"
 msgstr ""
 
@@ -1636,7 +1679,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:252001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:259001 ../ubiquity.templates:263001
 msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "will be kept where possible. System-wide settings will be cleared."
@@ -1647,7 +1690,7 @@
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. VER is a variable substituted into this string, and may be '11.04'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:253001
+#: ../ubiquity.templates:260001
 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
 msgstr ""
 
@@ -1657,13 +1700,13 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:254001 ../ubiquity.templates:257001
+#: ../ubiquity.templates:261001 ../ubiquity.templates:264001
 msgid "Erase disk and install ${DISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:254001
+#: ../ubiquity.templates:261001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
 "the disk."
@@ -1671,7 +1714,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid "Erase everything and reinstall"
 msgstr ""
 
@@ -1679,7 +1722,7 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and other files in both ${OS} and "
@@ -1689,13 +1732,13 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:256001
+#: ../ubiquity.templates:263001
 msgid "Reinstall ${CURDISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:257001
+#: ../ubiquity.templates:264001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and any other files in all operating "
@@ -1705,14 +1748,14 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:258001
+#: ../ubiquity.templates:265001
 msgid "Install ${DISTRO} alongside them"
 msgstr ""
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:259001
+#: ../ubiquity.templates:266001
 msgid "This computer currently has ${OS} on it. What would you like to do?"
 msgstr ""
 
@@ -1720,7 +1763,7 @@
 #. Description
 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
-#: ../ubiquity.templates:260001
+#: ../ubiquity.templates:267001
 msgid ""
 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
 "do?"
@@ -1728,7 +1771,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:261001
+#: ../ubiquity.templates:268001
 msgid ""
 "This computer currently has multiple operating systems on it. What would you "
 "like to do?"
@@ -1736,7 +1779,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:262001
+#: ../ubiquity.templates:269001
 msgid ""
 "This computer currently has no detected operating systems. What would you "
 "like to do?"
@@ -1744,37 +1787,37 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:263001
+#: ../ubiquity.templates:270001
 msgid "Before:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:264001
+#: ../ubiquity.templates:271001
 msgid "After:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:265001
+#: ../ubiquity.templates:272001
 msgid "Encrypt the new ${RELEASE} installation for security"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:266001
+#: ../ubiquity.templates:273001
 msgid "You will choose a security key in the next step."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:267001
+#: ../ubiquity.templates:274001
 msgid "Use LVM with the new ${RELEASE} installation"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:268001
+#: ../ubiquity.templates:275001
 msgid ""
 "This will set up Logical Volume Management. It allows taking snapshots and "
 "easier partition resizing."
@@ -1782,19 +1825,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:269001
+#: ../ubiquity.templates:276001
 msgid "Confirm the security key:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:270001
+#: ../ubiquity.templates:277001
 msgid "Choose a security key:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:271001
+#: ../ubiquity.templates:278001
 msgid ""
 "Disk encryption protects your files in case you lose your computer. It "
 "requires you to enter a security key each time the computer starts up."
@@ -1802,13 +1845,13 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:272001
+#: ../ubiquity.templates:279001
 msgid "Any files outside of ${RELEASE} will not be encrypted."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:273001
+#: ../ubiquity.templates:280001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
 "all data will be lost. If you need to, write down your key and keep it in a "
@@ -1817,61 +1860,61 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:274001
+#: ../ubiquity.templates:281001
 msgid "For more security:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:275001
+#: ../ubiquity.templates:282001
 msgid "Overwrite empty disk space"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:276001
+#: ../ubiquity.templates:283001
 msgid "The installation may take much longer."
 msgstr ""
 
 #. Type: text
 #. description
-#: ../ubiquity.templates:277001
+#: ../ubiquity.templates:284001
 msgid "LVM..."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:278001
+#: ../ubiquity.templates:285001
 msgid "Volume groups:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:279001
+#: ../ubiquity.templates:286001
 msgid "Encryption Options"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:280001
+#: ../ubiquity.templates:287001
 msgid "Physical volumes:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:282001
+#: ../ubiquity.templates:289001
 msgid "Encrypt this partition (LUKS)"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:283001
+#: ../ubiquity.templates:290001
 msgid "MB"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:284001
+#: ../ubiquity.templates:291001
 msgid ""
 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
 "volumes as a single volume."
@@ -1879,25 +1922,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:285001
+#: ../ubiquity.templates:292001
 msgid "Logical Volume Management"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:286001
+#: ../ubiquity.templates:293001
 msgid "Encryption options..."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:287001
+#: ../ubiquity.templates:294001
 msgid "UEFI Secure Boot"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "You have chosen to enable third-party software as part of your install, "
 "which for this system includes hardware drivers for graphics and/or wi-fi "
@@ -1907,7 +1950,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "After installation completes, Ubuntu will assist you in disabling UEFI "
 "Secure Boot. To ensure that this change is being made by you as an "
@@ -1917,7 +1960,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
 "these drivers, or if you proceed but do not confirm the password upon "
@@ -1927,7 +1970,7 @@
 
 #. Type: password
 #. Description
-#: ../ubiquity.templates:289001
+#: ../ubiquity.templates:296001
 msgid "SecureBoot key for MokPW"
 msgstr ""
 
 
=== modified file 'debian/real-po/af.po'
--- debian/real-po/af.po	2018-03-08 16:50:33 +0000
+++ debian/real-po/af.po	2018-03-28 12:52:58 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2018-03-08 17:50+0100\n"
+"POT-Creation-Date: 2018-03-28 08:52-0400\n"
 "PO-Revision-Date: 2017-09-29 16:21+0000\n"
 "Last-Translator: Riaan de Beer <[e-mail]>\n"
 "Language-Team: Afrikaans <[e-mail]>\n"
@@ -567,7 +567,7 @@
 #. An action, displayed on a button or as a menu item.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:84001 ../ubiquity.templates:281001
+#: ../ubiquity.templates:84001 ../ubiquity.templates:288001
 msgid "Revert"
 msgstr "Terugval"
 
@@ -1210,7 +1210,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:174001 ../ubiquity.templates:245001
+#: ../ubiquity.templates:174001 ../ubiquity.templates:252001
 msgid "Welcome"
 msgstr "Welkom"
 
@@ -1243,8 +1243,10 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:179001
-msgid "Prepare"
-msgstr "Berei voor"
+#, fuzzy
+#| msgid "Software selection"
+msgid "Software"
+msgstr "Sagtewarekeuse"
 
 #. Type: text
 #. Description
@@ -1548,7 +1550,8 @@
 #| "Install third-party software for graphics and Wi-Fi hardware, Flash, MP3 "
 #| "and other media"
 msgid ""
-"Install software for graphics, Wi-Fi hardware, and additional media playback"
+"Install third-party software for graphics and Wi-Fi hardware and additional "
+"media formats"
 msgstr ""
 "Installeer derde party sagteware vir grafieke en Wi-Fi hardeware, Flash, MP3 "
 "en ander media."
@@ -1575,21 +1578,69 @@
 #. Description
 #: ../ubiquity.templates:232001
 #, fuzzy
-#| msgid "Cancel the installation."
-msgid "Minimal installation"
-msgstr "Kanselleer die installasie."
+#| msgid "Where would you like to install Kubuntu?"
+msgid "What apps would you like to install to start with?"
+msgstr "Waar wil jy graag Kubuntu installeer?"
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:233001
-msgid ""
-"This will only install a minimal desktop environment with a browser and "
-"utilities."
-msgstr ""
+#, fuzzy
+#| msgid "Where would you like to install Kubuntu?"
+msgid "Which applications would you like to start with?"
+msgstr "Waar wil jy graag Kubuntu installeer?"
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:234001
+#, fuzzy
+#| msgid "Cancel the installation."
+msgid "Minimal installation"
+msgstr "Kanselleer die installasie."
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:235001
+msgid "Web browser and basic utilities."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:236001
+msgid "Web browser plus basic utilities and applications."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:237001
+#, fuzzy
+#| msgid "Cancel the installation."
+msgid "Normal installation"
+msgstr "Kanselleer die installasie."
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:238001
+msgid "Web browser, utilities, office software, games, and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:239001
+msgid ""
+"Web browser, utilities, office software, KDE PIM suite plus additional "
+"internet applications and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:240001
+msgid "Other options"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:241001
 msgid ""
 "Installing third-party drivers requires turning off Secure Boot. To do this, "
 "you need to choose a security key now, and enter it when the system restarts."
@@ -1597,25 +1648,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:238001
+#: ../ubiquity.templates:245001
 msgid "Layout:"
 msgstr "Uitleg:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:239001
+#: ../ubiquity.templates:246001
 msgid "Variant:"
 msgstr "Variant:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:240001
+#: ../ubiquity.templates:247001
 msgid "Below is an image of your current layout:"
 msgstr "Onder is a prentjie van jou huidige uitleg:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:241001
+#: ../ubiquity.templates:248001
 msgid ""
 "Select your location, so that the system can use appropriate display "
 "conventions for your country, fetch updates from sites close to you, and set "
@@ -1627,19 +1678,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:242001
+#: ../ubiquity.templates:249001
 msgid "Time Zone:"
 msgstr "Tydsone:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:243001
+#: ../ubiquity.templates:250001
 msgid "Region:"
 msgstr "Streek:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:244001
+#: ../ubiquity.templates:251001
 msgid "[type here to change]"
 msgstr "[tik hier om te verander]"
 
@@ -1647,14 +1698,14 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid "Replace ${OS} with ${DISTRO}"
 msgstr "Vervang ${OS} met ${DISTRO}"
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
 "${OS} programs, documents, photos, music, and any other files."
@@ -1666,7 +1717,7 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:248001
+#: ../ubiquity.templates:255001
 msgid "Install ${DISTRO} alongside ${OS}"
 msgstr "Installeer ${DISTRO} naas ${OS}"
 
@@ -1678,8 +1729,8 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:248001 ../ubiquity.templates:249001
-#: ../ubiquity.templates:253001 ../ubiquity.templates:258001
+#: ../ubiquity.templates:255001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:260001 ../ubiquity.templates:265001
 msgid ""
 "Documents, music, and other personal files will be kept. You can choose "
 "which operating system you want each time the computer starts up."
@@ -1691,20 +1742,20 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:249001
+#: ../ubiquity.templates:256001
 msgid "Install ${DISTRO} inside ${OS}"
 msgstr "Installeer ${DISTRO} in ${OS}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid "Something else"
 msgstr "Iets anders"
 
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid ""
 "You can create or resize partitions yourself, or choose multiple partitions "
 "for ${DISTRO}."
@@ -1715,14 +1766,14 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid "Erase ${CURDISTRO} and reinstall"
 msgstr "Verwyder ${CURDISTRO} en herinstalleer"
 
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "${CURDISTRO} programs, documents, photos, music, and any other files."
@@ -1734,7 +1785,7 @@
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
 #. VER is a variable substituted into this string, and may be '11.04'
-#: ../ubiquity.templates:252001
+#: ../ubiquity.templates:259001
 msgid "Upgrade ${CURDISTRO} to ${VER}"
 msgstr "Gradeer ${CURDISTRO} op na ${VER}"
 
@@ -1742,7 +1793,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:252001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:259001 ../ubiquity.templates:263001
 msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "will be kept where possible. System-wide settings will be cleared."
@@ -1756,7 +1807,7 @@
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. VER is a variable substituted into this string, and may be '11.04'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:253001
+#: ../ubiquity.templates:260001
 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
 msgstr "Installeer ${DISTRO} ${VER} naas ${CURDISTRO}"
 
@@ -1766,13 +1817,13 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:254001 ../ubiquity.templates:257001
+#: ../ubiquity.templates:261001 ../ubiquity.templates:264001
 msgid "Erase disk and install ${DISTRO}"
 msgstr "Skrap skyf en installeer ${DISTRO}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:254001
+#: ../ubiquity.templates:261001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
 "the disk."
@@ -1782,7 +1833,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid "Erase everything and reinstall"
 msgstr "Skrap alles en herinstalleer"
 
@@ -1790,7 +1841,7 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and other files in both ${OS} and "
@@ -1803,13 +1854,13 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:256001
+#: ../ubiquity.templates:263001
 msgid "Reinstall ${CURDISTRO}"
 msgstr "Herinstalleer ${CURDISTRO}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:257001
+#: ../ubiquity.templates:264001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and any other files in all operating "
@@ -1822,14 +1873,14 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:258001
+#: ../ubiquity.templates:265001
 msgid "Install ${DISTRO} alongside them"
 msgstr "Installeer ${DISTRO} naas hulle"
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:259001
+#: ../ubiquity.templates:266001
 msgid "This computer currently has ${OS} on it. What would you like to do?"
 msgstr "Die rekenaar het tans ${OS} geïnstalleer. Wat wil jy doen?"
 
@@ -1837,7 +1888,7 @@
 #. Description
 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
-#: ../ubiquity.templates:260001
+#: ../ubiquity.templates:267001
 msgid ""
 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
 "do?"
@@ -1845,7 +1896,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:261001
+#: ../ubiquity.templates:268001
 msgid ""
 "This computer currently has multiple operating systems on it. What would you "
 "like to do?"
@@ -1854,7 +1905,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:262001
+#: ../ubiquity.templates:269001
 msgid ""
 "This computer currently has no detected operating systems. What would you "
 "like to do?"
@@ -1864,37 +1915,37 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:263001
+#: ../ubiquity.templates:270001
 msgid "Before:"
 msgstr "Voor:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:264001
+#: ../ubiquity.templates:271001
 msgid "After:"
 msgstr "Na:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:265001
+#: ../ubiquity.templates:272001
 msgid "Encrypt the new ${RELEASE} installation for security"
 msgstr "Enkripteer die nuwe ${RELEASE}-installasie vir veiligheid."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:266001
+#: ../ubiquity.templates:273001
 msgid "You will choose a security key in the next step."
 msgstr "Jy sal in die volgende stap 'n beveiligingsleutel kies."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:267001
+#: ../ubiquity.templates:274001
 msgid "Use LVM with the new ${RELEASE} installation"
 msgstr "Gebruik LVM saam met die nuwe ${RELEASE}-installasie."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:268001
+#: ../ubiquity.templates:275001
 msgid ""
 "This will set up Logical Volume Management. It allows taking snapshots and "
 "easier partition resizing."
@@ -1904,19 +1955,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:269001
+#: ../ubiquity.templates:276001
 msgid "Confirm the security key:"
 msgstr "Bevestig die sekuriteitsleutel:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:270001
+#: ../ubiquity.templates:277001
 msgid "Choose a security key:"
 msgstr "Kies 'n sekuriteitsleutel"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:271001
+#: ../ubiquity.templates:278001
 msgid ""
 "Disk encryption protects your files in case you lose your computer. It "
 "requires you to enter a security key each time the computer starts up."
@@ -1926,13 +1977,13 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:272001
+#: ../ubiquity.templates:279001
 msgid "Any files outside of ${RELEASE} will not be encrypted."
 msgstr "Enige lêers buite ${RELEASE} sal nie geënkripteer word nie."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:273001
+#: ../ubiquity.templates:280001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
 "all data will be lost. If you need to, write down your key and keep it in a "
@@ -1944,61 +1995,61 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:274001
+#: ../ubiquity.templates:281001
 msgid "For more security:"
 msgstr "Vir meer sekuriteit:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:275001
+#: ../ubiquity.templates:282001
 msgid "Overwrite empty disk space"
 msgstr "Oorskryf leë skyfspasie"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:276001
+#: ../ubiquity.templates:283001
 msgid "The installation may take much longer."
 msgstr "Die installasie kan heelwat langer neem"
 
 #. Type: text
 #. description
-#: ../ubiquity.templates:277001
+#: ../ubiquity.templates:284001
 msgid "LVM..."
 msgstr "LVM..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:278001
+#: ../ubiquity.templates:285001
 msgid "Volume groups:"
 msgstr "Volumegroepe:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:279001
+#: ../ubiquity.templates:286001
 msgid "Encryption Options"
 msgstr "Enkripsiekeuses"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:280001
+#: ../ubiquity.templates:287001
 msgid "Physical volumes:"
 msgstr "Fisiese volumes:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:282001
+#: ../ubiquity.templates:289001
 msgid "Encrypt this partition (LUKS)"
 msgstr "Enkripteer hierdie partisie (LUKS)"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:283001
+#: ../ubiquity.templates:290001
 msgid "MB"
 msgstr "MG"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:284001
+#: ../ubiquity.templates:291001
 msgid ""
 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
 "volumes as a single volume."
@@ -2008,25 +2059,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:285001
+#: ../ubiquity.templates:292001
 msgid "Logical Volume Management"
 msgstr "Logiese volumebestuur (LVM)"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:286001
+#: ../ubiquity.templates:293001
 msgid "Encryption options..."
 msgstr "Enkripsiekeuses..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:287001
+#: ../ubiquity.templates:294001
 msgid "UEFI Secure Boot"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "You have chosen to enable third-party software as part of your install, "
 "which for this system includes hardware drivers for graphics and/or wi-fi "
@@ -2036,7 +2087,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "After installation completes, Ubuntu will assist you in disabling UEFI "
 "Secure Boot. To ensure that this change is being made by you as an "
@@ -2046,7 +2097,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
 "these drivers, or if you proceed but do not confirm the password upon "
@@ -2056,7 +2107,7 @@
 
 #. Type: password
 #. Description
-#: ../ubiquity.templates:289001
+#: ../ubiquity.templates:296001
 msgid "SecureBoot key for MokPW"
 msgstr ""
 
@@ -2124,6 +2175,9 @@
 msgid "Removing packages"
 msgstr "Verwyder pakkette"
 
+#~ msgid "Prepare"
+#~ msgstr "Berei voor"
+
 #~ msgid "Preparing to install ${RELEASE}"
 #~ msgstr "Maak gereed om ${RELEASE} te installeer"
 
 
=== modified file 'debian/real-po/am.po'
--- debian/real-po/am.po	2018-03-08 16:50:33 +0000
+++ debian/real-po/am.po	2018-03-28 12:52:58 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2018-03-08 17:50+0100\n"
+"POT-Creation-Date: 2018-03-28 08:52-0400\n"
 "PO-Revision-Date: 2016-09-02 01:09+0000\n"
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic\n"
@@ -543,7 +543,7 @@
 #. An action, displayed on a button or as a menu item.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:84001 ../ubiquity.templates:281001
+#: ../ubiquity.templates:84001 ../ubiquity.templates:288001
 msgid "Revert"
 msgstr "ወደ ነበረበት መመለስ"
 
@@ -1139,7 +1139,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:174001 ../ubiquity.templates:245001
+#: ../ubiquity.templates:174001 ../ubiquity.templates:252001
 msgid "Welcome"
 msgstr "እንኳን ደህና መጡ"
 
@@ -1172,8 +1172,10 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:179001
-msgid "Prepare"
-msgstr "ማሰናጃ"
+#, fuzzy
+#| msgid "Software selection"
+msgid "Software"
+msgstr "የሶፍትዌር ምርጫ"
 
 #. Type: text
 #. Description
@@ -1453,7 +1455,8 @@
 #. Description
 #: ../ubiquity.templates:228001
 msgid ""
-"Install software for graphics, Wi-Fi hardware, and additional media playback"
+"Install third-party software for graphics and Wi-Fi hardware and additional "
+"media formats"
 msgstr ""
 
 #. Type: text
@@ -1477,22 +1480,66 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:232001
-#, fuzzy
-#| msgid "Cancel the installation."
-msgid "Minimal installation"
-msgstr "መግጠሙን መሰረዝ"
+msgid "What apps would you like to install to start with?"
+msgstr ""
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:233001
-msgid ""
-"This will only install a minimal desktop environment with a browser and "
-"utilities."
+msgid "Which applications would you like to start with?"
 msgstr ""
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:234001
+#, fuzzy
+#| msgid "Cancel the installation."
+msgid "Minimal installation"
+msgstr "መግጠሙን መሰረዝ"
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:235001
+msgid "Web browser and basic utilities."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:236001
+msgid "Web browser plus basic utilities and applications."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:237001
+#, fuzzy
+#| msgid "Cancel the installation."
+msgid "Normal installation"
+msgstr "መግጠሙን መሰረዝ"
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:238001
+msgid "Web browser, utilities, office software, games, and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:239001
+msgid ""
+"Web browser, utilities, office software, KDE PIM suite plus additional "
+"internet applications and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:240001
+msgid "Other options"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:241001
 msgid ""
 "Installing third-party drivers requires turning off Secure Boot. To do this, "
 "you need to choose a security key now, and enter it when the system restarts."
@@ -1500,25 +1547,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:238001
+#: ../ubiquity.templates:245001
 msgid "Layout:"
 msgstr "እቅድ"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:239001
+#: ../ubiquity.templates:246001
 msgid "Variant:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:240001
+#: ../ubiquity.templates:247001
 msgid "Below is an image of your current layout:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:241001
+#: ../ubiquity.templates:248001
 msgid ""
 "Select your location, so that the system can use appropriate display "
 "conventions for your country, fetch updates from sites close to you, and set "
@@ -1529,19 +1576,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:242001
+#: ../ubiquity.templates:249001
 msgid "Time Zone:"
 msgstr "የሰአት ክልል :"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:243001
+#: ../ubiquity.templates:250001
 msgid "Region:"
 msgstr "አካባቢ"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:244001
+#: ../ubiquity.templates:251001
 msgid "[type here to change]"
 msgstr "[ለመቀየር እዚህ ይጻፉ]"
 
@@ -1549,14 +1596,14 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid "Replace ${OS} with ${DISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
 "${OS} programs, documents, photos, music, and any other files."
@@ -1566,7 +1613,7 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:248001
+#: ../ubiquity.templates:255001
 msgid "Install ${DISTRO} alongside ${OS}"
 msgstr ""
 
@@ -1578,8 +1625,8 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:248001 ../ubiquity.templates:249001
-#: ../ubiquity.templates:253001 ../ubiquity.templates:258001
+#: ../ubiquity.templates:255001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:260001 ../ubiquity.templates:265001
 msgid ""
 "Documents, music, and other personal files will be kept. You can choose "
 "which operating system you want each time the computer starts up."
@@ -1589,20 +1636,20 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:249001
+#: ../ubiquity.templates:256001
 msgid "Install ${DISTRO} inside ${OS}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid "Something else"
 msgstr ""
 
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid ""
 "You can create or resize partitions yourself, or choose multiple partitions "
 "for ${DISTRO}."
@@ -1611,14 +1658,14 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid "Erase ${CURDISTRO} and reinstall"
 msgstr "መሰረዝ ${CURDISTRO} እና መግጠም"
 
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "${CURDISTRO} programs, documents, photos, music, and any other files."
@@ -1628,7 +1675,7 @@
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
 #. VER is a variable substituted into this string, and may be '11.04'
-#: ../ubiquity.templates:252001
+#: ../ubiquity.templates:259001
 msgid "Upgrade ${CURDISTRO} to ${VER}"
 msgstr "ማሻሻያ ${CURDISTRO} ወደ ${VER}"
 
@@ -1636,7 +1683,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:252001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:259001 ../ubiquity.templates:263001
 msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "will be kept where possible. System-wide settings will be cleared."
@@ -1647,7 +1694,7 @@
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. VER is a variable substituted into this string, and may be '11.04'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:253001
+#: ../ubiquity.templates:260001
 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
 msgstr ""
 
@@ -1657,13 +1704,13 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:254001 ../ubiquity.templates:257001
+#: ../ubiquity.templates:261001 ../ubiquity.templates:264001
 msgid "Erase disk and install ${DISTRO}"
 msgstr "ዲስኩን መሰረዝ እና መግጠም ${DISTRO}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:254001
+#: ../ubiquity.templates:261001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
 "the disk."
@@ -1672,7 +1719,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid "Erase everything and reinstall"
 msgstr "ሁሉንም መሰረዣ እና መግጠሚያ"
 
@@ -1680,7 +1727,7 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and other files in both ${OS} and "
@@ -1690,13 +1737,13 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:256001
+#: ../ubiquity.templates:263001
 msgid "Reinstall ${CURDISTRO}"
 msgstr "እንደገን መግጠሚያ ${CURDISTRO}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:257001
+#: ../ubiquity.templates:264001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and any other files in all operating "
@@ -1706,14 +1753,14 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:258001
+#: ../ubiquity.templates:265001
 msgid "Install ${DISTRO} alongside them"
 msgstr ""
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:259001
+#: ../ubiquity.templates:266001
 msgid "This computer currently has ${OS} on it. What would you like to do?"
 msgstr "በዚህ ኮምፒዩተር ላይ ሌላ ${OS} አለ። ምን ማድረግ ነው የሚፈልጉት?"
 
@@ -1721,7 +1768,7 @@
 #. Description
 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
-#: ../ubiquity.templates:260001
+#: ../ubiquity.templates:267001
 msgid ""
 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
 "do?"
@@ -1729,7 +1776,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:261001
+#: ../ubiquity.templates:268001
 msgid ""
 "This computer currently has multiple operating systems on it. What would you "
 "like to do?"
@@ -1737,7 +1784,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:262001
+#: ../ubiquity.templates:269001
 msgid ""
 "This computer currently has no detected operating systems. What would you "
 "like to do?"
@@ -1745,37 +1792,37 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:263001
+#: ../ubiquity.templates:270001
 msgid "Before:"
 msgstr "በፊት"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:264001
+#: ../ubiquity.templates:271001
 msgid "After:"
 msgstr "በኋላ፦"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:265001
+#: ../ubiquity.templates:272001
 msgid "Encrypt the new ${RELEASE} installation for security"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:266001
+#: ../ubiquity.templates:273001
 msgid "You will choose a security key in the next step."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:267001
+#: ../ubiquity.templates:274001
 msgid "Use LVM with the new ${RELEASE} installation"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:268001
+#: ../ubiquity.templates:275001
 msgid ""
 "This will set up Logical Volume Management. It allows taking snapshots and "
 "easier partition resizing."
@@ -1783,19 +1830,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:269001
+#: ../ubiquity.templates:276001
 msgid "Confirm the security key:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:270001
+#: ../ubiquity.templates:277001
 msgid "Choose a security key:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:271001
+#: ../ubiquity.templates:278001
 msgid ""
 "Disk encryption protects your files in case you lose your computer. It "
 "requires you to enter a security key each time the computer starts up."
@@ -1803,13 +1850,13 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:272001
+#: ../ubiquity.templates:279001
 msgid "Any files outside of ${RELEASE} will not be encrypted."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:273001
+#: ../ubiquity.templates:280001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
 "all data will be lost. If you need to, write down your key and keep it in a "
@@ -1818,61 +1865,61 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:274001
+#: ../ubiquity.templates:281001
 msgid "For more security:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:275001
+#: ../ubiquity.templates:282001
 msgid "Overwrite empty disk space"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:276001
+#: ../ubiquity.templates:283001
 msgid "The installation may take much longer."
 msgstr ""
 
 #. Type: text
 #. description
-#: ../ubiquity.templates:277001
+#: ../ubiquity.templates:284001
 msgid "LVM..."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:278001
+#: ../ubiquity.templates:285001
 msgid "Volume groups:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:279001
+#: ../ubiquity.templates:286001
 msgid "Encryption Options"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:280001
+#: ../ubiquity.templates:287001
 msgid "Physical volumes:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:282001
+#: ../ubiquity.templates:289001
 msgid "Encrypt this partition (LUKS)"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:283001
+#: ../ubiquity.templates:290001
 msgid "MB"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:284001
+#: ../ubiquity.templates:291001
 msgid ""
 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
 "volumes as a single volume."
@@ -1880,25 +1927,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:285001
+#: ../ubiquity.templates:292001
 msgid "Logical Volume Management"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:286001
+#: ../ubiquity.templates:293001
 msgid "Encryption options..."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:287001
+#: ../ubiquity.templates:294001
 msgid "UEFI Secure Boot"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "You have chosen to enable third-party software as part of your install, "
 "which for this system includes hardware drivers for graphics and/or wi-fi "
@@ -1908,7 +1955,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "After installation completes, Ubuntu will assist you in disabling UEFI "
 "Secure Boot. To ensure that this change is being made by you as an "
@@ -1918,7 +1965,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
 "these drivers, or if you proceed but do not confirm the password upon "
@@ -1928,7 +1975,7 @@
 
 #. Type: password
 #. Description
-#: ../ubiquity.templates:289001
+#: ../ubiquity.templates:296001
 msgid "SecureBoot key for MokPW"
 msgstr ""
 
@@ -1988,5 +2035,8 @@
 msgid "Removing packages"
 msgstr "ጥቅሎችን በማስወገድ ላይ"
 
+#~ msgid "Prepare"
+#~ msgstr "ማሰናጃ"
+
 #~ msgid "Preparing to install ${RELEASE}"
 #~ msgstr "ለመግጠም በዝግጅት ላይ ${RELEASE}"
 
=== modified file 'debian/real-po/an.po'
--- debian/real-po/an.po	2018-03-08 16:50:33 +0000
+++ debian/real-po/an.po	2018-03-28 12:52:58 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2018-03-08 17:50+0100\n"
+"POT-Creation-Date: 2018-03-28 08:52-0400\n"
 "PO-Revision-Date: 2014-01-13 09:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Aragonese <[e-mail]>\n"
@@ -542,7 +542,7 @@
 #. An action, displayed on a button or as a menu item.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:84001 ../ubiquity.templates:281001
+#: ../ubiquity.templates:84001 ../ubiquity.templates:288001
 msgid "Revert"
 msgstr ""
 
@@ -1136,7 +1136,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:174001 ../ubiquity.templates:245001
+#: ../ubiquity.templates:174001 ../ubiquity.templates:252001
 msgid "Welcome"
 msgstr ""
 
@@ -1169,7 +1169,7 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:179001
-msgid "Prepare"
+msgid "Software"
 msgstr ""
 
 #. Type: text
@@ -1450,7 +1450,8 @@
 #. Description
 #: ../ubiquity.templates:228001
 msgid ""
-"Install software for graphics, Wi-Fi hardware, and additional media playback"
+"Install third-party software for graphics and Wi-Fi hardware and additional "
+"media formats"
 msgstr ""
 
 #. Type: text
@@ -1474,20 +1475,62 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:232001
-msgid "Minimal installation"
+msgid "What apps would you like to install to start with?"
 msgstr ""
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:233001
-msgid ""
-"This will only install a minimal desktop environment with a browser and "
-"utilities."
+msgid "Which applications would you like to start with?"
 msgstr ""
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:234001
+msgid "Minimal installation"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:235001
+msgid "Web browser and basic utilities."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:236001
+msgid "Web browser plus basic utilities and applications."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:237001
+msgid "Normal installation"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:238001
+msgid "Web browser, utilities, office software, games, and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:239001
+msgid ""
+"Web browser, utilities, office software, KDE PIM suite plus additional "
+"internet applications and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:240001
+msgid "Other options"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:241001
 msgid ""
 "Installing third-party drivers requires turning off Secure Boot. To do this, "
 "you need to choose a security key now, and enter it when the system restarts."
@@ -1495,25 +1538,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:238001
+#: ../ubiquity.templates:245001
 msgid "Layout:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:239001
+#: ../ubiquity.templates:246001
 msgid "Variant:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:240001
+#: ../ubiquity.templates:247001
 msgid "Below is an image of your current layout:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:241001
+#: ../ubiquity.templates:248001
 msgid ""
 "Select your location, so that the system can use appropriate display "
 "conventions for your country, fetch updates from sites close to you, and set "
@@ -1522,19 +1565,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:242001
+#: ../ubiquity.templates:249001
 msgid "Time Zone:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:243001
+#: ../ubiquity.templates:250001
 msgid "Region:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:244001
+#: ../ubiquity.templates:251001
 msgid "[type here to change]"
 msgstr ""
 
@@ -1542,14 +1585,14 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid "Replace ${OS} with ${DISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
 "${OS} programs, documents, photos, music, and any other files."
@@ -1559,7 +1602,7 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:248001
+#: ../ubiquity.templates:255001
 msgid "Install ${DISTRO} alongside ${OS}"
 msgstr ""
 
@@ -1571,8 +1614,8 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:248001 ../ubiquity.templates:249001
-#: ../ubiquity.templates:253001 ../ubiquity.templates:258001
+#: ../ubiquity.templates:255001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:260001 ../ubiquity.templates:265001
 msgid ""
 "Documents, music, and other personal files will be kept. You can choose "
 "which operating system you want each time the computer starts up."
@@ -1582,20 +1625,20 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:249001
+#: ../ubiquity.templates:256001
 msgid "Install ${DISTRO} inside ${OS}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid "Something else"
 msgstr ""
 
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid ""
 "You can create or resize partitions yourself, or choose multiple partitions "
 "for ${DISTRO}."
@@ -1604,14 +1647,14 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid "Erase ${CURDISTRO} and reinstall"
 msgstr ""
 
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "${CURDISTRO} programs, documents, photos, music, and any other files."
@@ -1621,7 +1664,7 @@
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
 #. VER is a variable substituted into this string, and may be '11.04'
-#: ../ubiquity.templates:252001
+#: ../ubiquity.templates:259001
 msgid "Upgrade ${CURDISTRO} to ${VER}"
 msgstr ""
 
@@ -1629,7 +1672,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:252001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:259001 ../ubiquity.templates:263001
 msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "will be kept where possible. System-wide settings will be cleared."
@@ -1640,7 +1683,7 @@
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. VER is a variable substituted into this string, and may be '11.04'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:253001
+#: ../ubiquity.templates:260001
 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
 msgstr ""
 
@@ -1650,13 +1693,13 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:254001 ../ubiquity.templates:257001
+#: ../ubiquity.templates:261001 ../ubiquity.templates:264001
 msgid "Erase disk and install ${DISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:254001
+#: ../ubiquity.templates:261001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
 "the disk."
@@ -1664,7 +1707,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid "Erase everything and reinstall"
 msgstr ""
 
@@ -1672,7 +1715,7 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and other files in both ${OS} and "
@@ -1682,13 +1725,13 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:256001
+#: ../ubiquity.templates:263001
 msgid "Reinstall ${CURDISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:257001
+#: ../ubiquity.templates:264001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and any other files in all operating "
@@ -1698,14 +1741,14 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:258001
+#: ../ubiquity.templates:265001
 msgid "Install ${DISTRO} alongside them"
 msgstr ""
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:259001
+#: ../ubiquity.templates:266001
 msgid "This computer currently has ${OS} on it. What would you like to do?"
 msgstr ""
 
@@ -1713,7 +1756,7 @@
 #. Description
 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
-#: ../ubiquity.templates:260001
+#: ../ubiquity.templates:267001
 msgid ""
 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
 "do?"
@@ -1721,7 +1764,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:261001
+#: ../ubiquity.templates:268001
 msgid ""
 "This computer currently has multiple operating systems on it. What would you "
 "like to do?"
@@ -1729,7 +1772,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:262001
+#: ../ubiquity.templates:269001
 msgid ""
 "This computer currently has no detected operating systems. What would you "
 "like to do?"
@@ -1737,37 +1780,37 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:263001
+#: ../ubiquity.templates:270001
 msgid "Before:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:264001
+#: ../ubiquity.templates:271001
 msgid "After:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:265001
+#: ../ubiquity.templates:272001
 msgid "Encrypt the new ${RELEASE} installation for security"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:266001
+#: ../ubiquity.templates:273001
 msgid "You will choose a security key in the next step."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:267001
+#: ../ubiquity.templates:274001
 msgid "Use LVM with the new ${RELEASE} installation"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:268001
+#: ../ubiquity.templates:275001
 msgid ""
 "This will set up Logical Volume Management. It allows taking snapshots and "
 "easier partition resizing."
@@ -1775,19 +1818,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:269001
+#: ../ubiquity.templates:276001
 msgid "Confirm the security key:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:270001
+#: ../ubiquity.templates:277001
 msgid "Choose a security key:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:271001
+#: ../ubiquity.templates:278001
 msgid ""
 "Disk encryption protects your files in case you lose your computer. It "
 "requires you to enter a security key each time the computer starts up."
@@ -1795,13 +1838,13 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:272001
+#: ../ubiquity.templates:279001
 msgid "Any files outside of ${RELEASE} will not be encrypted."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:273001
+#: ../ubiquity.templates:280001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
 "all data will be lost. If you need to, write down your key and keep it in a "
@@ -1810,61 +1853,61 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:274001
+#: ../ubiquity.templates:281001
 msgid "For more security:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:275001
+#: ../ubiquity.templates:282001
 msgid "Overwrite empty disk space"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:276001
+#: ../ubiquity.templates:283001
 msgid "The installation may take much longer."
 msgstr ""
 
 #. Type: text
 #. description
-#: ../ubiquity.templates:277001
+#: ../ubiquity.templates:284001
 msgid "LVM..."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:278001
+#: ../ubiquity.templates:285001
 msgid "Volume groups:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:279001
+#: ../ubiquity.templates:286001
 msgid "Encryption Options"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:280001
+#: ../ubiquity.templates:287001
 msgid "Physical volumes:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:282001
+#: ../ubiquity.templates:289001
 msgid "Encrypt this partition (LUKS)"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:283001
+#: ../ubiquity.templates:290001
 msgid "MB"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:284001
+#: ../ubiquity.templates:291001
 msgid ""
 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
 "volumes as a single volume."
@@ -1872,25 +1915,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:285001
+#: ../ubiquity.templates:292001
 msgid "Logical Volume Management"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:286001
+#: ../ubiquity.templates:293001
 msgid "Encryption options..."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:287001
+#: ../ubiquity.templates:294001
 msgid "UEFI Secure Boot"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "You have chosen to enable third-party software as part of your install, "
 "which for this system includes hardware drivers for graphics and/or wi-fi "
@@ -1900,7 +1943,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "After installation completes, Ubuntu will assist you in disabling UEFI "
 "Secure Boot. To ensure that this change is being made by you as an "
@@ -1910,7 +1953,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
 "these drivers, or if you proceed but do not confirm the password upon "
@@ -1920,7 +1963,7 @@
 
 #. Type: password
 #. Description
-#: ../ubiquity.templates:289001
+#: ../ubiquity.templates:296001
 msgid "SecureBoot key for MokPW"
 msgstr ""
 
 
=== modified file 'debian/real-po/ar.po'
--- debian/real-po/ar.po	2018-03-08 16:50:33 +0000
+++ debian/real-po/ar.po	2018-03-28 12:52:58 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2018-03-08 17:50+0100\n"
+"POT-Creation-Date: 2018-03-28 08:52-0400\n"
 "PO-Revision-Date: 2016-09-02 01:10+0000\n"
 "Last-Translator: Ibrahim Saed <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
@@ -556,7 +556,7 @@
 #. An action, displayed on a button or as a menu item.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:84001 ../ubiquity.templates:281001
+#: ../ubiquity.templates:84001 ../ubiquity.templates:288001
 msgid "Revert"
 msgstr "اعكس"
 
@@ -1180,7 +1180,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:174001 ../ubiquity.templates:245001
+#: ../ubiquity.templates:174001 ../ubiquity.templates:252001
 msgid "Welcome"
 msgstr "أهلا بك"
 
@@ -1213,8 +1213,10 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:179001
-msgid "Prepare"
-msgstr "إعداد"
+#, fuzzy
+#| msgid "Software selection"
+msgid "Software"
+msgstr "اختيار البرمجيات"
 
 #. Type: text
 #. Description
@@ -1506,7 +1508,8 @@
 #. Description
 #: ../ubiquity.templates:228001
 msgid ""
-"Install software for graphics, Wi-Fi hardware, and additional media playback"
+"Install third-party software for graphics and Wi-Fi hardware and additional "
+"media formats"
 msgstr ""
 
 #. Type: text
@@ -1531,21 +1534,69 @@
 #. Description
 #: ../ubiquity.templates:232001
 #, fuzzy
-#| msgid "Cancel the installation."
-msgid "Minimal installation"
-msgstr "ألغ التثبيت."
+#| msgid "Where would you like to install Kubuntu?"
+msgid "What apps would you like to install to start with?"
+msgstr "أين تريد تثبيت كوبونتو؟"
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:233001
-msgid ""
-"This will only install a minimal desktop environment with a browser and "
-"utilities."
-msgstr ""
+#, fuzzy
+#| msgid "Where would you like to install Kubuntu?"
+msgid "Which applications would you like to start with?"
+msgstr "أين تريد تثبيت كوبونتو؟"
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:234001
+#, fuzzy
+#| msgid "Cancel the installation."
+msgid "Minimal installation"
+msgstr "ألغ التثبيت."
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:235001
+msgid "Web browser and basic utilities."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:236001
+msgid "Web browser plus basic utilities and applications."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:237001
+#, fuzzy
+#| msgid "Cancel the installation."
+msgid "Normal installation"
+msgstr "ألغ التثبيت."
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:238001
+msgid "Web browser, utilities, office software, games, and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:239001
+msgid ""
+"Web browser, utilities, office software, KDE PIM suite plus additional "
+"internet applications and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:240001
+msgid "Other options"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:241001
 msgid ""
 "Installing third-party drivers requires turning off Secure Boot. To do this, "
 "you need to choose a security key now, and enter it when the system restarts."
@@ -1553,25 +1604,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:238001
+#: ../ubiquity.templates:245001
 msgid "Layout:"
 msgstr "التخطيط:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:239001
+#: ../ubiquity.templates:246001
 msgid "Variant:"
 msgstr "النوع:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:240001
+#: ../ubiquity.templates:247001
 msgid "Below is an image of your current layout:"
 msgstr "في الأسفل صورة للتخطيط الحالي:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:241001
+#: ../ubiquity.templates:248001
 msgid ""
 "Select your location, so that the system can use appropriate display "
 "conventions for your country, fetch updates from sites close to you, and set "
@@ -1582,19 +1633,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:242001
+#: ../ubiquity.templates:249001
 msgid "Time Zone:"
 msgstr "المنطقة الزّمنيّة:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:243001
+#: ../ubiquity.templates:250001
 msgid "Region:"
 msgstr "الإقليم:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:244001
+#: ../ubiquity.templates:251001
 msgid "[type here to change]"
 msgstr "[اكتب هنا لتغييرها]"
 
@@ -1602,14 +1653,14 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid "Replace ${OS} with ${DISTRO}"
 msgstr "استبدل ${OS} بـ ${DISTRO}"
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
 "${OS} programs, documents, photos, music, and any other files."
@@ -1621,7 +1672,7 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:248001
+#: ../ubiquity.templates:255001
 msgid "Install ${DISTRO} alongside ${OS}"
 msgstr "ثبّت ${DISTRO} بجانب ${OS}"
 
@@ -1633,8 +1684,8 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:248001 ../ubiquity.templates:249001
-#: ../ubiquity.templates:253001 ../ubiquity.templates:258001
+#: ../ubiquity.templates:255001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:260001 ../ubiquity.templates:265001
 msgid ""
 "Documents, music, and other personal files will be kept. You can choose "
 "which operating system you want each time the computer starts up."
@@ -1646,20 +1697,20 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:249001
+#: ../ubiquity.templates:256001
 msgid "Install ${DISTRO} inside ${OS}"
 msgstr "ثبّت ${DISTRO} داخل ${OS}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid "Something else"
 msgstr "شيء آخر"
 
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid ""
 "You can create or resize partitions yourself, or choose multiple partitions "
 "for ${DISTRO}."
@@ -1670,14 +1721,14 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid "Erase ${CURDISTRO} and reinstall"
 msgstr "امسح ${CURDISTRO} وأعد التثبيت"
 
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "${CURDISTRO} programs, documents, photos, music, and any other files."
@@ -1689,7 +1740,7 @@
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
 #. VER is a variable substituted into this string, and may be '11.04'
-#: ../ubiquity.templates:252001
+#: ../ubiquity.templates:259001
 msgid "Upgrade ${CURDISTRO} to ${VER}"
 msgstr "رقِ ${CURDISTRO} إلى ${VER}"
 
@@ -1697,7 +1748,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:252001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:259001 ../ubiquity.templates:263001
 msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "will be kept where possible. System-wide settings will be cleared."
@@ -1710,7 +1761,7 @@
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. VER is a variable substituted into this string, and may be '11.04'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:253001
+#: ../ubiquity.templates:260001
 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
 msgstr "ثبّت ${DISTRO} ${VER} بجانب ${CURDISTRO}"
 
@@ -1720,13 +1771,13 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:254001 ../ubiquity.templates:257001
+#: ../ubiquity.templates:261001 ../ubiquity.templates:264001
 msgid "Erase disk and install ${DISTRO}"
 msgstr "إمسح القرص وثبّت ${DISTRO}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:254001
+#: ../ubiquity.templates:261001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
 "the disk."
@@ -1736,7 +1787,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid "Erase everything and reinstall"
 msgstr "امسح كل شيء وأعد التثبيت"
 
@@ -1744,7 +1795,7 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and other files in both ${OS} and "
@@ -1756,13 +1807,13 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:256001
+#: ../ubiquity.templates:263001
 msgid "Reinstall ${CURDISTRO}"
 msgstr "أعِد تثبيت ${CURDISTRO}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:257001
+#: ../ubiquity.templates:264001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and any other files in all operating "
@@ -1774,14 +1825,14 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:258001
+#: ../ubiquity.templates:265001
 msgid "Install ${DISTRO} alongside them"
 msgstr "ثبّت ${DISTRO} بجانبهم"
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:259001
+#: ../ubiquity.templates:266001
 msgid "This computer currently has ${OS} on it. What would you like to do?"
 msgstr "يحتوي هذا الحاسوب حاليًا على ${OS}. ماذا تود أن تفعل؟"
 
@@ -1789,7 +1840,7 @@
 #. Description
 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
-#: ../ubiquity.templates:260001
+#: ../ubiquity.templates:267001
 msgid ""
 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
 "do?"
@@ -1797,7 +1848,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:261001
+#: ../ubiquity.templates:268001
 msgid ""
 "This computer currently has multiple operating systems on it. What would you "
 "like to do?"
@@ -1805,7 +1856,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:262001
+#: ../ubiquity.templates:269001
 msgid ""
 "This computer currently has no detected operating systems. What would you "
 "like to do?"
@@ -1813,37 +1864,37 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:263001
+#: ../ubiquity.templates:270001
 msgid "Before:"
 msgstr "قبل:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:264001
+#: ../ubiquity.templates:271001
 msgid "After:"
 msgstr "بعد:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:265001
+#: ../ubiquity.templates:272001
 msgid "Encrypt the new ${RELEASE} installation for security"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:266001
+#: ../ubiquity.templates:273001
 msgid "You will choose a security key in the next step."
 msgstr "ستختار مفتاح أمان في الخطوة التالية."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:267001
+#: ../ubiquity.templates:274001
 msgid "Use LVM with the new ${RELEASE} installation"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:268001
+#: ../ubiquity.templates:275001
 msgid ""
 "This will set up Logical Volume Management. It allows taking snapshots and "
 "easier partition resizing."
@@ -1853,19 +1904,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:269001
+#: ../ubiquity.templates:276001
 msgid "Confirm the security key:"
 msgstr "تأكيد مفتاح الأمان:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:270001
+#: ../ubiquity.templates:277001
 msgid "Choose a security key:"
 msgstr "اختيار مفتاح أمان:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:271001
+#: ../ubiquity.templates:278001
 msgid ""
 "Disk encryption protects your files in case you lose your computer. It "
 "requires you to enter a security key each time the computer starts up."
@@ -1875,13 +1926,13 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:272001
+#: ../ubiquity.templates:279001
 msgid "Any files outside of ${RELEASE} will not be encrypted."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:273001
+#: ../ubiquity.templates:280001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
 "all data will be lost. If you need to, write down your key and keep it in a "
@@ -1893,61 +1944,61 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:274001
+#: ../ubiquity.templates:281001
 msgid "For more security:"
 msgstr "لمزيد من الأمان:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:275001
+#: ../ubiquity.templates:282001
 msgid "Overwrite empty disk space"
 msgstr "قم بالكتابة على مساحة القرص الفارغة"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:276001
+#: ../ubiquity.templates:283001
 msgid "The installation may take much longer."
 msgstr "قد تستغرق عملية التثبيت وقتا أطول."
 
 #. Type: text
 #. description
-#: ../ubiquity.templates:277001
+#: ../ubiquity.templates:284001
 msgid "LVM..."
 msgstr "إدارة المساحة المنطقية..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:278001
+#: ../ubiquity.templates:285001
 msgid "Volume groups:"
 msgstr "مجموعات المساحات:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:279001
+#: ../ubiquity.templates:286001
 msgid "Encryption Options"
 msgstr "خيارات التشفير"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:280001
+#: ../ubiquity.templates:287001
 msgid "Physical volumes:"
 msgstr "المساحات الملموسة:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:282001
+#: ../ubiquity.templates:289001
 msgid "Encrypt this partition (LUKS)"
 msgstr "تشفير هذا القسم (LUKS)"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:283001
+#: ../ubiquity.templates:290001
 msgid "MB"
 msgstr "م.ب"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:284001
+#: ../ubiquity.templates:291001
 msgid ""
 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
 "volumes as a single volume."
@@ -1955,25 +2006,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:285001
+#: ../ubiquity.templates:292001
 msgid "Logical Volume Management"
 msgstr "إدارة المساحات المنطقية"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:286001
+#: ../ubiquity.templates:293001
 msgid "Encryption options..."
 msgstr "خيارات التشفير..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:287001
+#: ../ubiquity.templates:294001
 msgid "UEFI Secure Boot"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "You have chosen to enable third-party software as part of your install, "
 "which for this system includes hardware drivers for graphics and/or wi-fi "
@@ -1983,7 +2034,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "After installation completes, Ubuntu will assist you in disabling UEFI "
 "Secure Boot. To ensure that this change is being made by you as an "
@@ -1993,7 +2044,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
 "these drivers, or if you proceed but do not confirm the password upon "
@@ -2003,7 +2054,7 @@
 
 #. Type: password
 #. Description
-#: ../ubiquity.templates:289001
+#: ../ubiquity.templates:296001
 msgid "SecureBoot key for MokPW"
 msgstr ""
 
@@ -2069,6 +2120,9 @@
 msgid "Removing packages"
 msgstr "يحذف الحزم"
 
+#~ msgid "Prepare"
+#~ msgstr "إعداد"
+
 #~ msgid "Preparing to install ${RELEASE}"
 #~ msgstr "يحضّر لتثبيت ${RELEASE}"
 
 
=== modified file 'debian/real-po/as.po'
--- debian/real-po/as.po	2018-03-08 16:50:33 +0000
+++ debian/real-po/as.po	2018-03-28 12:52:58 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2018-03-08 17:50+0100\n"
+"POT-Creation-Date: 2018-03-28 08:52-0400\n"
 "PO-Revision-Date: 2016-09-02 01:12+0000\n"
 "Last-Translator: maxspice <Unknown>\n"
 "Language-Team: Assamese <[e-mail]>\n"
@@ -542,7 +542,7 @@
 #. An action, displayed on a button or as a menu item.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:84001 ../ubiquity.templates:281001
+#: ../ubiquity.templates:84001 ../ubiquity.templates:288001
 msgid "Revert"
 msgstr "আগৰ অৱস্থালৈ ঘূৰাই  নিয়ক"
 
@@ -1136,7 +1136,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:174001 ../ubiquity.templates:245001
+#: ../ubiquity.templates:174001 ../ubiquity.templates:252001
 msgid "Welcome"
 msgstr "স্বাগতম"
 
@@ -1169,7 +1169,7 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:179001
-msgid "Prepare"
+msgid "Software"
 msgstr ""
 
 #. Type: text
@@ -1450,7 +1450,8 @@
 #. Description
 #: ../ubiquity.templates:228001
 msgid ""
-"Install software for graphics, Wi-Fi hardware, and additional media playback"
+"Install third-party software for graphics and Wi-Fi hardware and additional "
+"media formats"
 msgstr ""
 
 #. Type: text
@@ -1474,20 +1475,62 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:232001
-msgid "Minimal installation"
+msgid "What apps would you like to install to start with?"
 msgstr ""
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:233001
-msgid ""
-"This will only install a minimal desktop environment with a browser and "
-"utilities."
+msgid "Which applications would you like to start with?"
 msgstr ""
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:234001
+msgid "Minimal installation"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:235001
+msgid "Web browser and basic utilities."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:236001
+msgid "Web browser plus basic utilities and applications."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:237001
+msgid "Normal installation"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:238001
+msgid "Web browser, utilities, office software, games, and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:239001
+msgid ""
+"Web browser, utilities, office software, KDE PIM suite plus additional "
+"internet applications and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:240001
+msgid "Other options"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:241001
 msgid ""
 "Installing third-party drivers requires turning off Secure Boot. To do this, "
 "you need to choose a security key now, and enter it when the system restarts."
@@ -1495,25 +1538,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:238001
+#: ../ubiquity.templates:245001
 msgid "Layout:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:239001
+#: ../ubiquity.templates:246001
 msgid "Variant:"
 msgstr "অপৰ:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:240001
+#: ../ubiquity.templates:247001
 msgid "Below is an image of your current layout:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:241001
+#: ../ubiquity.templates:248001
 msgid ""
 "Select your location, so that the system can use appropriate display "
 "conventions for your country, fetch updates from sites close to you, and set "
@@ -1522,19 +1565,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:242001
+#: ../ubiquity.templates:249001
 msgid "Time Zone:"
 msgstr "সময় অঞ্চল:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:243001
+#: ../ubiquity.templates:250001
 msgid "Region:"
 msgstr "অঞ্চল:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:244001
+#: ../ubiquity.templates:251001
 msgid "[type here to change]"
 msgstr ""
 
@@ -1542,14 +1585,14 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid "Replace ${OS} with ${DISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
 "${OS} programs, documents, photos, music, and any other files."
@@ -1559,7 +1602,7 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:248001
+#: ../ubiquity.templates:255001
 msgid "Install ${DISTRO} alongside ${OS}"
 msgstr ""
 
@@ -1571,8 +1614,8 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:248001 ../ubiquity.templates:249001
-#: ../ubiquity.templates:253001 ../ubiquity.templates:258001
+#: ../ubiquity.templates:255001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:260001 ../ubiquity.templates:265001
 msgid ""
 "Documents, music, and other personal files will be kept. You can choose "
 "which operating system you want each time the computer starts up."
@@ -1582,20 +1625,20 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:249001
+#: ../ubiquity.templates:256001
 msgid "Install ${DISTRO} inside ${OS}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid "Something else"
 msgstr ""
 
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid ""
 "You can create or resize partitions yourself, or choose multiple partitions "
 "for ${DISTRO}."
@@ -1604,14 +1647,14 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid "Erase ${CURDISTRO} and reinstall"
 msgstr ""
 
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "${CURDISTRO} programs, documents, photos, music, and any other files."
@@ -1621,7 +1664,7 @@
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
 #. VER is a variable substituted into this string, and may be '11.04'
-#: ../ubiquity.templates:252001
+#: ../ubiquity.templates:259001
 msgid "Upgrade ${CURDISTRO} to ${VER}"
 msgstr ""
 
@@ -1629,7 +1672,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:252001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:259001 ../ubiquity.templates:263001
 msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "will be kept where possible. System-wide settings will be cleared."
@@ -1640,7 +1683,7 @@
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. VER is a variable substituted into this string, and may be '11.04'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:253001
+#: ../ubiquity.templates:260001
 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
 msgstr ""
 
@@ -1650,13 +1693,13 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:254001 ../ubiquity.templates:257001
+#: ../ubiquity.templates:261001 ../ubiquity.templates:264001
 msgid "Erase disk and install ${DISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:254001
+#: ../ubiquity.templates:261001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
 "the disk."
@@ -1664,7 +1707,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid "Erase everything and reinstall"
 msgstr ""
 
@@ -1672,7 +1715,7 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and other files in both ${OS} and "
@@ -1682,13 +1725,13 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:256001
+#: ../ubiquity.templates:263001
 msgid "Reinstall ${CURDISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:257001
+#: ../ubiquity.templates:264001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and any other files in all operating "
@@ -1698,14 +1741,14 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:258001
+#: ../ubiquity.templates:265001
 msgid "Install ${DISTRO} alongside them"
 msgstr ""
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:259001
+#: ../ubiquity.templates:266001
 msgid "This computer currently has ${OS} on it. What would you like to do?"
 msgstr ""
 
@@ -1713,7 +1756,7 @@
 #. Description
 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
-#: ../ubiquity.templates:260001
+#: ../ubiquity.templates:267001
 msgid ""
 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
 "do?"
@@ -1721,7 +1764,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:261001
+#: ../ubiquity.templates:268001
 msgid ""
 "This computer currently has multiple operating systems on it. What would you "
 "like to do?"
@@ -1729,7 +1772,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:262001
+#: ../ubiquity.templates:269001
 msgid ""
 "This computer currently has no detected operating systems. What would you "
 "like to do?"
@@ -1737,37 +1780,37 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:263001
+#: ../ubiquity.templates:270001
 msgid "Before:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:264001
+#: ../ubiquity.templates:271001
 msgid "After:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:265001
+#: ../ubiquity.templates:272001
 msgid "Encrypt the new ${RELEASE} installation for security"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:266001
+#: ../ubiquity.templates:273001
 msgid "You will choose a security key in the next step."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:267001
+#: ../ubiquity.templates:274001
 msgid "Use LVM with the new ${RELEASE} installation"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:268001
+#: ../ubiquity.templates:275001
 msgid ""
 "This will set up Logical Volume Management. It allows taking snapshots and "
 "easier partition resizing."
@@ -1775,19 +1818,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:269001
+#: ../ubiquity.templates:276001
 msgid "Confirm the security key:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:270001
+#: ../ubiquity.templates:277001
 msgid "Choose a security key:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:271001
+#: ../ubiquity.templates:278001
 msgid ""
 "Disk encryption protects your files in case you lose your computer. It "
 "requires you to enter a security key each time the computer starts up."
@@ -1795,13 +1838,13 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:272001
+#: ../ubiquity.templates:279001
 msgid "Any files outside of ${RELEASE} will not be encrypted."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:273001
+#: ../ubiquity.templates:280001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
 "all data will be lost. If you need to, write down your key and keep it in a "
@@ -1810,61 +1853,61 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:274001
+#: ../ubiquity.templates:281001
 msgid "For more security:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:275001
+#: ../ubiquity.templates:282001
 msgid "Overwrite empty disk space"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:276001
+#: ../ubiquity.templates:283001
 msgid "The installation may take much longer."
 msgstr ""
 
 #. Type: text
 #. description
-#: ../ubiquity.templates:277001
+#: ../ubiquity.templates:284001
 msgid "LVM..."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:278001
+#: ../ubiquity.templates:285001
 msgid "Volume groups:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:279001
+#: ../ubiquity.templates:286001
 msgid "Encryption Options"
 msgstr "এনক্ৰিপশ্বনৰ বিকল্পসমূহ"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:280001
+#: ../ubiquity.templates:287001
 msgid "Physical volumes:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:282001
+#: ../ubiquity.templates:289001
 msgid "Encrypt this partition (LUKS)"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:283001
+#: ../ubiquity.templates:290001
 msgid "MB"
 msgstr "MB"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:284001
+#: ../ubiquity.templates:291001
 msgid ""
 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
 "volumes as a single volume."
@@ -1872,25 +1915,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:285001
+#: ../ubiquity.templates:292001
 msgid "Logical Volume Management"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:286001
+#: ../ubiquity.templates:293001
 msgid "Encryption options..."
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:287001
+#: ../ubiquity.templates:294001
 msgid "UEFI Secure Boot"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "You have chosen to enable third-party software as part of your install, "
 "which for this system includes hardware drivers for graphics and/or wi-fi "
@@ -1900,7 +1943,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "After installation completes, Ubuntu will assist you in disabling UEFI "
 "Secure Boot. To ensure that this change is being made by you as an "
@@ -1910,7 +1953,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
 "these drivers, or if you proceed but do not confirm the password upon "
@@ -1920,7 +1963,7 @@
 
 #. Type: password
 #. Description
-#: ../ubiquity.templates:289001
+#: ../ubiquity.templates:296001
 msgid "SecureBoot key for MokPW"
 msgstr ""
 
 
=== modified file 'debian/real-po/ast.po'
--- debian/real-po/ast.po	2018-03-08 16:50:33 +0000
+++ debian/real-po/ast.po	2018-03-28 12:52:58 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2018-03-08 17:50+0100\n"
+"POT-Creation-Date: 2018-03-28 08:52-0400\n"
 "PO-Revision-Date: 2017-09-29 15:57+0000\n"
 "Last-Translator: Xuacu Saturio <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
@@ -568,7 +568,7 @@
 #. An action, displayed on a button or as a menu item.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:84001 ../ubiquity.templates:281001
+#: ../ubiquity.templates:84001 ../ubiquity.templates:288001
 msgid "Revert"
 msgstr "Revertir"
 
@@ -1207,7 +1207,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:174001 ../ubiquity.templates:245001
+#: ../ubiquity.templates:174001 ../ubiquity.templates:252001
 msgid "Welcome"
 msgstr "Bienllegáu"
 
@@ -1240,8 +1240,10 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:179001
-msgid "Prepare"
-msgstr "Preparar"
+#, fuzzy
+#| msgid "Software selection"
+msgid "Software"
+msgstr "Escoyeta de programes"
 
 #. Type: text
 #. Description
@@ -1546,7 +1548,8 @@
 #| "Install third-party software for graphics and Wi-Fi hardware, Flash, MP3 "
 #| "and other media"
 msgid ""
-"Install software for graphics, Wi-Fi hardware, and additional media playback"
+"Install third-party software for graphics and Wi-Fi hardware and additional "
+"media formats"
 msgstr ""
 "Instalar software de terceros pa hardware de gráficos y Wi-Fi, Flash, MP3 y "
 "otros medios"
@@ -1573,21 +1576,69 @@
 #. Description
 #: ../ubiquity.templates:232001
 #, fuzzy
-#| msgid "Cancel the installation."
-msgid "Minimal installation"
-msgstr "Encaboxar la instalación."
+#| msgid "Where would you like to install Kubuntu?"
+msgid "What apps would you like to install to start with?"
+msgstr "¿Aú quies instalar Kubuntu?"
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:233001
-msgid ""
-"This will only install a minimal desktop environment with a browser and "
-"utilities."
-msgstr ""
+#, fuzzy
+#| msgid "Where would you like to install Kubuntu?"
+msgid "Which applications would you like to start with?"
+msgstr "¿Aú quies instalar Kubuntu?"
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:234001
+#, fuzzy
+#| msgid "Cancel the installation."
+msgid "Minimal installation"
+msgstr "Encaboxar la instalación."
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:235001
+msgid "Web browser and basic utilities."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:236001
+msgid "Web browser plus basic utilities and applications."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:237001
+#, fuzzy
+#| msgid "Cancel the installation."
+msgid "Normal installation"
+msgstr "Encaboxar la instalación."
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:238001
+msgid "Web browser, utilities, office software, games, and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:239001
+msgid ""
+"Web browser, utilities, office software, KDE PIM suite plus additional "
+"internet applications and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:240001
+msgid "Other options"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:241001
 msgid ""
 "Installing third-party drivers requires turning off Secure Boot. To do this, "
 "you need to choose a security key now, and enter it when the system restarts."
@@ -1597,25 +1648,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:238001
+#: ../ubiquity.templates:245001
 msgid "Layout:"
 msgstr "Distribución:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:239001
+#: ../ubiquity.templates:246001
 msgid "Variant:"
 msgstr "Variante:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:240001
+#: ../ubiquity.templates:247001
 msgid "Below is an image of your current layout:"
 msgstr "Abaxo amuésase una imaxe de la distribución actual:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:241001
+#: ../ubiquity.templates:248001
 msgid ""
 "Select your location, so that the system can use appropriate display "
 "conventions for your country, fetch updates from sites close to you, and set "
@@ -1627,19 +1678,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:242001
+#: ../ubiquity.templates:249001
 msgid "Time Zone:"
 msgstr "Estaya horaria:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:243001
+#: ../ubiquity.templates:250001
 msgid "Region:"
 msgstr "Rexón:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:244001
+#: ../ubiquity.templates:251001
 msgid "[type here to change]"
 msgstr "[escribi equí pa camudar]"
 
@@ -1647,14 +1698,14 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid "Replace ${OS} with ${DISTRO}"
 msgstr "Trocar ${OS} por ${DISTRO}"
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
 "${OS} programs, documents, photos, music, and any other files."
@@ -1666,7 +1717,7 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:248001
+#: ../ubiquity.templates:255001
 msgid "Install ${DISTRO} alongside ${OS}"
 msgstr "Instalar ${DISTRO} xunto a ${OS}"
 
@@ -1678,8 +1729,8 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:248001 ../ubiquity.templates:249001
-#: ../ubiquity.templates:253001 ../ubiquity.templates:258001
+#: ../ubiquity.templates:255001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:260001 ../ubiquity.templates:265001
 msgid ""
 "Documents, music, and other personal files will be kept. You can choose "
 "which operating system you want each time the computer starts up."
@@ -1691,20 +1742,20 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:249001
+#: ../ubiquity.templates:256001
 msgid "Install ${DISTRO} inside ${OS}"
 msgstr "Instalar ${DISTRO} dientro de {OS}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid "Something else"
 msgstr "Daqué más"
 
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid ""
 "You can create or resize partitions yourself, or choose multiple partitions "
 "for ${DISTRO}."
@@ -1715,14 +1766,14 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid "Erase ${CURDISTRO} and reinstall"
 msgstr "Desaniciar ${CURDISTRO} y reinstalar"
 
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:251001
+#: ../ubiquity.templates:258001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "${CURDISTRO} programs, documents, photos, music, and any other files."
@@ -1735,7 +1786,7 @@
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
 #. VER is a variable substituted into this string, and may be '11.04'
-#: ../ubiquity.templates:252001
+#: ../ubiquity.templates:259001
 msgid "Upgrade ${CURDISTRO} to ${VER}"
 msgstr "Anovar ${CURDISTRO} a ${VER}"
 
@@ -1743,7 +1794,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:252001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:259001 ../ubiquity.templates:263001
 msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "will be kept where possible. System-wide settings will be cleared."
@@ -1757,7 +1808,7 @@
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. VER is a variable substituted into this string, and may be '11.04'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:253001
+#: ../ubiquity.templates:260001
 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
 msgstr "Instalar ${DISTRO} ${VER} xunto a ${CURDISTRO}"
 
@@ -1767,13 +1818,13 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:254001 ../ubiquity.templates:257001
+#: ../ubiquity.templates:261001 ../ubiquity.templates:264001
 msgid "Erase disk and install ${DISTRO}"
 msgstr "Desaniciar discu ya instalar ${DISTRO}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:254001
+#: ../ubiquity.templates:261001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
 "the disk."
@@ -1783,7 +1834,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid "Erase everything and reinstall"
 msgstr "Desaniciar too y reinstalar"
 
@@ -1791,7 +1842,7 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:262001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and other files in both ${OS} and "
@@ -1804,13 +1855,13 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:256001
+#: ../ubiquity.templates:263001
 msgid "Reinstall ${CURDISTRO}"
 msgstr "Reinstalar ${CURDISTRO}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:257001
+#: ../ubiquity.templates:264001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and any other files in all operating "
@@ -1823,14 +1874,14 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:258001
+#: ../ubiquity.templates:265001
 msgid "Install ${DISTRO} alongside them"
 msgstr "Instalar ${DISTRO} xunto a ellos"
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:259001
+#: ../ubiquity.templates:266001
 msgid "This computer currently has ${OS} on it. What would you like to do?"
 msgstr "Anguaño, esti equipu tien ${OS} instaláu. ¿Qué quies facer?"
 
@@ -1838,7 +1889,7 @@
 #. Description
 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
-#: ../ubiquity.templates:260001
+#: ../ubiquity.templates:267001
 msgid ""
 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
 "do?"
@@ -1846,7 +1897,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:261001
+#: ../ubiquity.templates:268001
 msgid ""
 "This computer currently has multiple operating systems on it. What would you "
 "like to do?"
@@ -1856,7 +1907,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:262001
+#: ../ubiquity.templates:269001
 msgid ""
 "This computer currently has no detected operating systems. What would you "
 "like to do?"
@@ -1865,37 +1916,37 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:263001
+#: ../ubiquity.templates:270001
 msgid "Before:"
 msgstr "Enantes:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:264001
+#: ../ubiquity.templates:271001
 msgid "After:"
 msgstr "Dempués:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:265001
+#: ../ubiquity.templates:272001
 msgid "Encrypt the new ${RELEASE} installation for security"
 msgstr "Cifrar la nueva instalación de ${RELEASE} pa más seguridá"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:266001
+#: ../ubiquity.templates:273001
 msgid "You will choose a security key in the next step."
 msgstr "Tendrás d'escoyer una clave de seguridá nel siguiente pasu."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:267001
+#: ../ubiquity.templates:274001
 msgid "Use LVM with the new ${RELEASE} installation"
 msgstr "Usar LVM cola nueva instalación de ${RELEASE}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:268001
+#: ../ubiquity.templates:275001
 msgid ""
 "This will set up Logical Volume Management. It allows taking snapshots and "
 "easier partition resizing."
@@ -1905,19 +1956,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:269001
+#: ../ubiquity.templates:276001
 msgid "Confirm the security key:"
 msgstr "Confirma la clave de seguridá:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:270001
+#: ../ubiquity.templates:277001
 msgid "Choose a security key:"
 msgstr "Escueyi una clave de seguridá:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:271001
+#: ../ubiquity.templates:278001
 msgid ""
 "Disk encryption protects your files in case you lose your computer. It "
 "requires you to enter a security key each time the computer starts up."
@@ -1927,13 +1978,13 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:272001
+#: ../ubiquity.templates:279001
 msgid "Any files outside of ${RELEASE} will not be encrypted."
 msgstr "Cualquier ficheru fuera de ${RELEASE} nun se cifrará."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:273001
+#: ../ubiquity.templates:280001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
 "all data will be lost. If you need to, write down your key and keep it in a "
@@ -1945,61 +1996,61 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:274001
+#: ../ubiquity.templates:281001
 msgid "For more security:"
 msgstr "Pa mayor seguridá:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:275001
+#: ../ubiquity.templates:282001
 msgid "Overwrite empty disk space"
 msgstr "Sobreescribir l'espaciu vacíu del discu"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:276001
+#: ../ubiquity.templates:283001
 msgid "The installation may take much longer."
 msgstr "La instalación pue llevar daqué de tiempu."
 
 #. Type: text
 #. description
-#: ../ubiquity.templates:277001
+#: ../ubiquity.templates:284001
 msgid "LVM..."
 msgstr "LVM..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:278001
+#: ../ubiquity.templates:285001
 msgid "Volume groups:"
 msgstr "Grupos de volumes:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:279001
+#: ../ubiquity.templates:286001
 msgid "Encryption Options"
 msgstr "Opciones de cifráu"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:280001
+#: ../ubiquity.templates:287001
 msgid "Physical volumes:"
 msgstr "Volumes físicos:"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:282001
+#: ../ubiquity.templates:289001
 msgid "Encrypt this partition (LUKS)"
 msgstr "Cifrar esta partición (LUKS)"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:283001
+#: ../ubiquity.templates:290001
 msgid "MB"
 msgstr "MB"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:284001
+#: ../ubiquity.templates:291001
 msgid ""
 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
 "volumes as a single volume."
@@ -2009,25 +2060,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:285001
+#: ../ubiquity.templates:292001
 msgid "Logical Volume Management"
 msgstr "Logical Volume Management"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:286001
+#: ../ubiquity.templates:293001
 msgid "Encryption options..."
 msgstr "Opciones de cifráu..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:287001
+#: ../ubiquity.templates:294001
 msgid "UEFI Secure Boot"
 msgstr "«Secure Boot» de UEFI"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "You have chosen to enable third-party software as part of your install, "
 "which for this system includes hardware drivers for graphics and/or wi-fi "
@@ -2041,7 +2092,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "After installation completes, Ubuntu will assist you in disabling UEFI "
 "Secure Boot. To ensure that this change is being made by you as an "
@@ -2055,7 +2106,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:295001
 msgid ""
 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
 "these drivers, or if you proceed but do not confirm the password upon "
@@ -2069,7 +2120,7 @@
 
 #. Type: password
 #. Description
-#: ../ubiquity.templates:289001
+#: ../ubiquity.templates:296001
 msgid "SecureBoot key for MokPW"
 msgstr "Clave de Secure Boot pa MokPW"
 
@@ -2137,6 +2188,9 @@
 msgid "Removing packages"
 msgstr "Desaniciando paquetes"
 
+#~ msgid "Prepare"
+#~ msgstr "Preparar"
+
 #~ msgid "Preparing to install ${RELEASE}"
 #~ msgstr "Preparándose pa instalar ${RELEASE}"
 
 
=== modified file 'debian/real-po/az.po'
--- debian/real-po/az.po	2018-03-08 16:50:33 +0000
+++ debian/real-po/az.po	2018-03-28 12:52:58 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2018-03-08 17:50+0100\n"
+"POT-Creation-Date: 2018-03-28 08:52-0400\n"
 "PO-Revision-Date: 2016-09-02 01:11+0000\n"
 "Last-Translator: Arzu Huseynov <[e-mail]>\n"
 "Language-Team: Azerbaijani <[e-mail]>\n"
@@ -544,7 +544,7 @@
 #. An action, displayed on a button or as a menu item.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:84001 ../ubiquity.templates:281001
+#: ../ubiquity.templates:84001 ../ubiquity.templates:288001
 msgid "Revert"
 msgstr ""
 
@@ -1138,7 +1138,7 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:174001 ../ubiquity.templates:245001
+#: ../ubiquity.templates:174001 ../ubiquity.templates:252001
 msgid "Welcome"
 msgstr ""
 
@@ -1171,7 +1171,7 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:179001
-msgid "Prepare"
+msgid "Software"
 msgstr ""
 
 #. Type: text
@@ -1452,7 +1452,8 @@
 #. Description
 #: ../ubiquity.templates:228001
 msgid ""
-"Install software for graphics, Wi-Fi hardware, and additional media playback"
+"Install third-party software for graphics and Wi-Fi hardware and additional "
+"media formats"
 msgstr ""
 
 #. Type: text
@@ -1476,20 +1477,62 @@
 #. Type: text
 #. Description
 #: ../ubiquity.templates:232001
-msgid "Minimal installation"
+msgid "What apps would you like to install to start with?"
 msgstr ""
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:233001
-msgid ""
-"This will only install a minimal desktop environment with a browser and "
-"utilities."
+msgid "Which applications would you like to start with?"
 msgstr ""
 
 #. Type: text
 #. Description
 #: ../ubiquity.templates:234001
+msgid "Minimal installation"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:235001
+msgid "Web browser and basic utilities."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:236001
+msgid "Web browser plus basic utilities and applications."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:237001
+msgid "Normal installation"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:238001
+msgid "Web browser, utilities, office software, games, and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:239001
+msgid ""
+"Web browser, utilities, office software, KDE PIM suite plus additional "
+"internet applications and media players."
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:240001
+msgid "Other options"
+msgstr ""
+
+#. Type: text
+#. Description
+#: ../ubiquity.templates:241001
 msgid ""
 "Installing third-party drivers requires turning off Secure Boot. To do this, "
 "you need to choose a security key now, and enter it when the system restarts."
@@ -1497,25 +1540,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:238001
+#: ../ubiquity.templates:245001
 msgid "Layout:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:239001
+#: ../ubiquity.templates:246001
 msgid "Variant:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:240001
+#: ../ubiquity.templates:247001
 msgid "Below is an image of your current layout:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:241001
+#: ../ubiquity.templates:248001
 msgid ""
 "Select your location, so that the system can use appropriate display "
 "conventions for your country, fetch updates from sites close to you, and set "
@@ -1524,19 +1567,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:242001
+#: ../ubiquity.templates:249001
 msgid "Time Zone:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:243001
+#: ../ubiquity.templates:250001
 msgid "Region:"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:244001
+#: ../ubiquity.templates:251001
 msgid "[type here to change]"
 msgstr ""
 
@@ -1544,14 +1587,14 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid "Replace ${OS} with ${DISTRO}"
 msgstr ""
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:254001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
 "${OS} programs, documents, photos, music, and any other files."
@@ -1561,7 +1604,7 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:248001
+#: ../ubiquity.templates:255001
 msgid "Install ${DISTRO} alongside ${OS}"
 msgstr ""
 
@@ -1573,8 +1616,8 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:248001 ../ubiquity.templates:249001
-#: ../ubiquity.templates:253001 ../ubiquity.templates:258001
+#: ../ubiquity.templates:255001 ../ubiquity.templates:256001
+#: ../ubiquity.templates:260001 ../ubiquity.templates:265001
 msgid ""
 "Documents, music, and other personal files will be kept. You can choose "
 "which operating system you want each time the computer starts up."
@@ -1584,20 +1627,20 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:249001
+#: ../ubiquity.templates:256001
 msgid "Install ${DISTRO} inside ${OS}"
 msgstr ""
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid "Something else"
 msgstr ""
 
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:257001
 msgid ""
 "You can create or resize partitions yourself, or choose multiple partitions "
 "for ${DISTRO}."
@@ -1606,14 +1649,14 @@
 #. Type: text