Merge branch 'master' into branding-tooling-updates-jcayouette

uyuni-project · Feb 6, 2025 · 9c4994d · 9c4994d
2 parents c543198 + 12e77b1
commit 9c4994d
Show file tree

Hide file tree

Showing 31 changed files with 746 additions and 769 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+- Remove image with beta reference in Installation and Upgrade Guide
+  (bsc#1236678)
 - Clarify functionality of CLM package/patch allow filters
   (bsc#1236234)
 - Corrected the instruction for logging in to Azure instance in 

diff --git a/l10n-weblate/administration/ja.po b/l10n-weblate/administration/ja.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2025-02-06 11:07+0000\n"
-"PO-Revision-Date: 2025-02-05 12:50+0000\n"
+"PO-Revision-Date: 2025-02-06 13:23+0000\n"
 "Last-Translator: anonymous <noreply@weblate.org>\n"
-"Language-Team: Japanese <https://l10n.opensuse.org/projects/uyuni/docs-"
-"administration-master/ja/>\n"
+"Language-Team: Japanese <https://l10n.opensuse.org/projects/uyuni/"
+"docs-administration-master/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -97,7 +97,7 @@ msgstr "xref:custom-channels.adoc[カスタムチャンネル]"
 #. type: Plain text
 #: modules/administration/nav-administration-guide.adoc:16
 msgid "xref:removing-channels.adoc[Remove Channels]"
-msgstr "xref:custom-channels.adoc[チャンネルの削除]"
+msgstr "xref:removing-channels.adoc[チャンネルの削除]"
 
 #. type: Plain text
 #: modules/administration/nav-administration-guide.adoc:17

diff --git a/l10n-weblate/administration/zh_CN.po b/l10n-weblate/administration/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2025-02-06 11:07+0000\n"
-"PO-Revision-Date: 2025-02-05 12:50+0000\n"
+"PO-Revision-Date: 2025-02-06 13:23+0000\n"
 "Last-Translator: anonymous <noreply@weblate.org>\n"
 "Language-Team: Chinese (China) <https://l10n.opensuse.org/projects/uyuni/"
 "docs-administration-master/zh_CN/>\n"
@@ -2089,9 +2089,8 @@ msgstr "选中[guimenu]``可插入身份验证模块 (PAM)`` 复选框。"
 msgid ""
 "Configure SSSD in the server container.  At the command prompt of the "
 "{productname} container host, as root, enter the server container:"
-msgstr ""
-"在服务器容器中配置 SSSD。在 {productname} 容器主机的命令提示符处，以 root 身"
-"份进入服务器容器："
+msgstr "在服务器容器中配置 SSSD。在 {productname} 容器主机的命令提示符处，以 root "
+"身份进入服务器容器："
 
 #. type: delimited block -
 #: modules/administration/pages/auth-methods-pam.adoc:9

diff --git a/l10n-weblate/client-configuration/client-configuration.pot b/l10n-weblate/client-configuration/client-configuration.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2025-02-05 13:06+0000\n"
+"POT-Creation-Date: 2025-02-06 13:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -7151,11 +7151,11 @@ msgid ""
 "| OS Version\n"
 "| Product Name\n"
 "\n"
-"| {leapmicro} {microversion}\n"
-"| {leapmicro} {microversion} {x86_64}\n"
+"| {leapmicro} 6.1\n"
+"| {leapmicro} 6.1 {x86_64}\n"
 "\n"
-"| {leapmicro} {microversion}\n"
-"| {leapmicro} {microversion} {aarch64}\n"
+"| {leapmicro} 6.1\n"
+"| {leapmicro} 6.1 {aarch64}\n"
 "\n"
 msgstr ""
 
@@ -7172,7 +7172,7 @@ msgstr ""
 #: modules/client-configuration/pages/clients-opensuseleapmicro.adoc:12
 #, no-wrap
 msgid ""
-"| OS Version               | {leapmicro} {microversion}     | {leapmicro} "
+"| OS Version               | {leapmicro} 6.1                | {leapmicro} "
 "5.5                    | {leapmicro} 5.4                | {leapmicro} 5.3\n"
 "| Base Channel             | opensuse_micro6_1              | "
 "opensuse_micro5_5                  | opensuse_micro5_4              | "
@@ -10073,7 +10073,7 @@ msgstr ""
 #. type: Block title
 #: modules/client-configuration/pages/clients-slmicro.adoc:9
 #, no-wrap
-msgid "{sl-micro} {microversion} Products - WebUI"
+msgid "{sl-micro} 6.1 Products - WebUI"
 msgstr ""
 
 #. type: Table
@@ -10124,7 +10124,7 @@ msgstr ""
 #. type: Block title
 #: modules/client-configuration/pages/clients-slmicro.adoc:14
 #, no-wrap
-msgid "{sl-micro} {microversion} Products - CLI"
+msgid "{sl-micro} 6.1 Products - CLI"
 msgstr ""
 
 #. type: Table
@@ -19422,13 +19422,13 @@ msgid ""
 "| {cross}\n"
 "| {cross}\n"
 "\n"
-"| {sle-micro} \n"
+"| {sle-micro}\n"
 "| {check}\n"
 "| {cross}\n"
 "| {cross}\n"
 "| {check}\n"
 "\n"
-"| {sl-micro} {microversion}, 6.0\n"
+"| {sl-micro} 6.1, 6.0\n"
 "| {check}\n"
 "| {cross}\n"
 "| {cross}\n"

diff --git a/l10n-weblate/client-configuration/cs.po b/l10n-weblate/client-configuration/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2025-02-05 13:06+0000\n"
+"POT-Creation-Date: 2025-02-06 13:52+0000\n"
 "PO-Revision-Date: 2022-01-25 18:12+0000\n"
 "Last-Translator: Aleš Kastner <alkas@volny.cz>\n"
 "Language-Team: Czech <https://l10n.opensuse.org/projects/uyuni/docs-client-"
@@ -7713,11 +7713,11 @@ msgid ""
 "| OS Version\n"
 "| Product Name\n"
 "\n"
-"| {leapmicro} {microversion}\n"
-"| {leapmicro} {microversion} {x86_64}\n"
+"| {leapmicro} 6.1\n"
+"| {leapmicro} 6.1 {x86_64}\n"
 "\n"
-"| {leapmicro} {microversion}\n"
-"| {leapmicro} {microversion} {aarch64}\n"
+"| {leapmicro} 6.1\n"
+"| {leapmicro} 6.1 {aarch64}\n"
 "\n"
 msgstr ""
 
@@ -7734,7 +7734,7 @@ msgstr ""
 #: modules/client-configuration/pages/clients-opensuseleapmicro.adoc:12
 #, no-wrap
 msgid ""
-"| OS Version               | {leapmicro} {microversion}     | {leapmicro} 5.5                    | {leapmicro} 5.4                | {leapmicro} 5.3\n"
+"| OS Version               | {leapmicro} 6.1                | {leapmicro} 5.5                    | {leapmicro} 5.4                | {leapmicro} 5.3\n"
 "| Base Channel             | opensuse_micro6_1              | opensuse_micro5_5                  | opensuse_micro5_4              | opensuse_micro5_3\n"
 "| Client Channel           | opensuse_micro6_1-uyuni-client | opensuse_micro5_5-uyuni-client     | opensuse_micro5_4-uyuni-client | opensuse_micro5_3-uyuni-client\n"
 "| SLE Updates Channel      | NA                             | opensuse_micro5_5-sle-updates      | opensuse_micro5_4-sle-updates  | opensuse_micro5_3-sle-updates\n"
@@ -10776,7 +10776,7 @@ msgstr ""
 #. type: Block title
 #: modules/client-configuration/pages/clients-slmicro.adoc:9
 #, no-wrap
-msgid "{sl-micro} {microversion} Products - WebUI"
+msgid "{sl-micro} 6.1 Products - WebUI"
 msgstr ""
 
 #. type: Table
@@ -10827,7 +10827,7 @@ msgstr ""
 #. type: Block title
 #: modules/client-configuration/pages/clients-slmicro.adoc:14
 #, no-wrap
-msgid "{sl-micro} {microversion} Products - CLI"
+msgid "{sl-micro} 6.1 Products - CLI"
 msgstr ""
 
 #. type: Table
@@ -20475,13 +20475,13 @@ msgid ""
 "| {cross}\n"
 "| {cross}\n"
 "\n"
-"| {sle-micro} \n"
+"| {sle-micro}\n"
 "| {check}\n"
 "| {cross}\n"
 "| {cross}\n"
 "| {check}\n"
 "\n"
-"| {sl-micro} {microversion}, 6.0\n"
+"| {sl-micro} 6.1, 6.0\n"
 "| {check}\n"
 "| {cross}\n"
 "| {cross}\n"

diff --git a/l10n-weblate/client-configuration/es.po b/l10n-weblate/client-configuration/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2025-02-05 13:06+0000\n"
+"POT-Creation-Date: 2025-02-06 13:52+0000\n"
 "PO-Revision-Date: 2020-10-21 16:49+0000\n"
 "Last-Translator: Pau Garcia Quiles <pau.garcia@suse.com>\n"
 "Language-Team: Spanish <https://l10n.opensuse.org/projects/uyuni/docs-client-"
@@ -7292,11 +7292,11 @@ msgid ""
 "| OS Version\n"
 "| Product Name\n"
 "\n"
-"| {leapmicro} {microversion}\n"
-"| {leapmicro} {microversion} {x86_64}\n"
+"| {leapmicro} 6.1\n"
+"| {leapmicro} 6.1 {x86_64}\n"
 "\n"
-"| {leapmicro} {microversion}\n"
-"| {leapmicro} {microversion} {aarch64}\n"
+"| {leapmicro} 6.1\n"
+"| {leapmicro} 6.1 {aarch64}\n"
 "\n"
 msgstr ""
 
@@ -7313,7 +7313,7 @@ msgstr ""
 #: modules/client-configuration/pages/clients-opensuseleapmicro.adoc:12
 #, no-wrap
 msgid ""
-"| OS Version               | {leapmicro} {microversion}     | {leapmicro} 5.5                    | {leapmicro} 5.4                | {leapmicro} 5.3\n"
+"| OS Version               | {leapmicro} 6.1                | {leapmicro} 5.5                    | {leapmicro} 5.4                | {leapmicro} 5.3\n"
 "| Base Channel             | opensuse_micro6_1              | opensuse_micro5_5                  | opensuse_micro5_4              | opensuse_micro5_3\n"
 "| Client Channel           | opensuse_micro6_1-uyuni-client | opensuse_micro5_5-uyuni-client     | opensuse_micro5_4-uyuni-client | opensuse_micro5_3-uyuni-client\n"
 "| SLE Updates Channel      | NA                             | opensuse_micro5_5-sle-updates      | opensuse_micro5_4-sle-updates  | opensuse_micro5_3-sle-updates\n"
@@ -10198,7 +10198,7 @@ msgstr ""
 #. type: Block title
 #: modules/client-configuration/pages/clients-slmicro.adoc:9
 #, no-wrap
-msgid "{sl-micro} {microversion} Products - WebUI"
+msgid "{sl-micro} 6.1 Products - WebUI"
 msgstr ""
 
 #. type: Table
@@ -10249,7 +10249,7 @@ msgstr ""
 #. type: Block title
 #: modules/client-configuration/pages/clients-slmicro.adoc:14
 #, no-wrap
-msgid "{sl-micro} {microversion} Products - CLI"
+msgid "{sl-micro} 6.1 Products - CLI"
 msgstr ""
 
 #. type: Table
@@ -19632,13 +19632,13 @@ msgid ""
 "| {cross}\n"
 "| {cross}\n"
 "\n"
-"| {sle-micro} \n"
+"| {sle-micro}\n"
 "| {check}\n"
 "| {cross}\n"
 "| {cross}\n"
 "| {check}\n"
 "\n"
-"| {sl-micro} {microversion}, 6.0\n"
+"| {sl-micro} 6.1, 6.0\n"
 "| {check}\n"
 "| {cross}\n"
 "| {cross}\n"

diff --git a/l10n-weblate/client-configuration/ja.po b/l10n-weblate/client-configuration/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2025-02-05 13:06+0000\n"
+"POT-Creation-Date: 2025-02-06 13:52+0000\n"
 "PO-Revision-Date: 2024-10-24 11:48+0000\n"
 "Last-Translator: Carina Hagl <vistatec_pm@sunflare.co.jp>\n"
 "Language-Team: Japanese <https://l10n.opensuse.org/projects/uyuni/docs-"
@@ -8961,11 +8961,11 @@ msgid ""
 "| OS Version\n"
 "| Product Name\n"
 "\n"
-"| {leapmicro} {microversion}\n"
-"| {leapmicro} {microversion} {x86_64}\n"
+"| {leapmicro} 6.1\n"
+"| {leapmicro} 6.1 {x86_64}\n"
 "\n"
-"| {leapmicro} {microversion}\n"
-"| {leapmicro} {microversion} {aarch64}\n"
+"| {leapmicro} 6.1\n"
+"| {leapmicro} 6.1 {aarch64}\n"
 "\n"
 msgstr ""
 "| OSバージョン\n"
@@ -9000,7 +9000,7 @@ msgstr ""
 #| "| SLE Updates Channel      | opensuse_micro5_5-sle-updates      | opensuse_micro5_4-sle-updates  | opensuse_micro5_3-sle-updates\n"
 #| "\n"
 msgid ""
-"| OS Version               | {leapmicro} {microversion}     | {leapmicro} 5.5                    | {leapmicro} 5.4                | {leapmicro} 5.3\n"
+"| OS Version               | {leapmicro} 6.1                | {leapmicro} 5.5                    | {leapmicro} 5.4                | {leapmicro} 5.3\n"
 "| Base Channel             | opensuse_micro6_1              | opensuse_micro5_5                  | opensuse_micro5_4              | opensuse_micro5_3\n"
 "| Client Channel           | opensuse_micro6_1-uyuni-client | opensuse_micro5_5-uyuni-client     | opensuse_micro5_4-uyuni-client | opensuse_micro5_3-uyuni-client\n"
 "| SLE Updates Channel      | NA                             | opensuse_micro5_5-sle-updates      | opensuse_micro5_4-sle-updates  | opensuse_micro5_3-sle-updates\n"
@@ -12903,7 +12903,7 @@ msgstr ""
 #: modules/client-configuration/pages/clients-slmicro.adoc:9
 #, fuzzy, no-wrap
 #| msgid "{rocky} Products - WebUI"
-msgid "{sl-micro} {microversion} Products - WebUI"
+msgid "{sl-micro} 6.1 Products - WebUI"
 msgstr "{rocky}製品 - WebUI"
 
 #. type: Table
@@ -12993,7 +12993,7 @@ msgstr ""
 #: modules/client-configuration/pages/clients-slmicro.adoc:14
 #, fuzzy, no-wrap
 #| msgid "SL Micro Products - CLI"
-msgid "{sl-micro} {microversion} Products - CLI"
+msgid "{sl-micro} 6.1 Products - CLI"
 msgstr "SL Micro製品 - CLI"
 
 #. type: Table
@@ -27460,13 +27460,13 @@ msgid ""
 "| {cross}\n"
 "| {cross}\n"
 "\n"
-"| {sle-micro} \n"
+"| {sle-micro}\n"
 "| {check}\n"
 "| {cross}\n"
 "| {cross}\n"
 "| {check}\n"
 "\n"
-"| {sl-micro} {microversion}, 6.0\n"
+"| {sl-micro} 6.1, 6.0\n"
 "| {check}\n"
 "| {cross}\n"
 "| {cross}\n"
@@ -31716,6 +31716,16 @@ msgstr ""
 "詳細については、link:https://www.suse.com/products/terms_and_conditions.pdf[]"
 "を参照するか、{suse}にお問い合わせください。"
 
+#, fuzzy, no-wrap
+#~| msgid "{rocky} Products - WebUI"
+#~ msgid "{sl-micro} {microversion} Products - WebUI"
+#~ msgstr "{rocky}製品 - WebUI"
+
+#, fuzzy, no-wrap
+#~| msgid "SL Micro Products - CLI"
+#~ msgid "{sl-micro} {microversion} Products - CLI"
+#~ msgstr "SL Micro製品 - CLI"
+
 #~ msgid ""
 #~ "Supported operating systems for Salt clients are listed in this table."
 #~ msgstr ""