diff --git a/CHANGES b/CHANGES
index 290d12a41..b3bf7f53d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,7 @@ website will have to do for older versions.
# 3.2.36 (unreleased) #
This release contains contributions from (alphabetically by first name):
- - Anubhav Choudhary
+ - No external contributors yet
## Core ##
- No core changes yet
@@ -19,6 +19,21 @@ This release contains contributions from (alphabetically by first name):
- No module changes yet
+# 3.2.35.1 (2020-12-07) #
+
+This release contains contributions from (alphabetically by first name):
+ - Anubhav Choudhary
+ - Matti Hyttinen
+
+Some strange string artifacts appeared, leading to `{1?}` being
+displayed in various user-facing messages. These have been removed
+and the translations updated.
+
+## Modules ##
+ - The *initcpiocfg* module would sometimes configure the system to ask
+ for a passphrase, when none is needed.
+
+
# 3.2.35 (2020-11-30) #
This release contains contributions from (alphabetically by first name):
diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index 2ff1968eb..fc66795b3 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -1036,7 +1036,7 @@ The installer will quit and all changes will be lost.
- Creating user %1.
+ Creating user %1
diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts
index 671739498..17bdc44d1 100644
--- a/lang/calamares_he.ts
+++ b/lang/calamares_he.ts
@@ -569,7 +569,7 @@ The installer will quit and all changes will be lost.
- מחיצת מערכת ה־EFI שב־%1 תשמש עבור טעינת %2.
+ מחיצת מערכת EFI שב־%1 תשמש לטעינת %2.
@@ -1040,7 +1040,7 @@ The installer will quit and all changes will be lost.
- המשתמש %1 נוצר.
+ המשתמש %1 נוצר
@@ -1184,7 +1184,7 @@ The installer will quit and all changes will be lost.
- דלג רישום הגדרות הצפנה LUKS עבור Dracut: מחיצת "/" לא תוצפן.
+ דילוג על רישום הגדרת LUKS עבור Dracut: מחיצת "/" אינה מוצפנת
@@ -1322,7 +1322,7 @@ The installer will quit and all changes will be lost.
- נקודות עיגון מוגדרות.
+ כעת בהגדרת נקודות העיגון.
@@ -1411,7 +1411,7 @@ The installer will quit and all changes will be lost.
- מאתחל מחיצה %1 עם מערכת קבצים %2.
+ כעת בפרמוט המחיצה %1 עם מערכת הקבצים %2.
@@ -3251,7 +3251,7 @@ Output:
- שם העמדה %1 מוגדר.
+ כעת בהגדרת שם המארח %1.
@@ -3389,7 +3389,7 @@ Output:
- מגדיר סיסמה עבור משתמש %1.
+ כעת בהגדרת הסיסמה למשתמש %1.
diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts
index af818ae9a..76b151dfd 100644
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@@ -1040,7 +1040,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.
- Kuriamas naudotojas %1.
+ Kuriamas naudotojas %1
diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts
index b2603de7c..acaa2103b 100644
--- a/lang/calamares_pt_PT.ts
+++ b/lang/calamares_pt_PT.ts
@@ -1030,18 +1030,18 @@ O instalador será encerrado e todas as alterações serão perdidas.
-
+ A preservar o directório da pasta pessoal
-
+ A criar utilizador %1
-
+ A configurar o utilizador %1
@@ -1527,7 +1527,7 @@ O instalador será encerrado e todas as alterações serão perdidas.
-
+ A criar o initramfs com o mkinitcpio.
@@ -1808,7 +1808,7 @@ O instalador será encerrado e todas as alterações serão perdidas.
-
+ Fuso horário: %1
@@ -1968,7 +1968,7 @@ O instalador será encerrado e todas as alterações serão perdidas.
-
+ Fuso horário: %1
diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po
index 2fac605f4..0948b0b3f 100644
--- a/lang/python/pt_PT/LC_MESSAGES/python.po
+++ b/lang/python/pt_PT/LC_MESSAGES/python.po
@@ -5,8 +5,8 @@
#
# Translators:
# Nuno Amorim , 2018
-# Hugo Carvalho , 2019
# Ricardo Simões , 2020
+# Hugo Carvalho , 2020
#
#, fuzzy
msgid ""
@@ -15,7 +15,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-12-04 22:26+0100\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Ricardo Simões , 2020\n"
+"Last-Translator: Hugo Carvalho , 2020\n"
"Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -208,6 +208,8 @@ msgid ""
"The displaymanagers list is empty or undefined in both globalstorage and "
"displaymanager.conf."
msgstr ""
+"A lista de gestores de visualização está vazia ou indefinida tanto no "
+"globalstorage como no displaymanager.conf."
#: src/modules/displaymanager/main.py:977
msgid "Display manager configuration was incomplete"
@@ -323,11 +325,11 @@ msgstr "A definir o relógio do hardware."
#: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs."
-msgstr ""
+msgstr "A criar o initramfs com o mkinitfs."
#: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target"
-msgstr ""
+msgstr "Falha ao executar o mkintfs no destino"
#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
msgid "The exit code was {}"
diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index 670698d84..64a67cbe3 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -160,7 +160,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
hooks.append("usr")
if encrypt_hook:
- if detect_plymouth():
+ if detect_plymouth() and unencrypted_separate_boot:
hooks.append("plymouth-encrypt")
else:
hooks.append("encrypt")