Merge branch 'calamares' of https://github.com/calamares/calamares into development

2020-12-11 21:45:53 +01:00 · 2020-12-11 21:45:53 +01:00 · 4e72924893
commit 4e72924893
parent 0f64491b9a b7a27b3f9f
7 changed files with 38 additions and 21 deletions
--- a/17
+++ b/17
@ -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):
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@ -1036,7 +1036,7 @@ The installer will quit and all changes will be lost.</translation>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="50"/>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="143"/>
      <source>Creating user %1</source>
-      <translation>Creating user %1.</translation>
+      <translation>Creating user %1</translation>
    </message>
    <message>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="151"/>
--- a/lang/calamares_he.ts
+++ b/lang/calamares_he.ts
@ -569,7 +569,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1150"/>
      <source>The EFI system partition at %1 will be used for starting %2.</source>
-      <translation>מחיצת מערכת ה־EFI שב־%1 תשמש עבור טעינת %2.</translation>
+      <translation>מחיצת מערכת EFI שב־%1 תשמש לטעינת %2.</translation>
    </message>
    <message>
      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1158"/>
@ -1040,7 +1040,7 @@ The installer will quit and all changes will be lost.</source>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="50"/>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="143"/>
      <source>Creating user %1</source>
-      <translation>המשתמש %1 נוצר.</translation>
+      <translation>המשתמש %1 נוצר</translation>
    </message>
    <message>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="151"/>
@ -1184,7 +1184,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
      <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="121"/>
      <source>Skip writing LUKS configuration for Dracut: "/" partition is not encrypted</source>
-      <translation>דלג רישום הגדרות הצפנה LUKS עבור Dracut: מחיצת "/" לא תוצפן.</translation>
+      <translation>דילוג על רישום הגדרת LUKS עבור Dracut: מחיצת "/" אינה מוצפנת</translation>
    </message>
    <message>
      <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="138"/>
@ -1322,7 +1322,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="209"/>
      <source>Setting up mount points.</source>
-      <translation>נקודות עיגון מוגדרות.</translation>
+      <translation>כעת בהגדרת נקודות העיגון.</translation>
    </message>
  </context>
  <context>
@ -1411,7 +1411,7 @@ The installer will quit and all changes will be lost.</source>
    <message>
      <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="58"/>
      <source>Formatting partition %1 with file system %2.</source>
-      <translation>מאתחל מחיצה %1 עם מערכת קבצים %2.</translation>
+      <translation>כעת בפרמוט המחיצה %1 עם מערכת הקבצים %2.</translation>
    </message>
    <message>
      <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="72"/>
@ -3251,7 +3251,7 @@ Output:
    <message>
      <location filename="../src/modules/users/SetHostNameJob.cpp" line="51"/>
      <source>Setting hostname %1.</source>
-      <translation>שם העמדה %1 מוגדר.</translation>
+      <translation>כעת בהגדרת שם המארח %1.</translation>
    </message>
    <message>
      <location filename="../src/modules/users/SetHostNameJob.cpp" line="122"/>
@ -3389,7 +3389,7 @@ Output:
    <message>
      <location filename="../src/modules/users/SetPasswordJob.cpp" line="47"/>
      <source>Setting password for user %1.</source>
-      <translation>מגדיר סיסמה עבור משתמש %1.</translation>
+      <translation>כעת בהגדרת הסיסמה למשתמש %1.</translation>
    </message>
    <message>
      <location filename="../src/modules/users/SetPasswordJob.cpp" line="81"/>
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@ -1040,7 +1040,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti.</translation>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="50"/>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="143"/>
      <source>Creating user %1</source>
-      <translation>Kuriamas naudotojas %1.</translation>
+      <translation>Kuriamas naudotojas %1</translation>
    </message>
    <message>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="151"/>
--- 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.</translati
    <message>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="126"/>
      <source>Preserving home directory</source>
-      <translation type="unfinished"/>
+      <translation>A preservar o directório da pasta pessoal</translation>
    </message>
    <message>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="50"/>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="143"/>
      <source>Creating user %1</source>
-      <translation type="unfinished"/>
+      <translation>A criar utilizador %1</translation>
    </message>
    <message>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="151"/>
      <source>Configuring user %1</source>
-      <translation type="unfinished"/>
+      <translation>A configurar o utilizador %1</translation>
    </message>
    <message>
      <location filename="../src/modules/users/CreateUserJob.cpp" line="159"/>
@ -1527,7 +1527,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
    <message>
      <location filename="../src/modules/initcpio/InitcpioJob.cpp" line="31"/>
      <source>Creating initramfs with mkinitcpio.</source>
-      <translation type="unfinished"/>
+      <translation>A criar o initramfs com o mkinitcpio.</translation>
    </message>
  </context>
  <context>
@ -1808,7 +1808,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
    <message>
      <location filename="../src/modules/localeq/Map.qml" line="243"/>
      <source>Timezone: %1</source>
-      <translation type="unfinished"/>
+      <translation>Fuso horário: %1</translation>
    </message>
    <message>
      <location filename="../src/modules/localeq/Map.qml" line="264"/>
@ -1968,7 +1968,7 @@ O instalador será encerrado e todas as alterações serão perdidas.</translati
      <location filename="../src/modules/localeq/Offline.qml" line="169"/>
      <location filename="../src/modules/localeq/Offline.qml" line="213"/>
      <source>Timezone: %1</source>
-      <translation type="unfinished"/>
+      <translation>Fuso horário: %1</translation>
    </message>
    <message>
      <location filename="../src/modules/localeq/Offline.qml" line="111"/>
--- 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 <inovaty@gmail.com>, 2018
-# Hugo Carvalho <hugokarvalho@hotmail.com>, 2019
 # Ricardo Simões <xmcorporation@gmail.com>, 2020
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 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 <xmcorporation@gmail.com>, 2020\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>, 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 {}"
--- 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")