Merge ~mfo/ubiquity:lp1895351-focal into ubiquity:master

[Mauricio Faria de Oliveira]

This introduces the 'ubiquity/prepare_automatic' preseed option
to allow the prepare plugin to run in automatic mode (i.e. with
the 'automatic-ubiquity' option / ubiquity --automatic)

Currently the prepare plugin is just not run at all in that case,
but some users could benefit from it now that the ISOs ship with
e.g., nvidia drivers, to install 3rd party drivers automatically
during install, and not consume network bandwidth to download it.

The default value for the option is false, so not to change the
current behavior; otherwise more options that are not preseeded
in existing/working preseed files could be asked, and get stuck
in an automated/unattended install.

And when an user preseeds it to true, then it is expected that
such options are preseeded as needed. Note that the only option
needed as seen / not display the page is 'ubiquity/use_nonfree',
according to existing code.

LP: #1895351

This is the backport to the Focal branch of the proposed MR #390637.

It introduces a preseed option to gate the behavior change, since it's a stable release.

[1] https://code.launchpad.net/~mfo/ubiquity/+git/ubiquity/+merge/390637

Unmerged commits

a69d008... by Mauricio Faria de Oliveira on 2020-09-11

prepare: run in automatic mode with ubiquity/prepare_automatic

This introduces the 'ubiquity/prepare_automatic' preseed option
to allow the prepare plugin to run in automatic mode (i.e. with
the 'automatic-ubiquity' option / ubiquity --automatic)

Currently the prepare plugin is just not run at all in that case,
but some users could benefit from it now that the ISOs ship with
e.g., nvidia drivers, to install 3rd party drivers automatically
during install, and not consume network bandwidth to download it.

The default value for the option is false, so not to change the
current behavior; otherwise more options that are not preseeded
in existing/working preseed files could be asked, and get stuck
in an automated/unattended install.

And when an user preseeds it to true, then it is expected that
such options are preseeded as needed. Note that the only option
needed as seen / not display the page is 'ubiquity/use_nonfree',
according to existing code.

LP: #1895351

Signed-off-by: Mauricio Faria de Oliveira <email address hidden>

80dc094... by Mauricio Faria de Oliveira on 2021-01-19

Finalize changelog

Signed-off-by: Mauricio Faria de Oliveira <email address hidden>

da04f21... by Mauricio Faria de Oliveira on 2021-01-19

Fix FTBFS with new pyflakes

This has been fixed in Groovy/20.10.4, no LP bug.

Signed-off-by: Mauricio Faria de Oliveira <email address hidden>

f856246... by Mauricio Faria de Oliveira on 2021-01-19

d-i: update sources to pick up partman-crypto

Also run `make -C d-i maintainer-clean` as the `source/` dir
is not populated in the git tree.

Signed-off-by: Mauricio Faria de Oliveira <email address hidden>

fc27640... by Iain Lane on 2020-07-21

Finalise changelog

fb1e1d7... by Iain Lane on 2020-07-21

Update changelog

e7ced20... by Iain Lane on 2020-07-20

gtk_ui, prepare: Run 'apt update' before installing OEM metapackages

We need to pick up any which might have been released after the ISO was
created.

LP: #1888241

ccfae48... by Dimitri John Ledkov on 2020-06-16

releasing package ubiquity version 20.04.15.1

79c68e9... by Dimitri John Ledkov on 2020-06-15

ubiquity-dm: start gsd-keyboard for keyboard indicator

When installing in non-english locale, multiple keyboard layouts are
configured during the ubiquity-dm session. Users must be able to
swtich between them during installation, to e.g. type hostname in
english, and given name in native language. Without gsd-keyboard
running, keyboard indicator does not appear in the ubiquity-dm
session.

LP: #1847307
(cherry picked from commit a3e3d6ecef01a9c73c32c814efe8383f1f4e4405)

2bd4ea4... by Jean-Baptiste Lallement on 2020-05-28

Do not export all pools

Only export pools that contain datasets mounted under /target
(LP: #1875045)

(cherry picked from commit 82a9b2587340908e7140f5ed38ae9f2841ad6152)

diff --git a/bin/ubiquity b/bin/ubiquity
index 961a738..082e6b9 100755
--- a/bin/ubiquity
+++ b/bin/ubiquity
@@ -395,6 +395,7 @@ def unmount_target():
     for path in paths:
         misc.execute_root('fuser', '-cv', path)
         misc.execute_root('umount', path)
+<<<<<<< bin/ubiquity
     keystore_mapper = "/dev/mapper/keystore-rpool"
     if os.path.exists(keystore_mapper):
         misc.execute_root('umount', keystore_mapper)
@@ -403,6 +404,8 @@ def unmount_target():
     if os.path.exists(swap_mapper):
         misc.execute_root('swapoff', swap_mapper)
         misc.execute_root('cryptsetup', 'luksClose', swap_mapper)
+=======
+>>>>>>> bin/ubiquity
     for pool in pools:
         misc.execute_root('/sbin/zpool', 'export', pool)
 
diff --git a/d-i/manifest b/d-i/manifest
index 99cba5b..c50666e 100644
--- a/d-i/manifest
+++ b/d-i/manifest
@@ -18,8 +18,13 @@ partman-base 206ubuntu6
 partman-basicfilesystems 127ubuntu2
 partman-basicmethods 70
 partman-btrfs 29ubuntu1
+<<<<<<< d-i/manifest
 partman-crypto 101ubuntu5
 partman-efi 84ubuntu1
+=======
+partman-crypto 101ubuntu4.1
+partman-efi 71ubuntu5
+>>>>>>> d-i/manifest
 partman-ext3 86ubuntu1
 partman-jfs 58
 partman-lvm 133
@@ -28,5 +33,9 @@ partman-swapfile 2
 partman-target 98ubuntu1
 partman-xfs 66
 preseed 1.71ubuntu11
+<<<<<<< d-i/manifest
+=======
+shim-signed 1.40.4
+>>>>>>> d-i/manifest
 tzsetup 1:0.94ubuntu2
 user-setup 1.63ubuntu6
diff --git a/debian/changelog b/debian/changelog
index 8683857..b9357ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 ubiquity (21.04.4) hirsute; urgency=medium
 
   [ Jean-Baptiste Lallement ]
@@ -96,11 +97,34 @@ ubiquity (20.10.10) groovy; urgency=medium
  -- Jean-Baptiste Lallement <[e-mail]>  Tue, 15 Sep 2020 17:06:15 +0200
 
 ubiquity (20.10.9) groovy; urgency=medium
+=======
+ ubiquity (20.04.15.4) UNRELEASED; urgency=medium
+
+  * Add preseed option 'ubiquity/prepare_automatic' (default: false)
+    to include the prepare page in automatic mode. (LP: #1895351)
+    - debian/ubiquity.templates: add ubiquity/prepare_automatic.
+    - ubiquity/plugins/ubi-prepare.py: do not bail if it's true.
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Tue, 19 Jan 2021 10:49:29 -0300
+
+ubiquity (20.04.15.3) focal; urgency=medium
+
+  * Automatic update of included source packages:
+    partman-crypto 101ubuntu4.1, shim-signed 1.40.4. (LP: #1898129)
+  * Fix FTBFS with new pyflakes (fixed in Groovy/20.10.4, no LP bug):
+    autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py:48:
+    .format(...) has unused arguments at position(s): 0
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Wed, 13 Jan 2021 11:42:57 -0300
+
+ubiquity (20.04.15.2) focal; urgency=medium
+>>>>>>> debian/changelog
 
   * gtk_ui, prepare: Run 'apt update' before installing OEM metapackages. We
     need to pick up any which might have been released after the ISO was
     created. (LP: #1888241)
 
+<<<<<<< debian/changelog
  -- Iain Lane <[e-mail]>  Tue, 21 Jul 2020 15:29:51 +0100
 
 ubiquity (20.10.8) groovy; urgency=medium
@@ -215,6 +239,29 @@ ubiquity (20.10.1) groovy; urgency=medium
     (LP: #1847898)
 
  -- Dimitri John Ledkov <[e-mail]>  Wed, 27 May 2020 11:32:08 +0100
+=======
+ -- Iain Lane <[e-mail]>  Tue, 21 Jul 2020 15:32:24 +0100
+
+ubiquity (20.04.15.1) focal; urgency=medium
+
+  [ Sebastien Bacher ]
+  * debian/real-po: updated translations from launchpad, including strings
+    from the new subpage for RST (LP: #1874103)
+
+  [ Michael Hudson-Doyle ]
+  * make grub_default consider the boot argument in the non-removable case
+    (LP: #1847898)
+
+  [ Jean-Baptiste Lallement ]
+  * Enable ZFS autotrim (LP: #1883686)
+  * Use persistent path for pool's vdevs (LP: #1880869)
+  * Do not export all pools (LP: #1875045)
+
+  [ Dimitri John Ledkov ]
+  * ubiquity-dm: start gsd-keyboard for keyboard indicator (LP: #1847307)
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 16 Jun 2020 11:17:42 +0100
+>>>>>>> debian/changelog
 
 ubiquity (20.04.15) focal; urgency=medium
 
diff --git a/debian/real-po/aa.po b/debian/real-po/aa.po
index 322d3a9..35e2800 100644
--- a/debian/real-po/aa.po
+++ b/debian/real-po/aa.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/aa.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/aa.po
 "Language: aa\n"
 
 #. Type: text
@@ -1127,7 +1132,11 @@ msgstr "Ku maganak, kurittet xoqoysimta abnissoosa alif."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/aa.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/aa.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Daabiseyni kuritteh obti kaadu gabbatam maay faxxa?"
diff --git a/debian/real-po/ace.po b/debian/real-po/ace.po
index b3f1196..9b13c3d 100644
--- a/debian/real-po/ace.po
+++ b/debian/real-po/ace.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ace.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ace.po
 "Language: \n"
 
 #. Type: text
@@ -1119,7 +1124,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ace.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ace.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/af.po b/debian/real-po/af.po
index d46e923..a16d531 100644
--- a/debian/real-po/af.po
+++ b/debian/real-po/af.po
@@ -7,15 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/af.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:11+0000\n"
 "Last-Translator: Jurgens J Schoeman <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:30+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/af.po
 "Language-Team: Afrikaans <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/af.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/af.po
 "Language: af\n"
 
 #. Type: text
@@ -1179,7 +1190,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/af.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/af.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2388,6 +2403,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Verwyder pakkette"
 
+<<<<<<< debian/real-po/af.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Fout met herstel van geïnstalleerde toepassings"
 
@@ -2419,3 +2435,11 @@ msgstr "Verwyder pakkette"
 #~ "<span foreground = \"darkred\">Waarskuwing:</span> Dit sal al die lêers op "
 #~ "alle bedryfstelsels verwyder. Hierdie is eksperimenteel en kan verlies van "
 #~ "data veroorsaak. Moet nie op produksiestelsels gebruik nie."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Webleser, nut opsies, kantoor sagteware, KDE PIM pakket plus addisionele "
+#~ "internet programme en mediaspelers."
+>>>>>>> debian/real-po/af.po
diff --git a/debian/real-po/am.po b/debian/real-po/am.po
index efa647a..26603fa 100644
--- a/debian/real-po/am.po
+++ b/debian/real-po/am.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/am.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/am.po
 "Language: \n"
 
 #. Type: text
@@ -1115,7 +1120,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/am.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/am.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/an.po b/debian/real-po/an.po
index 3da28b2..0bf84d9 100644
--- a/debian/real-po/an.po
+++ b/debian/real-po/an.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/an.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/an.po
 "Language: an\n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/an.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/an.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/ar.po b/debian/real-po/ar.po
index e1f68f3..5335df4 100644
--- a/debian/real-po/ar.po
+++ b/debian/real-po/ar.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ar.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ar.po
 "Language: ar\n"
 
 #. Type: text
@@ -1155,7 +1160,11 @@ msgstr "رجاءً أغلق أي تطبيق يستخدم نقاط الوصل ه�
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ar.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ar.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "هل تريد من برنامج التثبيت أن يحاول فصل نقاط الوصل هذه مره أخرى؟"
@@ -1838,6 +1847,11 @@ msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "and system-wide settings will be cleared."
 msgstr ""
+<<<<<<< debian/real-po/ar.po
+=======
+"سيُحتفظ بالمستندات، والموسيقى، وملفات أخرى شخصية، وسيُحتفظ بالبرمجيات "
+"المُثبّتة إن أمكن ذلك، ولكن ستُمسح إعدادات النظام."
+>>>>>>> debian/real-po/ar.po
 
 #. Type: text
 #. Description
diff --git a/debian/real-po/as.po b/debian/real-po/as.po
index 9f811c8..3dbdbea 100644
--- a/debian/real-po/as.po
+++ b/debian/real-po/as.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/as.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/as.po
 "Language: as\n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/as.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/as.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/ast.po b/debian/real-po/ast.po
index 8a41ba0..38e01d7 100644
--- a/debian/real-po/ast.po
+++ b/debian/real-po/ast.po
@@ -7,15 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/ast.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:13+0000\n"
 "Last-Translator: Xandru Martino <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:27+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/ast.po
 "Language-Team: Asturian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ast.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ast.po
 "Language: ast\n"
 
 #. Type: text
@@ -1177,7 +1188,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ast.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ast.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "¿Deseya que l'instalador tente desmontar estes particiones de nueu?"
@@ -2383,6 +2398,7 @@ msgid "Removing packages"
 msgstr "Desaniciando paquetes"
 
 #~ msgid ""
+<<<<<<< debian/real-po/ast.po
 #~ "An error occurred while restoring previously-installed applications.  The "
 #~ "installation will continue, but you may have to manually reinstall some "
 #~ "applications after the computer reboots."
@@ -2413,3 +2429,10 @@ msgstr "Desaniciando paquetes"
 #~ "<span foreground=\"darkred\">Warning:</span> Esto va desaniciar tolos "
 #~ "ficheros de tolos sistemes operativos. Esto ye esperimental y puede producir "
 #~ "la perda de los datos. Nun lo uses en sistemes de producción."
+=======
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Restolador web, utilidaes, software d'oficina, suite KDE PIM, aplicativos "
+#~ "adicionales d'internet y reproductores multimedia."
+>>>>>>> debian/real-po/ast.po
diff --git a/debian/real-po/az.po b/debian/real-po/az.po
index 8804103..786dfc6 100644
--- a/debian/real-po/az.po
+++ b/debian/real-po/az.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/az.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/az.po
 "Language: az\n"
 
 #. Type: text
@@ -1114,7 +1119,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/az.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/az.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/be.po b/debian/real-po/be.po
index b4d3a0f..f6d8568 100644
--- a/debian/real-po/be.po
+++ b/debian/real-po/be.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/be.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:11+0000\n"
 "Last-Translator: Aliaksandr Tsukanau <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:28+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/be.po
 "Language-Team: Belarusian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/be.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/be.po
 "Language: be\n"
 
 #. Type: text
@@ -1167,7 +1178,11 @@ msgstr "Закрыйце ўсе праграмы, якія выкарыстоў�
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/be.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/be.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Паспрабаваць ізноў адмантаваць гэтыя раздзелы?"
@@ -2351,6 +2366,7 @@ msgid "Removing packages"
 msgstr "Выдаленне пакункаў"
 
 #~ msgid ""
+<<<<<<< debian/real-po/be.po
 #~ "Documents, music, and other personal files will be kept. Installed software "
 #~ "will be kept where possible. System-wide settings will be cleared."
 #~ msgstr ""
@@ -2369,3 +2385,10 @@ msgstr "Выдаленне пакункаў"
 #~ "Адбылася памылка пры аднаўленні раней ўсталяваных праграм. Усталяванне будзе "
 #~ "працягнута, але вы павінны самастойна пераўсталяваць некаторыя праграмы "
 #~ "пасля перазапаску камп'ютара."
+=======
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Вэб-браўзэр, асноўныя праграмы, офісныя праграмы, набор KDE PIM, а таксама "
+#~ "дадатковыя праграмы для інтэрнэту і прайгравальнікі медыяфайлаў."
+>>>>>>> debian/real-po/be.po
diff --git a/debian/real-po/bem.po b/debian/real-po/bem.po
index 2541f21..95e326e 100644
--- a/debian/real-po/bem.po
+++ b/debian/real-po/bem.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/bem.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/bem.po
 "Language: bem\n"
 
 #. Type: text
@@ -1114,7 +1119,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/bem.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/bem.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/bg.po b/debian/real-po/bg.po
index a9292e4..2f0ad8c 100644
--- a/debian/real-po/bg.po
+++ b/debian/real-po/bg.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/bg.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/bg.po
 "Language: \n"
 
 #. Type: text
@@ -1184,7 +1189,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/bg.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/bg.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/bn.po b/debian/real-po/bn.po
index 6283e2b..75b11d3 100644
--- a/debian/real-po/bn.po
+++ b/debian/real-po/bn.po
@@ -7,15 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/bn.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:10+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:30+0000\n"
+>>>>>>> debian/real-po/bn.po
 "Last-Translator: Pavlushka <[e-mail]>\n"
 "Language-Team: Bengali <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/bn.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/bn.po
 "Language: \n"
 "X-Language: bn_BD\n"
 
@@ -1132,6 +1142,12 @@ msgid ""
 "Sorry, Active Directory can't be set up at the moment. Once your system is "
 "up and running, visit help.ubuntu.com/activedirectory for help."
 msgstr ""
+<<<<<<< debian/real-po/bn.po
+=======
+"পূর্বে ইনস্টলকৃত অ্যাপ্লিকোেশন পুনরূদ্ধার করার সময় ত্রুটি। ইনস্টলেশন চলবে, "
+"কিন্তু কম্পিউটার রিবুট করার পর কিছু অ্যাপ্লিকেশন নিজহাতে পুনরায় ইনস্টল করতে "
+"হবে।"
+>>>>>>> debian/real-po/bn.po
 
 #. Type: text
 #. Description
@@ -1177,7 +1193,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/bn.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/bn.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "ইনস্টলার কি এই পার্টিশনগুলোকে আবার আনমাউন্ট করার চেষ্টা করবে?"
@@ -1878,6 +1898,11 @@ msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "and system-wide settings will be cleared."
 msgstr ""
+<<<<<<< debian/real-po/bn.po
+=======
+"নথি, মিউজিক, এবং অন্যান্য ব্যক্তিগত ফাইল রাখা হবে। ইনস্টলকৃত সফ্টওয়্যার "
+"যেখানে সম্ভব রাখা হবে। সিস্টেম-জুড়ে সেটিং বাতিল করা হবে।"
+>>>>>>> debian/real-po/bn.po
 
 #. Type: text
 #. Description
@@ -2359,6 +2384,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "প্যাকেজসমূহ অপসারণ করা হচ্ছে"
 
+<<<<<<< debian/real-po/bn.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "ইনস্টলকৃত অ্যাপ্লিকেশন পুনরূদ্ধার করার সময় ত্রুটি"
 
@@ -2377,3 +2403,11 @@ msgstr "প্যাকেজসমূহ অপসারণ করা হচ্
 #~ msgstr ""
 #~ "নথি, মিউজিক, এবং অন্যান্য ব্যক্তিগত ফাইল রাখা হবে। ইনস্টলকৃত সফ্টওয়্যার "
 #~ "যেখানে সম্ভব রাখা হবে। সিস্টেম-জুড়ে সেটিং বাতিল করা হবে।"
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "ওয়েব-ব্রাউজার, মৌলিক সুবিধাসমূহ, অফিস সফট্ওয়্যার, কেডিই পিআইএম স্যুইট এবং "
+#~ "অতিরিক্ত ইন্টারনেট অ্যাপ্লিকেশন সমূহ এবং মিডিয়া প্লেয়ার সমূহ।"
+>>>>>>> debian/real-po/bn.po
diff --git a/debian/real-po/bo.po b/debian/real-po/bo.po
index 41ca3b9..edff51e 100644
--- a/debian/real-po/bo.po
+++ b/debian/real-po/bo.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/bo.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/bo.po
 "Language: bo\n"
 
 #. Type: text
@@ -1134,6 +1139,12 @@ msgid ""
 "Sorry, Active Directory can't be set up at the moment. Once your system is "
 "up and running, visit help.ubuntu.com/activedirectory for help."
 msgstr ""
+<<<<<<< debian/real-po/bo.po
+=======
+"སྔོན་མ་སྒྲིག་འཇུག་བྱས་པའི་ཉེར་སྤྱོད་སླར་གསོ་བྱེད་པའི་སྐབས་ནོར་འཁྲུལ་བྱུང་བ། "
+"སྒྲིག་འཇུག་མུ་མཐུད་རྒྱུ་ཡིན་ཡང་འགོ་བསྐྱར་འཛུགས་ཚར་རྗེས་ཉེར་སྤྱོད་འགའ་ཞིག་ཁྱོད"
+"་ཀྱིས་ལག་བཟོས་ངང་བསྐྱར་སྒྲིག་བྱེད་དགོས་སྲིད།"
+>>>>>>> debian/real-po/bo.po
 
 #. Type: text
 #. Description
@@ -1179,7 +1190,11 @@ msgstr "བཀར་སའི་གནས་འདི་དག་སྤྱོད
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/bo.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/bo.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "སྒྲིག་འཇུག་ཆས་ཀྱིས་གསོག་སྡེར་ཁག་འདི་དག་བཤིགས་ཐུབ་མིན་ཚོད་ལྟ་དགོས་སམ"
@@ -1876,6 +1891,12 @@ msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "and system-wide settings will be cleared."
 msgstr ""
+<<<<<<< debian/real-po/bo.po
+=======
+"ཡིག་ཆ་དང་རོལ་དབྱངས། སྒེར་གྱི་ཡིག་ཆ་གཞན་ཡོངས་ཉར་ཚགས་བྱ་རྒྱུ་ཡིན། "
+"གནས་མཚམས་ཤོས་ཤིག་ལ་སྒྲིག་འཇུག་བྱས་པའི་མཉེན་ཆས་རྣམས་ཉར་རྒྱུ་ཡིན་པ་དང་མ་ལག་ཡོངས"
+"་ཀྱི་སྒྲིག་འཛུགས་གཙང་དག་བཟོ་རྒྱུ་ཡིན"
+>>>>>>> debian/real-po/bo.po
 
 #. Type: text
 #. Description
diff --git a/debian/real-po/br.po b/debian/real-po/br.po
index 8e5443f..fc34982 100644
--- a/debian/real-po/br.po
+++ b/debian/real-po/br.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/br.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/br.po
 "Language: br\n"
 
 #. Type: text
@@ -1159,7 +1164,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/br.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/br.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/bs.po b/debian/real-po/bs.po
index 831c10a..f947751 100644
--- a/debian/real-po/bs.po
+++ b/debian/real-po/bs.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/bs.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:13+0000\n"
 "Last-Translator: Anel Mandal <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:29+0000\n"
+"Last-Translator: Mirza Šehalić <[e-mail]>\n"
+>>>>>>> debian/real-po/bs.po
 "Language-Team: Bosnian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/bs.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/bs.po
 "Language: bs\n"
 
 #. Type: text
@@ -1174,7 +1185,11 @@ msgstr "Molim, zatvorite sve aplikacije koje koriste ove tačke montiranja."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/bs.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/bs.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2360,6 +2375,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Uklanjanje paketa"
 
+<<<<<<< debian/real-po/bs.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Greška u obnovi instaliranih aplikacija"
 
@@ -2379,3 +2395,11 @@ msgstr "Uklanjanje paketa"
 #~ "Dokumenti, muzika, i druge lične datoteke biti će sačuvani. Instalirani "
 #~ "programi će biti sačuvan kada je to moguće. Sistemske postavke će biti "
 #~ "obrisane."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Web pretraživač, pomagala, uredski softver, KDE PIM paket plus dodatne "
+#~ "internetske aplikacije i medijski reproduktori."
+>>>>>>> debian/real-po/bs.po
diff --git a/debian/real-po/ca.po b/debian/real-po/ca.po
index b283d88..3ae89b6 100644
--- a/debian/real-po/ca.po
+++ b/debian/real-po/ca.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/ca.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
 "Last-Translator: Walter Garcia-Fontes <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:30+0000\n"
+"Last-Translator: Rafael Carreras <[e-mail]>\n"
+>>>>>>> debian/real-po/ca.po
 "Language-Team: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ca.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ca.po
 "Language: ca\n"
 
 #. Type: text
@@ -381,7 +392,11 @@ msgstr "Prepareu les particions"
 #. Omit the [ ... ] from the translation.
 #: ../ubiquity.templates:55001
 msgid "_Restart[ action ]"
+<<<<<<< debian/real-po/ca.po
 msgstr "_Reinicia"
+=======
+msgstr ""
+>>>>>>> debian/real-po/ca.po
 
 #. Type: text
 #. Description
@@ -1177,7 +1192,11 @@ msgstr "Tanqueu les aplicacions que emprin aquests punts de muntatge:"
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ca.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ca.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2382,6 +2401,7 @@ msgid "Removing packages"
 msgstr "S'estan suprimint els paquets"
 
 #~ msgid ""
+<<<<<<< debian/real-po/ca.po
 #~ "An error occurred while restoring previously-installed applications.  The "
 #~ "installation will continue, but you may have to manually reinstall some "
 #~ "applications after the computer reboots."
@@ -2412,3 +2432,10 @@ msgstr "S'estan suprimint els paquets"
 #~ "<span foreground=\"darkred\">Avís:</span> Això es borrarà tots els vostres "
 #~ "fitxers de tots els sistemes operatius. Això és experimental i pot causar "
 #~ "pèrdua de dades. No l'useu en sistemes de producció."
+=======
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Navegador web, utilitats, programari d'oficina, paquet PIM del KDE més "
+#~ "aplicacions addicionals d'Internet i reproductors multimèdia."
+>>>>>>> debian/real-po/ca.po
diff --git a/debian/real-po/[e-mail] b/debian/real-po/[e-mail]
index 125c5d8..48f63fd 100644
--- a/debian/real-po/[e-mail]
+++ b/debian/real-po/[e-mail]
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/[e-mail]
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/[e-mail]
 "Language: ca-XV\n"
 
 #. Type: text
@@ -1177,7 +1182,11 @@ msgstr "Tanqueu les aplicacions que empren estos punts de muntatge:"
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/[e-mail]
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/[e-mail]
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/ce.po b/debian/real-po/ce.po
index 6d5f545..2a1c2d5 100644
--- a/debian/real-po/ce.po
+++ b/debian/real-po/ce.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ce.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ce.po
 "Language: ce\n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ce.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ce.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/ckb.po b/debian/real-po/ckb.po
index c78bbe2..29a7222 100644
--- a/debian/real-po/ckb.po
+++ b/debian/real-po/ckb.po
@@ -7,15 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/ckb.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:13+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:28+0000\n"
+>>>>>>> debian/real-po/ckb.po
 "Last-Translator: Jwtiyar Nariman <[e-mail]>\n"
 "Language-Team: Kurdish (Sorani) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ckb.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ckb.po
 "Language: \n"
 
 #. Type: text
@@ -1140,7 +1150,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ckb.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ckb.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2287,6 +2301,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "لابردنی گورزەکان"
 
+<<<<<<< debian/real-po/ckb.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "هەڵە لە کاتی هێنانەوەی داوانامە دامەزراوەکان"
 
@@ -2309,3 +2324,11 @@ msgstr "لابردنی گورزەکان"
 #~ "هەموو سیستمی کارپیکردنەکانت دەسڕێتەوە. ئەمە تاقیکارییە لەوەانەیە ببێتە هۆی "
 #~ "لەدەستدانی زانیاریەکانت. بەکاری مەهێنە لەسەر سیستمێک کە کارەکانتی لەسەر "
 #~ "ئەنجام دەدەیت."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "وێبگەڕ، پێداویستی، داوانامەی ئۆفیس، گورزەی  KDE PIM لەگەڵ چەند داوانامەیەکی "
+#~ "ئینتەرنێت و لێدەری میدیای."
+>>>>>>> debian/real-po/ckb.po
diff --git a/debian/real-po/cs.po b/debian/real-po/cs.po
index 0818872..e71df82 100644
--- a/debian/real-po/cs.po
+++ b/debian/real-po/cs.po
@@ -6,15 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/cs.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:29+0000\n"
+>>>>>>> debian/real-po/cs.po
 "Last-Translator: AsciiWolf <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/cs.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/cs.po
 "Language: cs\n"
 
 #. Type: text
@@ -1167,7 +1177,11 @@ msgstr "Prosím uzavřete všechny aplikace používající tato přípojná mí
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/cs.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/cs.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Chcete, aby instalátor zkusil znovu odpojit tyto oddíly?"
@@ -2367,6 +2381,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Odstraňování balíčků"
 
+<<<<<<< debian/real-po/cs.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Chyba při obnovování nainstalovaných aplikací"
 
@@ -2398,3 +2413,11 @@ msgstr "Odstraňování balíčků"
 #~ "<span foreground=\"darkred\">Upozornění:</span> Tímto smažete všechny své "
 #~ "soubory na všech operačních systémech. Toto je experimentální a může "
 #~ "způsobit ztrátu dat. Nepoužívejte na produkčních systémech."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Webový prohlížeč, nástroje, kancelářský software, sada KDE PIM plus další "
+#~ "internetové aplikace a přehrávače médií."
+>>>>>>> debian/real-po/cs.po
diff --git a/debian/real-po/csb.po b/debian/real-po/csb.po
index 455cf28..6943144 100644
--- a/debian/real-po/csb.po
+++ b/debian/real-po/csb.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/csb.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/csb.po
 "Language: csb\n"
 
 #. Type: text
@@ -1155,7 +1160,11 @@ msgstr "Proszã zamknąc wszëtczé programë brëkùjącé tich pùnktów mònt
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/csb.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/csb.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Chcesz bë instalownik spróbòwôł òdmòntowac ne particëje znowa?"
diff --git a/debian/real-po/cv.po b/debian/real-po/cv.po
index 82ae428..4c921e5 100644
--- a/debian/real-po/cv.po
+++ b/debian/real-po/cv.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/cv.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/cv.po
 "Language: cv\n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/cv.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/cv.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/cy.po b/debian/real-po/cy.po
index 0c7277f..6c33bd3 100644
--- a/debian/real-po/cy.po
+++ b/debian/real-po/cy.po
@@ -6,15 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/cy.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:27+0000\n"
+>>>>>>> debian/real-po/cy.po
 "Last-Translator: Rhoslyn Prys <[e-mail]>\n"
 "Language-Team: Welsh <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/cy.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/cy.po
 "Language: cy\n"
 
 #. Type: text
@@ -1171,7 +1181,11 @@ msgstr "Caewch unrhyw raglenni sy'n defnyddio'r pwyntiau arosod hyn."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/cy.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/cy.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Ydych chi'n eisiau i'r gosodwr ceisio dadarosod y rhaniadau yma eto?"
@@ -2359,6 +2373,7 @@ msgid "Removing packages"
 msgstr "Dileu pecynnau"
 
 #~ msgid ""
+<<<<<<< debian/real-po/cy.po
 #~ "An error occurred while restoring previously-installed applications.  The "
 #~ "installation will continue, but you may have to manually reinstall some "
 #~ "applications after the computer reboots."
@@ -2377,3 +2392,10 @@ msgstr "Dileu pecynnau"
 #~ "Caiff dogfennau, cerddoriaeth, a ffeiliau personol eraill eu cadw. Cedwir "
 #~ "meddalwedd sydd eisoes yn bodoli, lle y bo'n bosibl. Caiff gosodiadau system "
 #~ "gyfan eu clirio."
+=======
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Porwr gwe, gwasanaethau, meddalwedd swyddfa, casgliad PIM KDE, apiau gwe "
+#~ "ychwanegol a chwaraewyr cyfrwng."
+>>>>>>> debian/real-po/cy.po
diff --git a/debian/real-po/da.po b/debian/real-po/da.po
index d33865d..58a1382 100644
--- a/debian/real-po/da.po
+++ b/debian/real-po/da.po
@@ -6,16 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/da.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-10-13 18:06+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:28+0000\n"
+>>>>>>> debian/real-po/da.po
 "Last-Translator: Alan Mortensen <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/da.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
 "Language: da\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+"Language: \n"
+"X-Poedit-Language: Danish\n"
+>>>>>>> debian/real-po/da.po
 
 #. Type: text
 #. Description
@@ -1179,7 +1191,11 @@ msgstr "Luk venligst alle programmer, som bruger disse monteringspunkter."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/da.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/da.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2391,6 +2407,7 @@ msgid "Removing packages"
 msgstr "Fjerner pakker"
 
 #~ msgid ""
+<<<<<<< debian/real-po/da.po
 #~ "An error occurred while restoring previously-installed applications.  The "
 #~ "installation will continue, but you may have to manually reinstall some "
 #~ "applications after the computer reboots."
@@ -2421,3 +2438,10 @@ msgstr "Fjerner pakker"
 #~ "<span foreground=\"darkred\">Advarsel:</span> Alle filer i alle "
 #~ "styresystemer vil blive slettet. Dette er eksperimentelt og kan medføre tab "
 #~ "af data. Brug ikke på produktionssystemer."
+=======
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Webbrowser, redskaber, kontorprogrammer, KDE PIM-suite plus yderligere "
+#~ "internetprogrammer og medieafspillere."
+>>>>>>> debian/real-po/da.po
diff --git a/debian/real-po/de.po b/debian/real-po/de.po
index ab37e6e..c6075c6 100644
--- a/debian/real-po/de.po
+++ b/debian/real-po/de.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/de.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-10-10 11:10+0000\n"
 "Last-Translator: Dennis Baudys <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:29+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/de.po
 "Language-Team: Debian German <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/de.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/de.po
 "Language: \n"
 
 #. Type: text
@@ -1193,7 +1204,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/de.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/de.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2421,6 +2436,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Pakete werden entfernt"
 
+<<<<<<< debian/real-po/de.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Fehler beim Wiederherstellen der installierten Anwendungen"
 
@@ -2453,3 +2469,11 @@ msgstr "Pakete werden entfernt"
 #~ "<span foreground=\"darkred\">Warnung:</span> Dadurch werden alle Ihre "
 #~ "Dateien auf allen Betriebssystemen gelöscht. Dies ist experimentell und kann "
 #~ "zu Datenverlust führen. Nicht auf Produktionssystemen verwenden."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Webbrowser, Dienstprogramme, Büroanwendungen, KDE PIM suite und weitere "
+#~ "Internetanwendungen und Medienspieler."
+>>>>>>> debian/real-po/de.po
diff --git a/debian/real-po/dv.po b/debian/real-po/dv.po
index 21b8d95..a0f075f 100644
--- a/debian/real-po/dv.po
+++ b/debian/real-po/dv.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/dv.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/dv.po
 "Language: dv\n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/dv.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/dv.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/dz.po b/debian/real-po/dz.po
index 918b61f..4bdc542 100644
--- a/debian/real-po/dz.po
+++ b/debian/real-po/dz.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/dz.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/dz.po
 "Language: dz\n"
 
 #. Type: text
@@ -1111,7 +1116,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/dz.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/dz.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/el.po b/debian/real-po/el.po
index 11d32e4..98d4c01 100644
--- a/debian/real-po/el.po
+++ b/debian/real-po/el.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/el.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:13+0000\n"
 "Last-Translator: Simos Xenitellis  <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:30+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/el.po
 "Language-Team: <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/el.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/el.po
 "Language: \n"
 
 #. Type: text
@@ -1192,7 +1203,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/el.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/el.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2417,6 +2432,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Αφαίρεση πακέτων"
 
+<<<<<<< debian/real-po/el.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Σφάλμα κατά την επαναφορά εγκατεστημένων εφαρμογών"
 
@@ -2449,3 +2465,12 @@ msgstr "Αφαίρεση πακέτων"
 #~ "αρχεία σας από όλα τα λειτουργικά συστήματα. Είναι πειραματική λειτουργία "
 #~ "και ενδέχεται να προκαλέσει την απώλεια δεδομένων. Δεν είναι κατάλληλη ακόμα "
 #~ "για επαγγελματική χρήση."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Περιηγητής ιστότοπων, εργαλεία, λογισμικό γραφείου, σουΐτα διαχείρισης "
+#~ "προσωπικών πληροφοριών KDE συν περισσότερες εφαρμογές διαδικτύου και "
+#~ "αναπαραγωγή πολυμέσων."
+>>>>>>> debian/real-po/el.po
diff --git a/debian/real-po/en_AU.po b/debian/real-po/en_AU.po
index 2c7a66f..dbaa88b 100644
--- a/debian/real-po/en_AU.po
+++ b/debian/real-po/en_AU.po
@@ -7,15 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/en_AU.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:30+0000\n"
+>>>>>>> debian/real-po/en_AU.po
 "Last-Translator: Jared Norris <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/en_AU.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/en_AU.po
 "Language: \n"
 
 #. Type: text
@@ -380,7 +390,11 @@ msgstr "Prepare partitions"
 #. Omit the [ ... ] from the translation.
 #: ../ubiquity.templates:55001
 msgid "_Restart[ action ]"
+<<<<<<< debian/real-po/en_AU.po
 msgstr "_Restart[ action ]"
+=======
+msgstr ""
+>>>>>>> debian/real-po/en_AU.po
 
 #. Type: text
 #. Description
@@ -1169,7 +1183,11 @@ msgstr "Please close any applications using these mount points."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/en_AU.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/en_AU.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2373,6 +2391,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Removing packages"
 
+<<<<<<< debian/real-po/en_AU.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Error restoring installed applications"
 
@@ -2403,3 +2422,11 @@ msgstr "Removing packages"
 #~ "<span foreground=\"darkred\">Warning:</span> This will delete all your files "
 #~ "on all operating systems. This is experimental and may cause data loss. Do "
 #~ "not use on production systems."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+>>>>>>> debian/real-po/en_AU.po
diff --git a/debian/real-po/en_CA.po b/debian/real-po/en_CA.po
index 01f2f77..0b555a4 100644
--- a/debian/real-po/en_CA.po
+++ b/debian/real-po/en_CA.po
@@ -7,15 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/en_CA.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:31+0000\n"
+>>>>>>> debian/real-po/en_CA.po
 "Last-Translator: Jonathan <[e-mail]>\n"
 "Language-Team: English (Canada) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/en_CA.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/en_CA.po
 "Language: \n"
 
 #. Type: text
@@ -1169,7 +1179,11 @@ msgstr "Please close any applications using these mount points."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/en_CA.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/en_CA.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2355,6 +2369,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Removing packages"
 
+<<<<<<< debian/real-po/en_CA.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Error restoring installed applications"
 
@@ -2373,3 +2388,11 @@ msgstr "Removing packages"
 #~ msgstr ""
 #~ "Documents, music, and other personal files will be kept. Installed software "
 #~ "will be kept where possible. System-wide settings will be cleared."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+>>>>>>> debian/real-po/en_CA.po
diff --git a/debian/real-po/en_GB.po b/debian/real-po/en_GB.po
index 1082d19..5438a8a 100644
--- a/debian/real-po/en_GB.po
+++ b/debian/real-po/en_GB.po
@@ -7,15 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/en_GB.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-10-13 23:35+0000\n"
 "Last-Translator: Anthony Harrington <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:29+0000\n"
+"Last-Translator: Stephan Woidowski <[e-mail]>\n"
+>>>>>>> debian/real-po/en_GB.po
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/en_GB.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/en_GB.po
 "Language: \n"
 
 #. Type: text
@@ -1172,7 +1183,11 @@ msgstr "Please close any applications using these mount points."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/en_GB.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/en_GB.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2381,6 +2396,7 @@ msgid "Removing packages"
 msgstr "Removing packages"
 
 #~ msgid ""
+<<<<<<< debian/real-po/en_GB.po
 #~ "An error occurred while restoring previously-installed applications.  The "
 #~ "installation will continue, but you may have to manually reinstall some "
 #~ "applications after the computer reboots."
@@ -2410,3 +2426,10 @@ msgstr "Removing packages"
 #~ "<span foreground=\"darkred\">Warning:</span> This will delete all your files "
 #~ "on all operating systems. This is experimental and may cause data loss. Do "
 #~ "not use on production systems."
+=======
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Web browser, utilities, office software, KDE PIM suite, plus additional "
+#~ "internet applications and media players."
+>>>>>>> debian/real-po/en_GB.po
diff --git a/debian/real-po/eo.po b/debian/real-po/eo.po
index bca43fe..ffcc6d2 100644
--- a/debian/real-po/eo.po
+++ b/debian/real-po/eo.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/eo.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/eo.po
 "Language: eo\n"
 
 #. Type: text
@@ -1167,7 +1172,11 @@ msgstr "Bonvolu fermi ĉiujn aplikaĵojn uzantajn ĉi tiujn surmetingojn."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/eo.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/eo.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/es.po b/debian/real-po/es.po
index 3406a4c..d80bed7 100644
--- a/debian/real-po/es.po
+++ b/debian/real-po/es.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/es.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-10-15 20:53+0000\n"
 "Last-Translator: Adolfo Jayme <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:26+0000\n"
+"Last-Translator: Rodrigo Lledó <[e-mail]>\n"
+>>>>>>> debian/real-po/es.po
 "Language-Team: Debian Spanish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/es.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/es.po
 "Language: \n"
 
 #. Type: text
@@ -1180,7 +1191,11 @@ msgstr "Cierre cualquier aplicación que esté usando estos puntos de montaje."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/es.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/es.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2393,6 +2408,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Desinstalando paquetes"
 
+<<<<<<< debian/real-po/es.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Error al restaurar las aplicaciones instaladas"
 
@@ -2424,3 +2440,11 @@ msgstr "Desinstalando paquetes"
 #~ "<span foreground=\"darkred\">Aviso:</span> esto borrará todos sus archivos "
 #~ "en todos los sistemas operativos. Esto es experimental y podría causar "
 #~ "pérdida de datos. No lo use en sistemas de producción."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Navegador web, utilidades, paquete de oficina, paquete PIM de KDE, "
+#~ "reproductores multimedia y otros programas de Internet."
+>>>>>>> debian/real-po/es.po
diff --git a/debian/real-po/et.po b/debian/real-po/et.po
index 655d090..d4fc1b4 100644
--- a/debian/real-po/et.po
+++ b/debian/real-po/et.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/et.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
 "Last-Translator: mahfiaz <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:31+0000\n"
+"Last-Translator: Märt Põder <[e-mail]>\n"
+>>>>>>> debian/real-po/et.po
 "Language-Team: Eesti <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/et.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/et.po
 "Language: \n"
 
 #. Type: text
@@ -1166,7 +1177,11 @@ msgstr "Palun sulge kõik rakendused, mis kasutavad neid liitepunkte."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/et.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/et.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2359,6 +2374,7 @@ msgid "Removing packages"
 msgstr "Pakettide eemaldamine"
 
 #~ msgid ""
+<<<<<<< debian/real-po/et.po
 #~ "An error occurred while restoring previously-installed applications.  The "
 #~ "installation will continue, but you may have to manually reinstall some "
 #~ "applications after the computer reboots."
@@ -2388,3 +2404,10 @@ msgstr "Pakettide eemaldamine"
 #~ "<span foreground=\"darkred\">Hoiatus:</span> Sellega kustutatakse kõik sinu "
 #~ "failid kõigis opsüsteemides. See on eksperimentaalne ning võib põhjustada "
 #~ "andmekadu. Ära kasuta olulistes paigaldustes!"
+=======
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Veebibrauser, tööriistad, kontoritarkvara, KDE PIM tarkvara, lisaks "
+#~ "internetirakendused ja meediaesitajad."
+>>>>>>> debian/real-po/et.po
diff --git a/debian/real-po/eu.po b/debian/real-po/eu.po
index 6ab6ea9..508ef7f 100644
--- a/debian/real-po/eu.po
+++ b/debian/real-po/eu.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/eu.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
 "Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:30+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/eu.po
 "Language-Team: Basque <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/eu.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/eu.po
 "Language: eu\n"
 
 #. Type: text
@@ -1177,7 +1188,11 @@ msgstr "Itxi muntatze-puntu hauek erabiltzen ari den edozein aplikazio."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/eu.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/eu.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2389,6 +2404,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Paketeak ezabatzen"
 
+<<<<<<< debian/real-po/eu.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Errorea instalatutako aplikazioak berriztatzean"
 
@@ -2420,3 +2436,11 @@ msgstr "Paketeak ezabatzen"
 #~ "<span foreground=\"darkred\">Abisua:</span> Honek sistema eragile guztietako "
 #~ "fitxategi guztiak ezabatuko ditu. Hau esperimentala da eta datuen galera "
 #~ "ekar lezake. Ez erabili produkzioko sistemetan."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Web nabigatzailea, utilitateak, bulegotika softwarea, KDE PIM suitea + "
+#~ "Interneterako aplikazio gehigarriak eta multimedia-erreproduzitzaileak."
+>>>>>>> debian/real-po/eu.po
diff --git a/debian/real-po/fa.po b/debian/real-po/fa.po
index 727f014..c090d9f 100644
--- a/debian/real-po/fa.po
+++ b/debian/real-po/fa.po
@@ -6,15 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/fa.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:13+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:29+0000\n"
+>>>>>>> debian/real-po/fa.po
 "Last-Translator: Danial Behzadi <[e-mail]>\n"
 "Language-Team: <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/fa.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/fa.po
 "Language: \n"
 
 #. Type: text
@@ -1118,6 +1128,12 @@ msgid ""
 "Sorry, Active Directory can't be set up at the moment. Once your system is "
 "up and running, visit help.ubuntu.com/activedirectory for help."
 msgstr ""
+<<<<<<< debian/real-po/fa.po
+=======
+"هنگام بارگردانی از برنامه‌های نصب‌شده از پیش، خطایی رخ داد. در هر صورت نصب "
+"ادامه خواهد یافت،  ولی ممکن است پس از راه‌اندازی دوبارهٔ رایانه، برخی "
+"برنامه‌ها به صورت دستی نصب شوند."
+>>>>>>> debian/real-po/fa.po
 
 #. Type: text
 #. Description
@@ -1161,7 +1177,11 @@ msgstr "لطفا هر برنامه‌ای را که از این نقاط است�
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/fa.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/fa.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "می‌خواهید نصب‌کننده باز هم برای پیاده کردن این افرازها تلاش کند؟"
@@ -1862,6 +1882,11 @@ msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "and system-wide settings will be cleared."
 msgstr ""
+<<<<<<< debian/real-po/fa.po
+=======
+"مستندات، آهنگ‌ها و دیگر پرونده‌های شخصی حفظ خواهند شد. نرم‌افزارهای نصب شده "
+"تا جای ممکن حفظ خواهند شد. تنظیمات گسترهٔ سامانه تمیز خواهند شد."
+>>>>>>> debian/real-po/fa.po
 
 #. Type: text
 #. Description
@@ -1969,6 +1994,12 @@ msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your files "
 "on all operating systems."
 msgstr ""
+<<<<<<< debian/real-po/fa.po
+=======
+"<span foreground=\"darkred\">هشدار:</span> این کار تمامی پرونده‌هایتان روی "
+"تمام سیستم‌عامل‌ها را جذف می‌کند. این حالت آزمایشی بوده و ممکن است باعث از "
+"دست رفتن داده‌هایتان شود. روی سامانه‌های در کار کار استفاده نشود."
+>>>>>>> debian/real-po/fa.po
 
 #. Type: text
 #. Description
@@ -2351,6 +2382,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "در حال برداشتن بسته‌ها"
 
+<<<<<<< debian/real-po/fa.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "خطا در بازگرداندن برنامه‌های نصب شده"
 
@@ -2381,3 +2413,11 @@ msgstr "در حال برداشتن بسته‌ها"
 #~ "<span foreground=\"darkred\">هشدار:</span> این کار تمامی پرونده‌هایتان روی "
 #~ "تمام سیستم‌عامل‌ها را جذف می‌کند. این حالت آزمایشی بوده و ممکن است باعث از "
 #~ "دست رفتن داده‌هایتان شود. روی سامانه‌های در کار کار استفاده نشود."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "مرورگر وب، ابزارها، مجموعهٔ اداری، مجموعهٔ KDE PIM به علاوهٔ برنامه‌های "
+#~ "اینترنتی و پخش‌کننده‌های رسانه."
+>>>>>>> debian/real-po/fa.po
diff --git a/debian/real-po/fi.po b/debian/real-po/fi.po
index 100d63d..1478ca8 100644
--- a/debian/real-po/fi.po
+++ b/debian/real-po/fi.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/fi.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-10-11 13:47+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-16 07:54+0000\n"
+"Last-Translator: Timo Jyrinki <Unknown>\n"
+>>>>>>> debian/real-po/fi.po
 "Language-Team: Finnish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/fi.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/fi.po
 "Language: fi\n"
 
 #. Type: text
@@ -1174,7 +1185,11 @@ msgstr "Sulje kaikki sovellukset, jotka käyttävät näitä liitoskohtia."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/fi.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/fi.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Haluatko asennusohjelman yrittävän osioiden irrottamista uudelleen?"
@@ -2397,6 +2412,7 @@ msgid "Removing packages"
 msgstr "Poistetaan paketteja"
 
 #~ msgid ""
+<<<<<<< debian/real-po/fi.po
 #~ "An error occurred while restoring previously-installed applications.  The "
 #~ "installation will continue, but you may have to manually reinstall some "
 #~ "applications after the computer reboots."
@@ -2427,3 +2443,11 @@ msgstr "Poistetaan paketteja"
 #~ "<span foreground=\"darkred\">Varoitus:</span> Tämä poistaa kaikki tiedostosi "
 #~ "kaikista käyttöjärjestelmistä. Tämä on kokeellinen ominaisuus ja saattaa "
 #~ "aiheuttaa tietojen katoamisen. Älä käytä tuotantojärjestelmissä."
+=======
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Verkkoselain, apuohjelmat, toimisto-ohjelmisto, KDE:n henkilökohtaisen "
+#~ "tiedonhallinnan ohjelmistokokonaisuus sekä lisäsovelluksia internetin ja "
+#~ "median käyttöön."
+>>>>>>> debian/real-po/fi.po
diff --git a/debian/real-po/fil.po b/debian/real-po/fil.po
index eafe12f..4e7d738 100644
--- a/debian/real-po/fil.po
+++ b/debian/real-po/fil.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/fil.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/fil.po
 "Language: fil\n"
 
 #. Type: text
@@ -1165,7 +1170,11 @@ msgstr "Pakisara ng mga programang gumagamit ng mga mount points na ito."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/fil.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/fil.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/fo.po b/debian/real-po/fo.po
index 28c5737..f2dad98 100644
--- a/debian/real-po/fo.po
+++ b/debian/real-po/fo.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/fo.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/fo.po
 "Language: fo\n"
 
 #. Type: text
@@ -1127,7 +1132,11 @@ msgstr "Vinarliga lat aftur allar nýtsluskipanir ið nýta hesi ísetupunkt"
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/fo.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/fo.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Skal innleggjarin royna at úrseta deilurnar aftur?"
diff --git a/debian/real-po/fr.po b/debian/real-po/fr.po
index a7bf2c1..a5a121e 100644
--- a/debian/real-po/fr.po
+++ b/debian/real-po/fr.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/fr.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-10-14 08:13+0000\n"
 "Last-Translator: NoirHirsute <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:30+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/fr.po
 "Language-Team: French <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/fr.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/fr.po
 "Language: fr\n"
 
 #. Type: text
@@ -1195,7 +1206,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/fr.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/fr.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -1555,9 +1570,15 @@ msgid ""
 "phone or other device: <a "
 "href=\"https://help.ubuntu.com/rst\">help.ubuntu.com/rst</a>"
 msgstr ""
+<<<<<<< debian/real-po/fr.po
 "Cet ordinateur utilise RST (technologie de stockage rapide d’Intel). Vous "
 "devez désactiver RST avant d’installer Ubuntu. Pour obtenir des "
 "instructions, ouvrez cette page sur un téléphone ou un autre appareil : <a "
+=======
+"Cet ordinateur utilise RST (Rapid Storage Technology) d'Intel. Vous devez "
+"désactiver RST avant d'installer Ubuntu. Pour obtenir des instructions, "
+"ouvrez cette page sur un téléphone ou un autre appareil : <a "
+>>>>>>> debian/real-po/fr.po
 "href=\"https://help.ubuntu.com/rst\">help.ubuntu.com/rst</a>"
 
 #. Type: text
@@ -2422,6 +2443,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Suppression des paquets"
 
+<<<<<<< debian/real-po/fr.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Erreur lors de la restauration des applications installées"
 
@@ -2455,3 +2477,11 @@ msgstr "Suppression des paquets"
 
 #~ msgid "EXPERIMENTAL: Erase disk and use ZFS"
 #~ msgstr "EXPÉRIMENTAL : effacer le disque et utiliser ZFS"
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Navigateur web, utilitaires, logiciel de bureau, suite KDE PIM, applications "
+#~ "Internet supplémentaires et lecteurs multimédias."
+>>>>>>> debian/real-po/fr.po
diff --git a/debian/real-po/fr_CA.po b/debian/real-po/fr_CA.po
index 1d94810..bb627aa 100644
--- a/debian/real-po/fr_CA.po
+++ b/debian/real-po/fr_CA.po
@@ -7,15 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/fr_CA.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-08-31 14:23+0000\n"
 "Last-Translator: AO <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:30+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/fr_CA.po
 "Language-Team: French (Canada) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/fr_CA.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/fr_CA.po
 "Language: \n"
 
 #. Type: text
@@ -391,7 +402,11 @@ msgstr "Préparer dles partitions"
 #. Omit the [ ... ] from the translation.
 #: ../ubiquity.templates:55001
 msgid "_Restart[ action ]"
+<<<<<<< debian/real-po/fr_CA.po
 msgstr "_Redémarrer"
+=======
+msgstr ""
+>>>>>>> debian/real-po/fr_CA.po
 
 #. Type: text
 #. Description
@@ -1190,7 +1205,11 @@ msgstr "Veuillez fermer toute application utilisant ces points de montage."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/fr_CA.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/fr_CA.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2413,6 +2432,7 @@ msgid "Removing packages"
 msgstr "Suppression des paquets"
 
 #~ msgid ""
+<<<<<<< debian/real-po/fr_CA.po
 #~ "An error occurred while restoring previously-installed applications.  The "
 #~ "installation will continue, but you may have to manually reinstall some "
 #~ "applications after the computer reboots."
@@ -2445,3 +2465,10 @@ msgstr "Suppression des paquets"
 #~ "tous vos systèmes d’exploitation seront effacés. Cette option est "
 #~ "expérimentale et pourrait entraîner une perte de données. Ne pas l’utiliser "
 #~ "sur des systèmes de production."
+=======
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Navigateur Web, utilitaires, logiciels bureautiques, suite PIM de KDE, "
+#~ "applications Internet supplémentaires et diffuseurs de médias."
+>>>>>>> debian/real-po/fr_CA.po
diff --git a/debian/real-po/frp.po b/debian/real-po/frp.po
index af96610..7bc7c59 100644
--- a/debian/real-po/frp.po
+++ b/debian/real-po/frp.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/frp.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/frp.po
 "Language: \n"
 
 #. Type: text
@@ -1127,7 +1132,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/frp.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/frp.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/fy.po b/debian/real-po/fy.po
index 9648c3e..fc32135 100644
--- a/debian/real-po/fy.po
+++ b/debian/real-po/fy.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/fy.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/fy.po
 "Language: \n"
 
 #. Type: text
@@ -1136,7 +1141,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/fy.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/fy.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/ga.po b/debian/real-po/ga.po
index 5736e90..c5b839f 100644
--- a/debian/real-po/ga.po
+++ b/debian/real-po/ga.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ga.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ga.po
 "Language: ga\n"
 
 #. Type: text
@@ -1132,7 +1137,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ga.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ga.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/gd.po b/debian/real-po/gd.po
index 5745d13..5cd55cd 100644
--- a/debian/real-po/gd.po
+++ b/debian/real-po/gd.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/gd.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/gd.po
 "Language: gd\n"
 
 #. Type: text
@@ -1198,7 +1203,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/gd.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/gd.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/gl.po b/debian/real-po/gl.po
index 879d0d1..c245126 100644
--- a/debian/real-po/gl.po
+++ b/debian/real-po/gl.po
@@ -7,15 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/gl.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-10-15 20:48+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-21 07:27+0000\n"
+>>>>>>> debian/real-po/gl.po
 "Last-Translator: Xosé <Unknown>\n"
 "Language-Team: Galician <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/gl.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/gl.po
 "Language: gl\n"
 
 #. Type: text
@@ -1181,7 +1191,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/gl.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/gl.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Desexa que o instalador tente desmontar de novo estas particións?"
@@ -2396,6 +2410,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Eliminando paquetes"
 
+<<<<<<< debian/real-po/gl.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Produciuse un erro ao restaurar os aplicativos instalados"
 
@@ -2427,3 +2442,11 @@ msgstr "Eliminando paquetes"
 #~ "<span foreground=\"darkred\">Warning:</span> Isto vai eliminar todos os "
 #~ "ficheiros de todos os sistemas operativos. Isto é experimental e pode "
 #~ "ocasionar a perda de datos. Non o empregue en sistemas de produción."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Navegador web, utilidades, software de oficina, suite KDE PIM, aplicativos "
+#~ "adicionais de internet e reprodutores multimedia."
+>>>>>>> debian/real-po/gl.po
diff --git a/debian/real-po/gu.po b/debian/real-po/gu.po
index 43857ed..a5afbfa 100644
--- a/debian/real-po/gu.po
+++ b/debian/real-po/gu.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/gu.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/gu.po
 "Language: gu\n"
 
 #. Type: text
@@ -1119,7 +1124,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/gu.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/gu.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/gv.po b/debian/real-po/gv.po
index 495eebc..c725e33 100644
--- a/debian/real-po/gv.po
+++ b/debian/real-po/gv.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/gv.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/gv.po
 "Language: gv\n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/gv.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/gv.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/he.po b/debian/real-po/he.po
index 495651d..6d61117 100644
--- a/debian/real-po/he.po
+++ b/debian/real-po/he.po
@@ -6,15 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/he.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-10-08 19:06+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:27+0000\n"
+>>>>>>> debian/real-po/he.po
 "Last-Translator: Yaron <[e-mail]>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/he.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/he.po
 "Language: he\n"
 
 #. Type: text
@@ -1156,7 +1166,11 @@ msgstr "נא לסגור את כל היישומים המשתמשים בנקודו
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/he.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/he.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "האם ברצונך שתכנית ההתקנה תנסה לנתק מחיצות אלה שוב?"
@@ -2343,6 +2357,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "החבילות מוסרות"
 
+<<<<<<< debian/real-po/he.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "אירעה שגיאה בשחזור היישומים המותקנים"
 
@@ -2372,3 +2387,11 @@ msgstr "החבילות מוסרות"
 #~ "<span foreground=\"darkred\">אזהרה:</span> פעולה זו תמחק את כל הקבצים שלך "
 #~ "בכל מערכות ההפעלה. מדובר בניסוי ויתכן אבדן מידע. לא מומלץ להשתמש בזה במערכות "
 #~ "חשובות ויומיומיות."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "דפדפן, עזרים, כלי משרד, ניהול אנשי קשר של KDE לרבות יישומי אינטרנט נוספים "
+#~ "ונגני מולטימדיה."
+>>>>>>> debian/real-po/he.po
diff --git a/debian/real-po/hi.po b/debian/real-po/hi.po
index bc4240f..f8a204c 100644
--- a/debian/real-po/hi.po
+++ b/debian/real-po/hi.po
@@ -6,15 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/hi.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:29+0000\n"
+>>>>>>> debian/real-po/hi.po
 "Last-Translator: Ritwik Raghav <[e-mail]>\n"
 "Language-Team: Hindi <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/hi.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/hi.po
 "Language: hi\n"
 
 #. Type: text
@@ -1124,6 +1134,12 @@ msgid ""
 "Sorry, Active Directory can't be set up at the moment. Once your system is "
 "up and running, visit help.ubuntu.com/activedirectory for help."
 msgstr ""
+<<<<<<< debian/real-po/hi.po
+=======
+"एक त्रुटि पहले से स्थापित अनुप्रयोगों को बहाल करते हुए हो गई। स्थापना जारी "
+"है, लेकिन आपको स्वयं कंप्यूटर रिबूट करने के बाद कुछ अनुप्रयोगों की "
+"पुनर्स्थापना करनी पड़ सकती है।"
+>>>>>>> debian/real-po/hi.po
 
 #. Type: text
 #. Description
@@ -1167,7 +1183,11 @@ msgstr "कृपया माउन्ट बिन्दू का उपय�
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/hi.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/hi.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -1866,6 +1886,11 @@ msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "and system-wide settings will be cleared."
 msgstr ""
+<<<<<<< debian/real-po/hi.po
+=======
+"दस्तावेज़, संगीत, और अन्य व्यक्तिगत फाइलें रखी जाएंगी।स्थापित सॉफ्टवेयर जहां "
+"संभव होगा रखा जाएगा । सभी प्रणाली की सेटिंग साफ हो जाएंगी।"
+>>>>>>> debian/real-po/hi.po
 
 #. Type: text
 #. Description
@@ -2350,6 +2375,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "पैकेज हटा रहा है"
 
+<<<<<<< debian/real-po/hi.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "स्थापित अनुप्रयोगों को बहाल करने में त्रुटि"
 
@@ -2368,3 +2394,11 @@ msgstr "पैकेज हटा रहा है"
 #~ "एक त्रुटि पहले से स्थापित अनुप्रयोगों को बहाल करते हुए हो गई। स्थापना जारी "
 #~ "है, लेकिन आपको स्वयं कंप्यूटर रिबूट करने के बाद कुछ अनुप्रयोगों की "
 #~ "पुनर्स्थापना करनी पड़ सकती है।"
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "जाल विचरक, सेवायें, कार्यालय से जुड़े सॉफ्टवेयर, केडीई पीआईएम समूह के साथ "
+#~ "वादन सेवायें और अंतर्जाल के अतिरिक्त अनुप्रयोग।"
+>>>>>>> debian/real-po/hi.po
diff --git a/debian/real-po/hr.po b/debian/real-po/hr.po
index 8c6790c..96e394d 100644
--- a/debian/real-po/hr.po
+++ b/debian/real-po/hr.po
@@ -6,15 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/hr.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:11+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:26+0000\n"
+>>>>>>> debian/real-po/hr.po
 "Last-Translator: gogo <[e-mail]>\n"
 "Language-Team: Croatian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/hr.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/hr.po
 "Language: hr\n"
 
 #. Type: text
@@ -1175,7 +1185,11 @@ msgstr "Zatvorite aplikacije koje koriste ove točke montiranja."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/hr.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/hr.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2383,6 +2397,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Uklanjanje paketa"
 
+<<<<<<< debian/real-po/hr.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Greška pri vraćanju instaliranih aplikacija"
 
@@ -2414,3 +2429,11 @@ msgstr "Uklanjanje paketa"
 #~ "<span foreground=\"darkred\">Upozorenje:</span> Ovo će obrisati sve vaše "
 #~ "datoteke i sve operativne sustave. Ovo je eksperimentalna značajka i može "
 #~ "prouzročiti gubitak podataka. Ovo nemojte koristiti na proizvodnim sustavima."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Web preglednik, pomagala, uredski softver, KDE PIM paket plus dodatne "
+#~ "internetske aplikacije i medijske reproduktore."
+>>>>>>> debian/real-po/hr.po
diff --git a/debian/real-po/hu.po b/debian/real-po/hu.po
index b9c15cd..f2e44d5 100644
--- a/debian/real-po/hu.po
+++ b/debian/real-po/hu.po
@@ -6,16 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/hu.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-10-09 04:57+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:30+0000\n"
+>>>>>>> debian/real-po/hu.po
 "Last-Translator: Richard Somlói <[e-mail]>\n"
 "Language-Team: Debian L10n Hungarian <debian-l10n-"
 "[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/hu.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/hu.po
 "Language: \n"
 
 #. Type: text
@@ -1176,7 +1186,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/hu.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/hu.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2389,6 +2403,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Csomagok eltávolítása"
 
+<<<<<<< debian/real-po/hu.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Hiba történt a telepített alkalmazások visszaállítása során"
 
@@ -2420,3 +2435,11 @@ msgstr "Csomagok eltávolítása"
 #~ "<span foreground=\"darkred\">Vigyázat:</span> Ezzel törli az összes fájlt az "
 #~ "összes operációs rendszeren. Ez egy kísérleti jellegű funkció és "
 #~ "adatvesztést okozhat. Ne használja éles rendszereknél."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Webböngésző, segédprogramok, irodai szoftver, KDE PIM csomag, további "
+#~ "internetes alkalmazások és médialejátszók."
+>>>>>>> debian/real-po/hu.po
diff --git a/debian/real-po/hy.po b/debian/real-po/hy.po
index 8ffae45..5c1ae2d 100644
--- a/debian/real-po/hy.po
+++ b/debian/real-po/hy.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/hy.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/hy.po
 "Language: hy\n"
 
 #. Type: text
@@ -1129,7 +1134,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/hy.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/hy.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/ia.po b/debian/real-po/ia.po
index c3cf6b2..cd92931 100644
--- a/debian/real-po/ia.po
+++ b/debian/real-po/ia.po
@@ -7,15 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/ia.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:29+0000\n"
+>>>>>>> debian/real-po/ia.po
 "Last-Translator: karm <[e-mail]>\n"
 "Language-Team: Interlingua <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ia.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ia.po
 "Language: ia\n"
 
 #. Type: text
@@ -382,7 +392,11 @@ msgstr "Preparar le partitiones"
 #. Omit the [ ... ] from the translation.
 #: ../ubiquity.templates:55001
 msgid "_Restart[ action ]"
+<<<<<<< debian/real-po/ia.po
 msgstr "_Reinitiar[ action ]"
+=======
+msgstr ""
+>>>>>>> debian/real-po/ia.po
 
 #. Type: text
 #. Description
@@ -1177,7 +1191,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ia.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ia.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2367,6 +2385,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Remotion del pacchettos"
 
+<<<<<<< debian/real-po/ia.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Error in le restauration del applicationes installate"
 
@@ -2386,3 +2405,11 @@ msgstr "Remotion del pacchettos"
 #~ "Documentos, musica, e altere files personal essera mantenite. Le software "
 #~ "installate essera mantenite ubi possibile. Le configurationes general del "
 #~ "systema essera clarate."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Navigator, utilitates, software de officio, suite PIM de KDE, plus altere "
+#~ "applicationes de internet e reproductores multimedial."
+>>>>>>> debian/real-po/ia.po
diff --git a/debian/real-po/id.po b/debian/real-po/id.po
index d9cc542..224cea3 100644
--- a/debian/real-po/id.po
+++ b/debian/real-po/id.po
@@ -6,15 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/id.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:11+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:29+0000\n"
+>>>>>>> debian/real-po/id.po
 "Last-Translator: Andika Triwidada <[e-mail]>\n"
 "Language-Team: Bahasa Indonesia <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/id.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/id.po
 "Language: \n"
 
 #. Type: text
@@ -1177,7 +1187,11 @@ msgstr "Tutuplah semua aplikasi yang memakai titik kait tersebut."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/id.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/id.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Coba untuk melepaskaitan kembali?"
@@ -2387,6 +2401,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Menghapus paket"
 
+<<<<<<< debian/real-po/id.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Galat ketika mengembalikan aplikasi yang terpasang"
 
@@ -2418,3 +2433,11 @@ msgstr "Menghapus paket"
 #~ "<span foreground=\"darkred\">Peringatan:</span> Ini akan menghapus semua "
 #~ "berkas di sistem operasi Anda. Ini masih percobaan dan mungkin mengakibatkan "
 #~ "kehilangan data. Jangan gunakan di sistem produksi."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Peramban web, utilitas, perangkat lunak perkantoran, keluarga PIM KDE tambah "
+#~ "aplikasi internet lain, dan pemutar media."
+>>>>>>> debian/real-po/id.po
diff --git a/debian/real-po/is.po b/debian/real-po/is.po
index ff40724..f9b079d 100644
--- a/debian/real-po/is.po
+++ b/debian/real-po/is.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/is.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/is.po
 "Language: is\n"
 
 #. Type: text
@@ -1166,7 +1171,11 @@ msgstr "Lokaðu forritum sem nota þessa tengipunkta."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/is.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/is.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/it.po b/debian/real-po/it.po
index 9215cc8..c990e19 100644
--- a/debian/real-po/it.po
+++ b/debian/real-po/it.po
@@ -6,15 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/it.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-10-09 11:41+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:29+0000\n"
+>>>>>>> debian/real-po/it.po
 "Last-Translator: Milo Casagrande <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/it.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/it.po
 "Language: it\n"
 
 #. Type: text
@@ -1182,7 +1192,11 @@ msgstr "Chiudere qualsiasi applicazione che stia usando tali punti di mount."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/it.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/it.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2400,6 +2414,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Rimozione dei pacchetti"
 
+<<<<<<< debian/real-po/it.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Errore nel ripristinare le applicazioni installate"
 
@@ -2432,3 +2447,11 @@ msgstr "Rimozione dei pacchetti"
 #~ "eliminati tutti i file in tutti i sistemi operativi. Questa funzionalità è "
 #~ "sperimentale e può causare la perdita di dati. Non utilizzare su sistemi di "
 #~ "produzione."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Browser web, strumenti, software d'ufficio, suite PIM KDE e applicazioni "
+#~ "Internet e multimediali aggiuntive."
+>>>>>>> debian/real-po/it.po
diff --git a/debian/real-po/ja.po b/debian/real-po/ja.po
index be2bbf3..4c68233 100644
--- a/debian/real-po/ja.po
+++ b/debian/real-po/ja.po
@@ -6,15 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/ja.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:13+0000\n"
 "Last-Translator: Ikuya Awashiro <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 12:59+0000\n"
+"Last-Translator: Shinichirou Yamada "
+"<[e-mail]>\n"
+>>>>>>> debian/real-po/ja.po
 "Language-Team: Debian L10n Japanese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ja.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ja.po
 "Language: \n"
 
 #. Type: text
@@ -370,7 +382,11 @@ msgstr "パーティションの準備中"
 #. Omit the [ ... ] from the translation.
 #: ../ubiquity.templates:55001
 msgid "_Restart[ action ]"
+<<<<<<< debian/real-po/ja.po
 msgstr "再起動(_R)"
+=======
+msgstr ""
+>>>>>>> debian/real-po/ja.po
 
 #. Type: text
 #. Description
@@ -1096,6 +1112,11 @@ msgid ""
 "Sorry, Active Directory can't be set up at the moment. Once your system is "
 "up and running, visit help.ubuntu.com/activedirectory for help."
 msgstr ""
+<<<<<<< debian/real-po/ja.po
+=======
+"インストールされていたアプリケーションの復元処理でエラーが発生しました。インストールは続行されますが、インストールが完了して再起動した後で、あらためてアプ"
+"リケーションを手動で再インストールする必要があります。"
+>>>>>>> debian/real-po/ja.po
 
 #. Type: text
 #. Description
@@ -1139,7 +1160,11 @@ msgstr "これらのマウントポイントを使用しているアプリケー
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ja.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ja.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "インストーラーがこれらのパーティションを再度アンマウントしてみても良いですか?"
@@ -1814,6 +1839,10 @@ msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "and system-wide settings will be cleared."
 msgstr ""
+<<<<<<< debian/real-po/ja.po
+=======
+"ドキュメント、音楽、その他の個人ファイルは残されます。インストールされているソフトウェアは可能であれば残されます。システム全体の設定はクリアされます。"
+>>>>>>> debian/real-po/ja.po
 
 #. Type: text
 #. Description
@@ -1917,6 +1946,12 @@ msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your files "
 "on all operating systems."
 msgstr ""
+<<<<<<< debian/real-po/ja.po
+=======
+"<span foreground=\"darkred\">警告:</span> "
+"このオプションはすべてのOSのすべてのファイルを削除します。この機能は実験的で、データの損失を引き起こすかもしれません。日常的に使用するシステムでは有効に"
+"しないでください。"
+>>>>>>> debian/real-po/ja.po
 
 #. Type: text
 #. Description
@@ -2287,6 +2322,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "パッケージを削除しています"
 
+<<<<<<< debian/real-po/ja.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "インストールされたアプリケーションの復元に失敗"
 
@@ -2315,3 +2351,9 @@ msgstr "パッケージを削除しています"
 #~ "<span foreground=\"darkred\">警告:</span> "
 #~ "このオプションはすべてのOSのすべてのファイルを削除します。この機能は実験的で、データの損失を引き起こすかもしれません。日常的に使用するシステムでは有効に"
 #~ "しないでください。"
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr "ウェブブラウザー、ユーティリティ、オフィスソフトウェア、KDE PIMスイートに追加のインターネットアプリケーションとメディアプレイヤー"
+>>>>>>> debian/real-po/ja.po
diff --git a/debian/real-po/ka.po b/debian/real-po/ka.po
index 8da65b5..35bf76c 100644
--- a/debian/real-po/ka.po
+++ b/debian/real-po/ka.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ka.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ka.po
 "Language: ka\n"
 
 #. Type: text
@@ -1134,7 +1139,11 @@ msgstr "გეთაყვა, დახურეთ პროგრამებ
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ka.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ka.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "გნებავთ რომ შემდეგი დანაყოფები ინსტალერის მიერ იქნას მოხსნილი?"
diff --git a/debian/real-po/kab.po b/debian/real-po/kab.po
index 5362b4b..8ce38d4 100644
--- a/debian/real-po/kab.po
+++ b/debian/real-po/kab.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/kab.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/kab.po
 "Language: kab\n"
 
 #. Type: text
@@ -384,7 +389,11 @@ msgstr "Heggi iḥricen"
 #. Omit the [ ... ] from the translation.
 #: ../ubiquity.templates:55001
 msgid "_Restart[ action ]"
+<<<<<<< debian/real-po/kab.po
 msgstr "Ales tanek_ra[ action ]"
+=======
+msgstr ""
+>>>>>>> debian/real-po/kab.po
 
 #. Type: text
 #. Description
@@ -1165,7 +1174,11 @@ msgstr "Ttxil-k m mdel isnasen isseqdacen tanqiḍt-agi n userkeb."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/kab.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/kab.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/kk.po b/debian/real-po/kk.po
index aa4530d..c2951fb 100644
--- a/debian/real-po/kk.po
+++ b/debian/real-po/kk.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/kk.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/kk.po
 "Language: \n"
 
 #. Type: text
@@ -1121,9 +1126,16 @@ msgstr ""
 
 #. Type: error
 #. Description
+<<<<<<< debian/real-po/kk.po
 #: ../ubiquity.templates:151001
 msgid "Error configuring connection to Active Directory"
 msgstr ""
+=======
+#: ../ubiquity.templates:150001
+msgid "Error restoring installed applications"
+msgstr ""
+"Орнатылған бағдарламаны қайта қалпына келтіру кезінде қате пайда болды"
+>>>>>>> debian/real-po/kk.po
 
 #. Type: error
 #. Description
@@ -1176,7 +1188,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/kk.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/kk.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Осы бөлімдерді тіркеуден шығаруды қайталап көруді қалайсыз ба?"
diff --git a/debian/real-po/kl.po b/debian/real-po/kl.po
index ff88dd7..c738717 100644
--- a/debian/real-po/kl.po
+++ b/debian/real-po/kl.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/kl.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/kl.po
 "Language: \n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/kl.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/kl.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/km.po b/debian/real-po/km.po
index b8be880..ad4daf1 100644
--- a/debian/real-po/km.po
+++ b/debian/real-po/km.po
@@ -15,8 +15,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/km.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/km.po
 "Language: \n"
 
 #. Type: text
@@ -1150,6 +1155,12 @@ msgid ""
 "Sorry, Active Directory can't be set up at the moment. Once your system is "
 "up and running, visit help.ubuntu.com/activedirectory for help."
 msgstr ""
+<<<<<<< debian/real-po/km.po
+=======
+"កំហុស​មួយ​បាន​កើត​ឡើង​ខណៈ​ពេល​ដែល​ស្ដារ​កម្មវិធី​ដែលបាន​ដំឡើង​ពី​មុន ។​ "
+"ការ​ដំឡើង​នឹង​បន្ត ប៉ុន្តែ​​អាច​ត្រូវ​ដំឡើង​កម្មវិធី​មួយ​ចំនួន​​ដោយ​ដៃ "
+"បន្ទាប់​ពី​កុំព្យូទ័រ​ចាប់ផ្ដើម​ឡើង​វិញ ។"
+>>>>>>> debian/real-po/km.po
 
 #. Type: text
 #. Description
@@ -1194,7 +1205,11 @@ msgstr "សូម​បិទ​កម្មវិធី​ណា​មួយ​
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/km.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/km.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -1901,6 +1916,12 @@ msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "and system-wide settings will be cleared."
 msgstr ""
+<<<<<<< debian/real-po/km.po
+=======
+"ឯកសារ តន្ត្រី និង​​ឯកសារ​ផ្ទាល់​ខ្លួន​ផ្សេងៗ​​ទៀត​នឹង​ត្រូវ​បាន​រក្សាទុក​ ។ "
+"កម្មវិធី​ដែល​បាន​ដំឡើង​នឹង​​ត្រូវ​បាន​រក្សាទុក​កន្លែង​ដែល​អាច​រក្សា​ទុក​បាន ។"
+" ការ​កំណត់​ប្រព័ន្ធ​ទាំង​មូល​នឹង​ត្រូវ​បាន​សម្អាត ។"
+>>>>>>> debian/real-po/km.po
 
 #. Type: text
 #. Description
diff --git a/debian/real-po/kn.po b/debian/real-po/kn.po
index ecad702..512d818 100644
--- a/debian/real-po/kn.po
+++ b/debian/real-po/kn.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/kn.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/kn.po
 "Language: kn\n"
 
 #. Type: text
@@ -1126,7 +1131,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/kn.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/kn.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/ko.po b/debian/real-po/ko.po
index 11c7c36..d2a6ebe 100644
--- a/debian/real-po/ko.po
+++ b/debian/real-po/ko.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/ko.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-08-25 22:49+0000\n"
 "Last-Translator: minwook shin <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:26+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/ko.po
 "Language-Team: Korean <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ko.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ko.po
 "Language: ko\n"
 
 #. Type: text
@@ -370,7 +381,11 @@ msgstr "파티션 준비"
 #. Omit the [ ... ] from the translation.
 #: ../ubiquity.templates:55001
 msgid "_Restart[ action ]"
+<<<<<<< debian/real-po/ko.po
 msgstr "재시작(_R)[ action ]"
+=======
+msgstr ""
+>>>>>>> debian/real-po/ko.po
 
 #. Type: text
 #. Description
@@ -1093,6 +1108,11 @@ msgid ""
 "Sorry, Active Directory can't be set up at the moment. Once your system is "
 "up and running, visit help.ubuntu.com/activedirectory for help."
 msgstr ""
+<<<<<<< debian/real-po/ko.po
+=======
+"이전에 설치한 프로그램을 복구던 중 오류가 발생했습니다. 설치 과정은 계속하지만 컴퓨터를 다시 시작한 후 일부 프로그램을 직접 다시 "
+"설치해야 할 수 있습니다."
+>>>>>>> debian/real-po/ko.po
 
 #. Type: text
 #. Description
@@ -1135,7 +1155,11 @@ msgstr "이 마운트 위치를 사용하는 모든 프로그램을 닫아주십
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ko.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ko.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "설치 프로그램이 이 파티션을 다시 마운트 해제하도록 할까요?"
@@ -1810,8 +1834,13 @@ msgstr "${CURDISTRO} 다시 설치"
 #: ../ubiquity.templates:268001
 msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
+<<<<<<< debian/real-po/ko.po
 "and system-wide settings will be cleared."
 msgstr ""
+=======
+"will be kept where possible. System-wide settings will be cleared."
+msgstr "문서, 음악, 기타 개인 파일을 보존합니다. 설치한 소프트웨어는 가능한 장소에 보존합니다. 시스템 전체 설정은 지웁니다."
+>>>>>>> debian/real-po/ko.po
 
 #. Type: text
 #. Description
@@ -1915,6 +1944,11 @@ msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your files "
 "on all operating systems."
 msgstr ""
+<<<<<<< debian/real-po/ko.po
+=======
+"<span foreground=\"darkred\">경고:</span> 모든 운영체제 내의 모든 파일을 삭제할 것입니다. 이것은 "
+"실험적이며 데이터 유실을 야기할 수 있습니다. 프로덕션 시스템에서는 사용하지 마세요."
+>>>>>>> debian/real-po/ko.po
 
 #. Type: text
 #. Description
@@ -2284,6 +2318,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "패키지 제거 중"
 
+<<<<<<< debian/real-po/ko.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "설치한 프로그램 복구 중 오류 발생"
 
@@ -2310,3 +2345,9 @@ msgstr "패키지 제거 중"
 #~ msgstr ""
 #~ "<span foreground=\"darkred\">경고:</span> 모든 운영체제 내의 모든 파일을 삭제할 것입니다. 이것은 "
 #~ "실험적이며 데이터 유실을 야기할 수 있습니다. 프로덕션 시스템에서는 사용하지 마세요."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr "웹 브라우저, 유틸리티, 오피스 소프트웨어, KDE PIM 제품군, 추가 인터넷 응용 프로그램 및 미디어 플레이어."
+>>>>>>> debian/real-po/ko.po
diff --git a/debian/real-po/ku.po b/debian/real-po/ku.po
index 6ff1a2a..6144b14 100644
--- a/debian/real-po/ku.po
+++ b/debian/real-po/ku.po
@@ -6,15 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/ku.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:29+0000\n"
+>>>>>>> debian/real-po/ku.po
 "Last-Translator: Bikarhêner <[e-mail]>\n"
 "Language-Team: ku <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ku.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ku.po
 "Language: \n"
 
 #. Type: text
@@ -1171,7 +1181,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ku.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ku.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2356,6 +2370,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Pakêt tên rakirin"
 
+<<<<<<< debian/real-po/ku.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Gava sepanên sazkirî dihatin paşve vegerandin xeta derket"
 
@@ -2375,3 +2390,11 @@ msgstr "Pakêt tên rakirin"
 #~ "Pel, muzîk, û peldankên din yên şexsî wê bêne muhafezekirin. Nivîsbariyên "
 #~ "sazkirî li cihên ku mimkin bin wê bêne parastin. Eyarên li seranserê sîstemê "
 #~ "wê bêne paqijkirin."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Geroka webê, amûr, nivîsbariyên ofîsê, suîta KDE PIM bi ser ve jî sepanên "
+#~ "din ên înternetê û lêderên medyayê."
+>>>>>>> debian/real-po/ku.po
diff --git a/debian/real-po/kw.po b/debian/real-po/kw.po
index e44b37f..a619e90 100644
--- a/debian/real-po/kw.po
+++ b/debian/real-po/kw.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/kw.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/kw.po
 "Language: kw\n"
 
 #. Type: text
@@ -1138,7 +1143,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/kw.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/kw.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/ky.po b/debian/real-po/ky.po
index 9544d33..3dea3b7 100644
--- a/debian/real-po/ky.po
+++ b/debian/real-po/ky.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ky.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ky.po
 "Language: ky\n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ky.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ky.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/lb.po b/debian/real-po/lb.po
index 3e7a7be..d72dc71 100644
--- a/debian/real-po/lb.po
+++ b/debian/real-po/lb.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/lb.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/lb.po
 "Language: \n"
 
 #. Type: text
@@ -1123,7 +1128,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/lb.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/lb.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/lo.po b/debian/real-po/lo.po
index 28ad0a7..b870b23 100644
--- a/debian/real-po/lo.po
+++ b/debian/real-po/lo.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/lo.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/lo.po
 "Language: \n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/lo.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/lo.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/lt.po b/debian/real-po/lt.po
index 9d66ada..937b484 100644
--- a/debian/real-po/lt.po
+++ b/debian/real-po/lt.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/lt.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-09-16 13:55+0000\n"
 "Last-Translator: Moo <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:31+0000\n"
+"Last-Translator: Mantas Kriaučiūnas <[e-mail]>\n"
+>>>>>>> debian/real-po/lt.po
 "Language-Team: Lithuanian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/lt.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/lt.po
 "Language: lt\n"
 
 #. Type: text
@@ -383,7 +394,11 @@ msgstr "Paruošti skirsnius"
 #. Omit the [ ... ] from the translation.
 #: ../ubiquity.templates:55001
 msgid "_Restart[ action ]"
+<<<<<<< debian/real-po/lt.po
 msgstr "_Perleisti [ action ]"
+=======
+msgstr ""
+>>>>>>> debian/real-po/lt.po
 
 #. Type: text
 #. Description
@@ -1174,7 +1189,11 @@ msgstr "Užverkite visas programas, kurios naudoja failus iš šių vietų."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/lt.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/lt.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2374,6 +2393,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Šalinami paketai"
 
+<<<<<<< debian/real-po/lt.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Klaida atkuriant įdiegtas programas"
 
@@ -2408,3 +2428,11 @@ msgstr "Šalinami paketai"
 #~ "kompiuteryje esantys failai bei visos operacinės sistemos. Šis būdas yra "
 #~ "eksperimentinis - gali įvykti duomenų praradimas. Nesirinkite darbui "
 #~ "skirtuose kompiuteriuose, kur reikia patikimumo."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Interneto naršyklė, paslaugų, biuro bei multimedijos (vaizdo ir garso) "
+#~ "programos, KDE kalendorius, el. pašto bei kt. programos."
+>>>>>>> debian/real-po/lt.po
diff --git a/debian/real-po/lv.po b/debian/real-po/lv.po
index 8d43bc2..fd83f31 100644
--- a/debian/real-po/lv.po
+++ b/debian/real-po/lv.po
@@ -7,15 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/lv.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
 "Last-Translator: Rūdolfs Mazurs <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:29+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/lv.po
 "Language-Team: Latvian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/lv.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/lv.po
 "Language: lv\n"
 
 #. Type: text
@@ -1172,7 +1183,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/lv.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/lv.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Vai vēlaties, lai instalators mēģinātu vēlreiz atmontēt nodalījumus?"
@@ -2356,6 +2371,7 @@ msgid "Removing packages"
 msgstr "Noņem pakotnes"
 
 #~ msgid ""
+<<<<<<< debian/real-po/lv.po
 #~ "Documents, music, and other personal files will be kept. Installed software "
 #~ "will be kept where possible. System-wide settings will be cleared."
 #~ msgstr ""
@@ -2374,3 +2390,10 @@ msgstr "Noņem pakotnes"
 
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Kļūda instalēto lietotņu atjaunošanas laikā"
+=======
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Tīmekļa pārlūks,  utilītprogrammas, biroja programmatūra, KDE PIM svīta, "
+#~ "interneta lietotnes un mediju atskaņotāji."
+>>>>>>> debian/real-po/lv.po
diff --git a/debian/real-po/mg.po b/debian/real-po/mg.po
index 8c5af8f..663adf9 100644
--- a/debian/real-po/mg.po
+++ b/debian/real-po/mg.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/mg.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/mg.po
 "Language: mg\n"
 
 #. Type: text
@@ -1111,7 +1116,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/mg.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/mg.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/mhr.po b/debian/real-po/mhr.po
index e67b60a..a263818 100644
--- a/debian/real-po/mhr.po
+++ b/debian/real-po/mhr.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/mhr.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/mhr.po
 "Language: \n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/mhr.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/mhr.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/mjw.po b/debian/real-po/mjw.po
index 58b6fae..c0c7f3e 100644
--- a/debian/real-po/mjw.po
+++ b/debian/real-po/mjw.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/mjw.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/mjw.po
 "Language: mjw\n"
 
 #. Type: text
@@ -1117,7 +1122,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/mjw.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/mjw.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/mk.po b/debian/real-po/mk.po
index dc4ebf6..899a699 100644
--- a/debian/real-po/mk.po
+++ b/debian/real-po/mk.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/mk.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/mk.po
 "Language: mk\n"
 
 #. Type: text
@@ -1120,7 +1125,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/mk.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/mk.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/ml.po b/debian/real-po/ml.po
index 0b1f243..e3c6c37 100644
--- a/debian/real-po/ml.po
+++ b/debian/real-po/ml.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ml.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ml.po
 "Language: \n"
 
 #. Type: text
@@ -1141,7 +1146,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ml.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ml.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/mnw.po b/debian/real-po/mnw.po
index 4ebea49..01e0021 100644
--- a/debian/real-po/mnw.po
+++ b/debian/real-po/mnw.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/mnw.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/mnw.po
 "Language: \n"
 
 #. Type: text
@@ -1140,7 +1145,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/mnw.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/mnw.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/mr.po b/debian/real-po/mr.po
index 35dcc1c..951cb64 100644
--- a/debian/real-po/mr.po
+++ b/debian/real-po/mr.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/mr.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/mr.po
 "Language: mr\n"
 
 #. Type: text
@@ -1120,6 +1125,11 @@ msgid ""
 "Sorry, Active Directory can't be set up at the moment. Once your system is "
 "up and running, visit help.ubuntu.com/activedirectory for help."
 msgstr ""
+<<<<<<< debian/real-po/mr.po
+=======
+"आधी प्रस्थापित संयोजना पुनःप्रस्थापिक करताना चूक झाली. प्रस्थापनांतर ते "
+"तुम्हाला परत प्रस्थापित करावे लागतील."
+>>>>>>> debian/real-po/mr.po
 
 #. Type: text
 #. Description
@@ -1163,7 +1173,11 @@ msgstr "या माउंटबिंदूंना वापरणारे 
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/mr.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/mr.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "या पार्टिशन्स प्रस्थापकाने परत अनमाउंट करायच्या का?"
@@ -1852,6 +1866,11 @@ msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "and system-wide settings will be cleared."
 msgstr ""
+<<<<<<< debian/real-po/mr.po
+=======
+"दस्तऐवज, संगीत आणि इतर वैयक्तिक फाईल्स ठेवल्या जातील. शक्य तिथे प्रस्थापित "
+"सॉफ्टवेअर ठेवले जाईल. प्रणाली-अंतर्भूत बदल काढून टाकले जातील."
+>>>>>>> debian/real-po/mr.po
 
 #. Type: text
 #. Description
diff --git a/debian/real-po/ms.po b/debian/real-po/ms.po
index a836029..b1df7d2 100644
--- a/debian/real-po/ms.po
+++ b/debian/real-po/ms.po
@@ -7,15 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/ms.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
 "Last-Translator: abuyop <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:30+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/ms.po
 "Language-Team: Malay <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ms.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ms.po
 "Language: ms\n"
 
 #. Type: text
@@ -1176,7 +1187,11 @@ msgstr "Sila tutup apa-apa aplikasi yang menggunakan titik pautan."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ms.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ms.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2368,6 +2383,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Membuang pakej-pakej"
 
+<<<<<<< debian/real-po/ms.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Ralat memulihjan aplikasi yang dipasang"
 
@@ -2399,3 +2415,11 @@ msgstr "Membuang pakej-pakej"
 #~ "<span foreground=\"darkred\">Amaran:</span> Ini akan memadam semua fail anda "
 #~ "dalam semua sistem operasi. Ini adalah eksperimental dan mungkin akan "
 #~ "mengakibatkan kehilangan data. Jangan guna dalam sistem produksi."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Pelayar sesawang, utiliti, perisian pejabat, suit KDE PIM dengan aplikasi "
+#~ "internet dan pemain media."
+>>>>>>> debian/real-po/ms.po
diff --git a/debian/real-po/my.po b/debian/real-po/my.po
index d6783a5..7168ad4 100644
--- a/debian/real-po/my.po
+++ b/debian/real-po/my.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/my.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/my.po
 "Language: my\n"
 
 #. Type: text
@@ -1130,9 +1135,16 @@ msgstr ""
 
 #. Type: error
 #. Description
+<<<<<<< debian/real-po/my.po
 #: ../ubiquity.templates:151001
 msgid "Error configuring connection to Active Directory"
 msgstr ""
+=======
+#: ../ubiquity.templates:150001
+msgid "Error restoring installed applications"
+msgstr ""
+"အသုံးချဆော့ဝဲများ ထည့်သွင်းနေစဉ် တင်သွင်းနေစဉ် ချို့ယွင်းချက် တွေ့ရှိရပါသည်"
+>>>>>>> debian/real-po/my.po
 
 #. Type: error
 #. Description
@@ -1141,6 +1153,13 @@ msgid ""
 "Sorry, Active Directory can't be set up at the moment. Once your system is "
 "up and running, visit help.ubuntu.com/activedirectory for help."
 msgstr ""
+<<<<<<< debian/real-po/my.po
+=======
+"ယခင် ထည့်သွင်းထားသော အသုံးချဆော့ဝဲများ ပြန်လည်တင်သွင်းနေစဉ် "
+"ချို့ယွင်းချက်တစ်ခု တွေ့ရပါသည်။ စနစ်ထည့်သွင်းမှု ဆက်လက်လုပ်ဆောင်ပါမည်။ "
+"သို့သော် အသုံးချဆော့ဝဲများကို ကွန်ပျူတာ ပြန်လည်စတင်ပြီးလျှင် ပြန်လည် "
+"ထည့်သွင်းပေးရန် လိုအပ်ပါလိမ့်မည်။"
+>>>>>>> debian/real-po/my.po
 
 #. Type: text
 #. Description
@@ -1186,7 +1205,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/my.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/my.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -1889,6 +1912,12 @@ msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "and system-wide settings will be cleared."
 msgstr ""
+<<<<<<< debian/real-po/my.po
+=======
+"စာရွက်စာတမ်းများ၊ ဂီတနှင့် အခြား တစ်ကိုယ်ရေ ဖိုင်များကို ထိန်းသိမ်းထားပါမည်။ "
+"ထည့်သွင်းထားသော ဆော့ဝဲများကို ဖြစ်နိုင်သမျှ ထိန်းသိမ်းထားပါမည်။ "
+"စနစ်တစ်ခုလုံး၏ ချိန်ညှိမှုများကို ရှင်းလင်းပါမည်။"
+>>>>>>> debian/real-po/my.po
 
 #. Type: text
 #. Description
diff --git a/debian/real-po/nb.po b/debian/real-po/nb.po
index 18c84e4..da14a2b 100644
--- a/debian/real-po/nb.po
+++ b/debian/real-po/nb.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/nb.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:11+0000\n"
 "Last-Translator: Åka Sikrom <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:30+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/nb.po
 "Language-Team: Norwegian Bokmål <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/nb.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/nb.po
 "Language: \n"
 
 #. Type: text
@@ -1171,7 +1182,11 @@ msgstr "Lukk alle programmer som bruker disse monteringspunktene."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/nb.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/nb.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2354,6 +2369,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Fjerner pakker"
 
+<<<<<<< debian/real-po/nb.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Det oppstod en feil ved gjennoppretting av installerte programmer"
 
@@ -2373,3 +2389,11 @@ msgstr "Fjerner pakker"
 #~ "Dokumenter, musikk og andre personlige filer beholdes. Installert "
 #~ "programvare beholdes i den grad det er mulig. Systeminnstillinger "
 #~ "tilbakestilles."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Nettleser, verktøy, kontorprogrammer, KDE PIM-pakke, andre "
+#~ "internettprogrammer og mediespillere."
+>>>>>>> debian/real-po/nb.po
diff --git a/debian/real-po/nds.po b/debian/real-po/nds.po
index 6278c4f..b8698f6 100644
--- a/debian/real-po/nds.po
+++ b/debian/real-po/nds.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/nds.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/nds.po
 "Language: \n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/nds.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/nds.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/ne.po b/debian/real-po/ne.po
index a2d7a1f..73e19d1 100644
--- a/debian/real-po/ne.po
+++ b/debian/real-po/ne.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ne.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ne.po
 "Language: ne\n"
 
 #. Type: text
@@ -1126,6 +1131,12 @@ msgid ""
 "Sorry, Active Directory can't be set up at the moment. Once your system is "
 "up and running, visit help.ubuntu.com/activedirectory for help."
 msgstr ""
+<<<<<<< debian/real-po/ne.po
+=======
+"पहिला स्थापना भएका एप्लिकेशनहरू पूनर्स्थापना गर्दा एउटा त्रुटि भयो । स्थापना "
+"प्रक्रिया जारी रहने छ तर कम्प्युटर पुन: बूट भएपछि कुनै कुनै एप्लिकेशनहरू "
+"तपाईं आँफैले फेरि स्थापना गर्नुपर्ने हुन्छ ।"
+>>>>>>> debian/real-po/ne.po
 
 #. Type: text
 #. Description
@@ -1170,7 +1181,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ne.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ne.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -1867,6 +1882,11 @@ msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "and system-wide settings will be cleared."
 msgstr ""
+<<<<<<< debian/real-po/ne.po
+=======
+"तपाईका कागजातहरू, संगीत र अन्य व्यक्तिगत फाइलहरू राखिनेछन् । स्थापित "
+"सफ्टवेयर पनि सकेसम्म राखिनेछ । सिस्टमको सेटिङ्हरू चाहिँ हटाईनेछन् ।"
+>>>>>>> debian/real-po/ne.po
 
 #. Type: text
 #. Description
diff --git a/debian/real-po/nl.po b/debian/real-po/nl.po
index d0c406f..0cce768 100644
--- a/debian/real-po/nl.po
+++ b/debian/real-po/nl.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/nl.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-10-09 15:41+0000\n"
 "Last-Translator: Hannie Dumoleyn <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:26+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/nl.po
 "Language-Team: Dutch <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/nl.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/nl.po
 "Language: nl\n"
 
 #. Type: text
@@ -1189,7 +1200,11 @@ msgstr "Sluit a.u.b. alle toepassingen die deze koppelpunten gebruiken."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/nl.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/nl.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2420,6 +2435,7 @@ msgid "Removing packages"
 msgstr "Pakketten verwijderen"
 
 #~ msgid ""
+<<<<<<< debian/real-po/nl.po
 #~ "An error occurred while restoring previously-installed applications.  The "
 #~ "installation will continue, but you may have to manually reinstall some "
 #~ "applications after the computer reboots."
@@ -2450,3 +2466,10 @@ msgstr "Pakketten verwijderen"
 #~ "<span foreground=\"darkred\">Waarschuwing:</span> dit zal al uw bestanden in "
 #~ "alle besturingssystemen wissen. Dit is experimenteel, riskant en kan "
 #~ "gegevensverlies veroorzaken. Gebruik het niet op productiesystemen."
+=======
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Webbrowser, hulpmiddelen, kantoorpakket, KDE-PIM-pakket plus extra "
+#~ "internettoepassingen en mediaspelers."
+>>>>>>> debian/real-po/nl.po
diff --git a/debian/real-po/nl_NL.po b/debian/real-po/nl_NL.po
index 5be6483..b59995a 100644
--- a/debian/real-po/nl_NL.po
+++ b/debian/real-po/nl_NL.po
@@ -7,15 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ubiquity\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< debian/real-po/nl_NL.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+>>>>>>> debian/real-po/nl_NL.po
 "PO-Revision-Date: 2010-04-14 19:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch (Netherlands) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/nl_NL.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/nl_NL.po
 
 #. Type: text
 #. Description
@@ -1111,7 +1120,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/nl_NL.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/nl_NL.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/nn.po b/debian/real-po/nn.po
index 08130eb..abdc9e4 100644
--- a/debian/real-po/nn.po
+++ b/debian/real-po/nn.po
@@ -7,15 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/nn.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
 "Last-Translator: Øystein Steffensen-Alværvik <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:30+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+>>>>>>> debian/real-po/nn.po
 "Language-Team: Norwegian Nynorsk <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/nn.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/nn.po
 "Language: \n"
 
 #. Type: text
@@ -1170,7 +1181,11 @@ msgstr "Avslutt alle program som brukar desse monteringspunkta."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/nn.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/nn.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2348,6 +2363,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Fjernar pakkar"
 
+<<<<<<< debian/real-po/nn.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Feil ved gjenoppretting av installerte program"
 
@@ -2367,3 +2383,11 @@ msgstr "Fjernar pakkar"
 #~ "Dokument, musikk og andre personlege filer vert tekne vare på. Installert "
 #~ "programvare vert tekne vare på der det er mogleg. Systeminnstillingar vert "
 #~ "sletta."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Nettlesar, verktøy, kontorpakke, persondatahandsamar frå KDE samt ekstra "
+#~ "internettprogram og mediespelarar."
+>>>>>>> debian/real-po/nn.po
diff --git a/debian/real-po/ny.po b/debian/real-po/ny.po
index 205cada..49a8453 100644
--- a/debian/real-po/ny.po
+++ b/debian/real-po/ny.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ny.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ny.po
 "Language: \n"
 
 #. Type: text
@@ -1134,7 +1139,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ny.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ny.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/oc.po b/debian/real-po/oc.po
index 56906cd..2a768d1 100644
--- a/debian/real-po/oc.po
+++ b/debian/real-po/oc.po
@@ -8,15 +8,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/oc.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-10-08 22:16+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 10:16+0000\n"
+>>>>>>> debian/real-po/oc.po
 "Last-Translator: Quentin PAGÈS <Unknown>\n"
 "Language-Team: Tot En Òc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/oc.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/oc.po
 "Language: oci\n"
 
 #. Type: text
@@ -1188,7 +1198,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/oc.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/oc.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
@@ -2409,6 +2423,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Supression dels paquets"
 
+<<<<<<< debian/real-po/oc.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Error al moment del restabliment de las aplicacions installadas"
 
@@ -2441,3 +2456,11 @@ msgstr "Supression dels paquets"
 #~ "totes vòstres fichièrs sus totes los sistèmas operatius. Aquesta opcion es "
 #~ "experimentala e poiriá entrainar una pèrda de donadas. L'utilizetz pas sus "
 #~ "de sistèmas en produccion."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Navigador web, utilitaris, logicials de burèu, seguida KDE PIM, aplicacions "
+#~ "suplementàrias e lectors multimèdias."
+>>>>>>> debian/real-po/oc.po
diff --git a/debian/real-po/oj.po b/debian/real-po/oj.po
index 7cea05f..aa14307 100644
--- a/debian/real-po/oj.po
+++ b/debian/real-po/oj.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/oj.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/oj.po
 "Language: \n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/oj.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/oj.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/om.po b/debian/real-po/om.po
index f2891f8..c4c4e60 100644
--- a/debian/real-po/om.po
+++ b/debian/real-po/om.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/om.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/om.po
 "Language: \n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/om.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/om.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/or.po b/debian/real-po/or.po
index e3e6049..6c6c297 100644
--- a/debian/real-po/or.po
+++ b/debian/real-po/or.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/or.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/or.po
 "Language: or\n"
 
 #. Type: text
@@ -1112,7 +1117,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/or.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/or.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/os.po b/debian/real-po/os.po
index 9c6c11b..f5cb648 100644
--- a/debian/real-po/os.po
+++ b/debian/real-po/os.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/os.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/os.po
 "Language: os\n"
 
 #. Type: text
@@ -1127,7 +1132,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/os.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/os.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/pa.po b/debian/real-po/pa.po
index ad452df..7bfe4e6 100644
--- a/debian/real-po/pa.po
+++ b/debian/real-po/pa.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/pa.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/pa.po
 "Language: \n"
 
 #. Type: text
@@ -1123,7 +1128,11 @@ msgstr "ਇਹ ਮਾਊਂਟ ਪੁਆਇੰਟ ਦੀ ਵਰਤੋਂ ਕਰ 
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/pa.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/pa.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/pl.po b/debian/real-po/pl.po
index c292338..8e42ea9 100644
--- a/debian/real-po/pl.po
+++ b/debian/real-po/pl.po
@@ -6,15 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/pl.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:13+0000\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:29+0000\n"
+>>>>>>> debian/real-po/pl.po
 "Last-Translator: Piotr Strębski <[e-mail]>\n"
 "Language-Team: Polish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/pl.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:36+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/pl.po
 "Language: pl\n"
 
 #. Type: text
@@ -1180,7 +1190,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/pl.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/pl.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Spróbować odmontować te partycje ponownie?"
@@ -2370,6 +2384,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "Usuwanie pakietów"
 
+<<<<<<< debian/real-po/pl.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Błąd przywracania zainstalowanych programów"
 
@@ -2389,3 +2404,11 @@ msgstr "Usuwanie pakietów"
 #~ "Błąd przywracania poprzednio zainstalowanych programów. Instalacja będzie "
 #~ "kontynuowana, ale niektóre programy będą musiały zostać zainstalowane "
 #~ "ręcznie po restarcie komputera."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Przeglądarka internetowa, narzędzia, pakiet biurowy, zestaw KDE PIM i "
+#~ "dodatkowe programy internetowe i odtwarzacze."
+>>>>>>> debian/real-po/pl.po
diff --git a/debian/real-po/pt.po b/debian/real-po/pt.po
index f9e9b1f..a1451fe 100644
--- a/debian/real-po/pt.po
+++ b/debian/real-po/pt.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/pt.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:13+0000\n"
 "Last-Translator: Ivo Xavier <[e-mail]>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:28+0000\n"
+"Last-Translator: Alfredo Silva <[e-mail]>\n"
+>>>>>>> debian/real-po/pt.po
 "Language-Team: Portuguese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/pt.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/pt.po
 "Language: pt\n"
 
 #. Type: text
@@ -386,7 +397,11 @@ msgstr "Preparar as partições"
 #. Omit the [ ... ] from the translation.
 #: ../ubiquity.templates:55001
 msgid "_Restart[ action ]"
+<<<<<<< debian/real-po/pt.po
 msgstr "_Reiniciar"
+=======
+msgstr ""
+>>>>>>> debian/real-po/pt.po
 
 #. Type: text
 #. Description
@@ -1182,7 +1197,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/pt.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/pt.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Você deseja que o instalador tente desmontar as partições novamente?"
@@ -2387,6 +2406,7 @@ msgstr ""
 msgid "Removing packages"
 msgstr "A remover pacotes"
 
+<<<<<<< debian/real-po/pt.po
 #~ msgid "Error restoring installed applications"
 #~ msgstr "Erro ao restaurar as aplicações instaladas"
 
@@ -2418,3 +2438,11 @@ msgstr "A remover pacotes"
 #~ "<span foreground=\"darkred\">Warning:</span> Isso apagará todos os seus "
 #~ "arquivos em todos os sistemas operativos. Isso é experimental e pode causar "
 #~ "perda de dados. Não use em sistemas de produção."
+=======
+#~ msgid ""
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Navegador Web, utilitários, software de escritório, suite KDE PIM, além de "
+#~ "aplicações adicionais de Internet e reprodutores de média."
+>>>>>>> debian/real-po/pt.po
diff --git a/debian/real-po/pt_BR.po b/debian/real-po/pt_BR.po
index d152d04..a05fe24 100644
--- a/debian/real-po/pt_BR.po
+++ b/debian/real-po/pt_BR.po
@@ -14,8 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/pt_BR.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/pt_BR.po
 "Language: pt_BR\n"
 
 #. Type: text
@@ -1179,7 +1184,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/pt_BR.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/pt_BR.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/ro.po b/debian/real-po/ro.po
index f51885f..e28bed5 100644
--- a/debian/real-po/ro.po
+++ b/debian/real-po/ro.po
@@ -13,8 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ro.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ro.po
 "Language: ro\n"
 
 #. Type: text
@@ -1181,7 +1186,11 @@ msgstr "Închideți orice aplicație care folosește aceste locuri de montare."
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ro.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ro.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr ""
diff --git a/debian/real-po/ru.po b/debian/real-po/ru.po
index 12ad4f7..e09f35e 100644
--- a/debian/real-po/ru.po
+++ b/debian/real-po/ru.po
@@ -6,15 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+<<<<<<< debian/real-po/ru.po
 "POT-Creation-Date: 2020-10-01 17:47+0200\n"
 "PO-Revision-Date: 2020-05-27 14:12+0000\n"
 "Last-Translator: Dmitrij Kiryanov <Unknown>\n"
+=======
+"POT-Creation-Date: 2020-04-08 09:24+0100\n"
+"PO-Revision-Date: 2020-04-15 02:28+0000\n"
+"Last-Translator: Igor Zubarev <[e-mail]>\n"
+>>>>>>> debian/real-po/ru.po
 "Language-Team: Russian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< debian/real-po/ru.po
 "X-Launchpad-Export-Date: 2020-10-15 21:36+0000\n"
 "X-Generator: Launchpad (build 781851f4dc11c93bc506eb54e6a0d35c919a1ce6)\n"
+=======
+"X-Launchpad-Export-Date: 2020-04-22 09:37+0000\n"
+"X-Generator: Launchpad (build aad6b57d58e2f621954298e262c1cc904860f5d2)\n"
+>>>>>>> debian/real-po/ru.po
 "Language: ru\n"
 
 #. Type: text
@@ -382,7 +393,11 @@ msgstr "Подготовка разделов диска"
 #. Omit the [ ... ] from the translation.
 #: ../ubiquity.templates:55001
 msgid "_Restart[ action ]"
+<<<<<<< debian/real-po/ru.po
 msgstr "_Перезагрузить[ action ]"
+=======
+msgstr ""
+>>>>>>> debian/real-po/ru.po
 
 #. Type: text
 #. Description
@@ -1173,7 +1188,11 @@ msgstr ""
 
 #. Type: boolean
 #. Description
+<<<<<<< debian/real-po/ru.po
 #: ../ubiquity.templates:166001
+=======
+#: ../ubiquity.templates:165001
+>>>>>>> debian/real-po/ru.po
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "Вы хотите, чтобы установщик еще раз попытался отключить эти разделы?"
@@ -2383,6 +2402,7 @@ msgid "Removing packages"
 msgstr "Удаление пакетов"
 
 #~ msgid ""
+<<<<<<< debian/real-po/ru.po
 #~ "An error occurred while restoring previously-installed applications.  The "
 #~ "installation will continue, but you may have to manually reinstall some "
 #~ "applications after the computer reboots."
@@ -2413,3 +2433,10 @@ msgstr "Удаление пакетов"
 #~ "<span foreground=\"darkred\">Предупреждение:</span> Это удалит все ваши "
 #~ "файлы во всех операционных системах. Это экспериментально и может привести к "
 #~ "потере данных. Не использовать в производственных системах."
+=======
+#~ "Web browser, utilities, office software, KDE PIM suite plus additional "
+#~ "internet applications and media players."
+#~ msgstr ""
+#~ "Веб-браузер, утилиты, офисное программное обеспечение, комплект KDE PIM плюс "
+#~ "дополнительные интернет-приложения и медиаплееры."
+>>>>>>> debian/real-po/ru.po
diff --git a/debian/real-po/sa.po b/debian/real-po/sa.po
index 4bac7b1..6f5b9fc 100644
--- a/debian/real-po/sa.po